Removed synchronization from OptionInfo and TargetWrapper.

gsscoder · gsscoder · commit ed35f3a1060b · 2013-01-20T14:32:39.000+01:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Command Line Parser Library 1.9.4.119 Beta for CLR.
+Command Line Parser Library 1.9.4.121 Beta for CLR.
 ===
 The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks defining switches, options and verb commands. It allows you to display an help screen with an high degree of customization and a simple way to report syntax errors to the end user. Everything that is boring and repetitive to be programmed stands up on library shoulders, letting developers concentrate on core logic.
 __The search for the command line parser for your application is over, with this library you got a solid parsing API constantly updated since 2005.__
@@ -11,6 +11,8 @@ Compatibility:
  
 News:
 ---
+  - Removed synchronization from ``OptionInfo`` and ``TargetWrapper`` (parsing should occur in one thread;
+      if not, synchronization must be provided by developer not by the library).
   - Source in Core dir (public types) placed in tree root.
   - Project SampleApp renamed to CommandLine.Demo.
   - ``SR.string[.cs]`` managed with tools/invariantstr.exe ([Invariant String Tool](https://github.com/gsscoder/invariantstrtool)).
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-20	Giacomo Stelluti Scala	<gsscoder@gmail.com>
+
+  * Removed synchronization from OptionInfo and TargetWrapper: elaboration occurs in
+      one method call (::ParseArguments) and should not be divided across threads.
+      If yes, synchronization must be provided by developer not by the library.
+  * Version incremented to 1.9.4.121 Beta.
+
 2013-01-20	Giacomo Stelluti Scala	<gsscoder@gmail.com>
 
   * Source in Core dir (public types) placed in tree root.
diff --git a/doc/README b/doc/README
@@ -3,7 +3,7 @@ Command Line Parser Library
 Project Author/Coordinator: Giacomo Stelluti Scala
 Main Contributor(s): Steven Evans, Kevin Moore, Dan Nemec (nemec), Alexander Fast (mizipzor)
 --------------------------------------------------------------------------------------------
-Version 1.9.4.119 Beta (*1)
+Version 1.9.4.121 Beta (*1)
 Latest Update: 20-01-2013
 
 Git home:
diff --git a/src/libcmdline/Internal/OptionInfo.Verbs.cs b/src/libcmdline/Internal/OptionInfo.Verbs.cs
@@ -41,33 +41,24 @@ public bool HasParameterLessCtor
             get { return _hasParameterLessCtor; }
             set
             {
-                lock (_setValueLock)
-                {
-                    _hasParameterLessCtor = value;
-                }
+                _hasParameterLessCtor = value;
             }
         }
 
         public object GetValue(object target)
-        {
-            lock (_setValueLock)
-            {
-                return _property.GetValue(target, null);
-            }
+        {          
+            return _property.GetValue(target, null);
         }
 
         public void CreateInstance(object target)
         {
-            lock (_setValueLock)
+            try
             {
-                try
-                {
-                    _property.SetValue(target, Activator.CreateInstance(_property.PropertyType), null);
-                }
-                catch (Exception e)
-                {
-                    throw new CommandLineParserException("Instance defined for verb command could not be created.", e);
-                }
+                _property.SetValue(target, Activator.CreateInstance(_property.PropertyType), null);
+            }
+            catch (Exception e)
+            {
+                throw new CommandLineParserException("Instance defined for verb command could not be created.", e);
             }
         }
 
@@ -95,4 +86,4 @@ public static OptionMap CreateMap(object target,
 
         private bool _hasParameterLessCtor;
     }
-}
+}
diff --git a/src/libcmdline/Internal/OptionInfo.cs b/src/libcmdline/Internal/OptionInfo.cs
@@ -112,11 +112,8 @@ public bool SetValue(IList<string> values, object options)
             {
                 try
                 {
-                    lock (_setValueLock)
-                    {
-                        array.SetValue(Convert.ChangeType(values[i], elementType, Thread.CurrentThread.CurrentCulture), i);
+                    array.SetValue(Convert.ChangeType(values[i], elementType, Thread.CurrentThread.CurrentCulture), i);
                         _property.SetValue(options, array, null);
-                    }
                 }
                 catch (FormatException)
                 {
@@ -132,17 +129,11 @@ private bool SetValueScalar(string value, object options)
             {
                 if (_property.PropertyType.IsEnum)
                 {
-                    lock (_setValueLock)
-                    {
-                        _property.SetValue(options, Enum.Parse(_property.PropertyType, value, true), null);
-                    }
+                    _property.SetValue(options, Enum.Parse(_property.PropertyType, value, true), null);
                 }
                 else
                 {
-                    lock (_setValueLock)
-                    {
-                        _property.SetValue(options, Convert.ChangeType(value, _property.PropertyType, Thread.CurrentThread.CurrentCulture), null);
-                    }
+                    _property.SetValue(options, Convert.ChangeType(value, _property.PropertyType, Thread.CurrentThread.CurrentCulture), null);
                 }
             }
             catch (InvalidCastException) { return false; } // Convert.ChangeType
@@ -157,10 +148,7 @@ private bool SetNullableValue(string value, object options)
             var nc = new NullableConverter(_property.PropertyType);
             try
             {
-                lock (_setValueLock)
-                {
-                    _property.SetValue(options, nc.ConvertFromString(null, Thread.CurrentThread.CurrentCulture, value), null);
-                }
+                _property.SetValue(options, nc.ConvertFromString(null, Thread.CurrentThread.CurrentCulture, value), null);
             }
             // the FormatException (thrown by ConvertFromString) is thrown as Exception.InnerException,
             // so we've catch directly System.Exception
@@ -173,42 +161,33 @@ private bool SetNullableValue(string value, object options)
 
         public bool SetValue(bool value, object options)
         {
-            lock (_setValueLock)
-            {
-                _property.SetValue(options, value, null);
-                return true;
-            }
+            _property.SetValue(options, value, null);
+            return true;
         }
 
         private bool SetValueList(string value, object options)
         {
-            lock (_setValueLock)
+            _property.SetValue(options, new List<string>(), null);
+            var fieldRef = (IList<string>)_property.GetValue(options, null);
+            var values = value.Split(((OptionListAttribute)_attribute).Separator);
+            for (int i = 0; i < values.Length; i++)
             {
-                _property.SetValue(options, new List<string>(), null);
-                var fieldRef = (IList<string>)_property.GetValue(options, null);
-                var values = value.Split(((OptionListAttribute)_attribute).Separator);
-                for (int i = 0; i < values.Length; i++)
-                {
-                    fieldRef.Add(values[i]);
-                }
-                return true;
+                fieldRef.Add(values[i]);
             }
+            return true;
         }
 
         public void SetDefault(object options)
         {
             if (_hasDefaultValue)
             {
-                lock (_setValueLock)
+                try
+                {
+                    _property.SetValue(options, _defaultValue, null);
+                }
+                catch (Exception e)
                 {
-                    try
-                    {
-                        _property.SetValue(options, _defaultValue, null);
-                    }
-                    catch (Exception e)
-                    {
-                        throw new CommandLineParserException("Bad default value.", e);
-                    }
+                    throw new CommandLineParserException("Bad default value.", e);
                 }
             }
         }
@@ -281,6 +260,5 @@ public bool HasBothNames
         private readonly string _mutuallyExclusiveSet;
         private readonly object _defaultValue;
         private readonly bool _hasDefaultValue;
-        private readonly object _setValueLock = new object();
     }
 }
diff --git a/src/libcmdline/Internal/TargetWrapper.cs b/src/libcmdline/Internal/TargetWrapper.cs
@@ -59,10 +59,7 @@ public bool AddValueItemIfAllowed(string item)
             {
                 return false;
             }
-            lock (this)
-            {
-                _valueList.Add(item);
-            }
+            _valueList.Add(item);
             return true;
         }
 
diff --git a/src/libcmdline/Properties/ThisLibrary.cs b/src/libcmdline/Properties/ThisLibrary.cs
@@ -33,7 +33,7 @@ public static class ThisLibrary
     {
         public const string Title = "CommandLine.dll";
         public const string Copyright = "Copyright (C) 2005 - 2013 Giacomo Stelluti Scala";
-        public const string Version = "1.9.4.119";
+        public const string Version = "1.9.4.121";
         public const string ReleaseType = "beta";
         public const string InformationalVersion = Version;
     }

Original file line number	Diff line number	Diff line change
`@@ -41,33 +41,24 @@ public bool HasParameterLessCtor`
`41`	`41`	`get { return _hasParameterLessCtor; }`
`42`	`42`	`set`
`43`	`43`	`{`
`44`		`- lock (_setValueLock)`
`45`		`- {`
`46`		`- _hasParameterLessCtor = value;`
`47`		`- }`
	`44`	`+ _hasParameterLessCtor = value;`
`48`	`45`	`}`
`49`	`46`	`}`
`50`	`47`
`51`	`48`	`public object GetValue(object target)`
`52`		`- {`
`53`		`- lock (_setValueLock)`
`54`		`- {`
`55`		`- return _property.GetValue(target, null);`
`56`		`- }`
	`49`	`+ {`
	`50`	`+ return _property.GetValue(target, null);`
`57`	`51`	`}`
`58`	`52`
`59`	`53`	`public void CreateInstance(object target)`
`60`	`54`	`{`
`61`		`- lock (_setValueLock)`
	`55`	`+ try`
`62`	`56`	`{`
`63`		`- try`
`64`		`- {`
`65`		`- _property.SetValue(target, Activator.CreateInstance(_property.PropertyType), null);`
`66`		`- }`
`67`		`- catch (Exception e)`
`68`		`- {`
`69`		`- throw new CommandLineParserException("Instance defined for verb command could not be created.", e);`
`70`		`- }`
	`57`	`+ _property.SetValue(target, Activator.CreateInstance(_property.PropertyType), null);`
	`58`	`+ }`
	`59`	`+ catch (Exception e)`
	`60`	`+ {`
	`61`	`+ throw new CommandLineParserException("Instance defined for verb command could not be created.", e);`
`71`	`62`	`}`
`72`	`63`	`}`
`73`	`64`
`@@ -95,4 +86,4 @@ public static OptionMap CreateMap(object target,`
`95`	`86`
`96`	`87`	`private bool _hasParameterLessCtor;`
`97`	`88`	`}`
`98`		`-}`
	`89`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,8 @@ public bool SetValue(IList<string> values, object options)`
`112`	`112`	`{`
`113`	`113`	`try`
`114`	`114`	`{`
`115`		`- lock (_setValueLock)`
`116`		`- {`
`117`		`- array.SetValue(Convert.ChangeType(values[i], elementType, Thread.CurrentThread.CurrentCulture), i);`
	`115`	`+ array.SetValue(Convert.ChangeType(values[i], elementType, Thread.CurrentThread.CurrentCulture), i);`
`118`	`116`	`_property.SetValue(options, array, null);`
`119`		`- }`
`120`	`117`	`}`
`121`	`118`	`catch (FormatException)`
`122`	`119`	`{`
`@@ -132,17 +129,11 @@ private bool SetValueScalar(string value, object options)`
`132`	`129`	`{`
`133`	`130`	`if (_property.PropertyType.IsEnum)`
`134`	`131`	`{`
`135`		`- lock (_setValueLock)`
`136`		`- {`
`137`		`- _property.SetValue(options, Enum.Parse(_property.PropertyType, value, true), null);`
`138`		`- }`
	`132`	`+ _property.SetValue(options, Enum.Parse(_property.PropertyType, value, true), null);`
`139`	`133`	`}`
`140`	`134`	`else`
`141`	`135`	`{`
`142`		`- lock (_setValueLock)`
`143`		`- {`
`144`		`- _property.SetValue(options, Convert.ChangeType(value, _property.PropertyType, Thread.CurrentThread.CurrentCulture), null);`
`145`		`- }`
	`136`	`+ _property.SetValue(options, Convert.ChangeType(value, _property.PropertyType, Thread.CurrentThread.CurrentCulture), null);`
`146`	`137`	`}`
`147`	`138`	`}`
`148`	`139`	`catch (InvalidCastException) { return false; } // Convert.ChangeType`
`@@ -157,10 +148,7 @@ private bool SetNullableValue(string value, object options)`
`157`	`148`	`var nc = new NullableConverter(_property.PropertyType);`
`158`	`149`	`try`
`159`	`150`	`{`
`160`		`- lock (_setValueLock)`
`161`		`- {`
`162`		`- _property.SetValue(options, nc.ConvertFromString(null, Thread.CurrentThread.CurrentCulture, value), null);`
`163`		`- }`
	`151`	`+ _property.SetValue(options, nc.ConvertFromString(null, Thread.CurrentThread.CurrentCulture, value), null);`
`164`	`152`	`}`
`165`	`153`	`// the FormatException (thrown by ConvertFromString) is thrown as Exception.InnerException,`
`166`	`154`	`// so we've catch directly System.Exception`
`@@ -173,42 +161,33 @@ private bool SetNullableValue(string value, object options)`
`173`	`161`
`174`	`162`	`public bool SetValue(bool value, object options)`
`175`	`163`	`{`
`176`		`- lock (_setValueLock)`
`177`		`- {`
`178`		`- _property.SetValue(options, value, null);`
`179`		`- return true;`
`180`		`- }`
	`164`	`+ _property.SetValue(options, value, null);`
	`165`	`+ return true;`
`181`	`166`	`}`
`182`	`167`
`183`	`168`	`private bool SetValueList(string value, object options)`
`184`	`169`	`{`
`185`		`- lock (_setValueLock)`
	`170`	`+ _property.SetValue(options, new List<string>(), null);`
	`171`	`+ var fieldRef = (IList<string>)_property.GetValue(options, null);`
	`172`	`+ var values = value.Split(((OptionListAttribute)_attribute).Separator);`
	`173`	`+ for (int i = 0; i < values.Length; i++)`
`186`	`174`	`{`
`187`		`- _property.SetValue(options, new List<string>(), null);`
`188`		`- var fieldRef = (IList<string>)_property.GetValue(options, null);`
`189`		`- var values = value.Split(((OptionListAttribute)_attribute).Separator);`
`190`		`- for (int i = 0; i < values.Length; i++)`
`191`		`- {`
`192`		`- fieldRef.Add(values[i]);`
`193`		`- }`
`194`		`- return true;`
	`175`	`+ fieldRef.Add(values[i]);`
`195`	`176`	`}`
	`177`	`+ return true;`
`196`	`178`	`}`
`197`	`179`
`198`	`180`	`public void SetDefault(object options)`
`199`	`181`	`{`
`200`	`182`	`if (_hasDefaultValue)`
`201`	`183`	`{`
`202`		`- lock (_setValueLock)`
	`184`	`+ try`
	`185`	`+ {`
	`186`	`+ _property.SetValue(options, _defaultValue, null);`
	`187`	`+ }`
	`188`	`+ catch (Exception e)`
`203`	`189`	`{`
`204`		`- try`
`205`		`- {`
`206`		`- _property.SetValue(options, _defaultValue, null);`
`207`		`- }`
`208`		`- catch (Exception e)`
`209`		`- {`
`210`		`- throw new CommandLineParserException("Bad default value.", e);`
`211`		`- }`
	`190`	`+ throw new CommandLineParserException("Bad default value.", e);`
`212`	`191`	`}`
`213`	`192`	`}`
`214`	`193`	`}`
`@@ -281,6 +260,5 @@ public bool HasBothNames`
`281`	`260`	`private readonly string _mutuallyExclusiveSet;`
`282`	`261`	`private readonly object _defaultValue;`
`283`	`262`	`private readonly bool _hasDefaultValue;`
`284`		`- private readonly object _setValueLock = new object();`
`285`	`263`	`}`
`286`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,7 @@ public bool AddValueItemIfAllowed(string item)`
`59`	`59`	`{`
`60`	`60`	`return false;`
`61`	`61`	`}`
`62`		`- lock (this)`
`63`		`- {`
`64`		`- _valueList.Add(item);`
`65`		`- }`
	`62`	`+ _valueList.Add(item);`
`66`	`63`	`return true;`
`67`	`64`	`}`
`68`	`65`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static class ThisLibrary`
`33`	`33`	`{`
`34`	`34`	`public const string Title = "CommandLine.dll";`
`35`	`35`	`public const string Copyright = "Copyright (C) 2005 - 2013 Giacomo Stelluti Scala";`
`36`		`- public const string Version = "1.9.4.119";`
	`36`	`+ public const string Version = "1.9.4.121";`
`37`	`37`	`public const string ReleaseType = "beta";`
`38`	`38`	`public const string InformationalVersion = Version;`
`39`	`39`	`}`