From: CryptoManiac <balthazar@yandex.ru>
Date: Tue, 4 Aug 2015 23:11:54 +0000 (+0300)
Subject: Proper locking and another example
X-Git-Url: https://git.novaco.in/?p=StratumLibrary.git;a=commitdiff_plain;h=27ffb176358e7959320a5be4d916a862a55cff37

Proper locking and another example
---

diff --git a/StratumLibrary/Stratum.cs b/StratumLibrary/Stratum.cs
index 722abda..30ca0bc 100644
--- a/StratumLibrary/Stratum.cs
+++ b/StratumLibrary/Stratum.cs
@@ -9,9 +9,13 @@ using System.Collections.Generic;
 
 namespace Stratum
 {
+    delegate void NotificationCallback(out object[] notificationData);
+
     public class Stratum
     {
         private Socket client;
+
+        object responsesLock = new object();
         private Dictionary<string, string> responses = new Dictionary<string, string>();
         ManualResetEvent gotResponse = new ManualResetEvent(false);
 
@@ -94,6 +98,22 @@ namespace Stratum
         /// </summary>
         /// <typeparam name="T">Return type</typeparam>
         /// <param name="method">Method name</param>
+        /// <returns>StratumResponse object</returns>
+        public StratumResponse<T> Invoke<T>(string method)
+        {
+            var req = new StratumRequest()
+            {
+                Method = method,
+                Params = new object[] { }
+            };
+            return Invoke<T>(req);
+        }
+
+        /// <summary>
+        /// Invoke remote method
+        /// </summary>
+        /// <typeparam name="T">Return type</typeparam>
+        /// <param name="method">Method name</param>
         /// <param name="arg">Argument</param>
         /// <returns>StratumResponse object</returns>
         public StratumResponse<T> Invoke<T>(string method, object arg)
@@ -129,16 +149,22 @@ namespace Stratum
             var reqJSON = Newtonsoft.Json.JsonConvert.SerializeObject(stratumReq) + '\n';
             var reqId = (string) stratumReq.Id;
 
+            string strResponse = "";
+            StratumResponse<T> responseObj = null;
+
             // Send JSON data to the remote device.
             Send(client, reqJSON);
 
             // Wait for response
             gotResponse.WaitOne();
 
-            // Deserialize the response
-            string strResponse = responses[reqId];
-            StratumResponse<T> responseObj = Newtonsoft.Json.JsonConvert.DeserializeObject<StratumResponse<T>>(strResponse);
-            responses.Remove(reqId);
+            lock (responsesLock)
+            {
+                // Deserialize the response
+                strResponse = responses[reqId];
+                responses.Remove(reqId);
+            }
+            responseObj = Newtonsoft.Json.JsonConvert.DeserializeObject<StratumResponse<T>>(strResponse);
 
             // Reset the state
             gotResponse.Reset();
@@ -195,7 +221,10 @@ namespace Stratum
 
                             if (!String.IsNullOrEmpty(requestId))
                             {
-                                responses.Add(requestId, strMessage);
+                                lock (responsesLock)
+                                {
+                                    responses.Add(requestId, strMessage);
+                                }
 
                                 gotResponse.Set();
                             }
diff --git a/StratumLibrary/Stratum.csproj b/StratumLibrary/Stratum.csproj
index 38deac1..dbaed4f 100644
--- a/StratumLibrary/Stratum.csproj
+++ b/StratumLibrary/Stratum.csproj
@@ -32,7 +32,6 @@
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Package>monodevelop</Package>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -44,6 +43,7 @@
     <Compile Include="Stratum.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StratumException.cs" />
+    <Compile Include="StratumNotification.cs" />
     <Compile Include="StratumRequest.cs" />
     <Compile Include="StratumResponse.cs" />
     <Compile Include="StratumReadState.cs" />
diff --git a/StratumLibrary/StratumReadState.cs b/StratumLibrary/StratumReadState.cs
index 78898ae..5d0ffa9 100644
--- a/StratumLibrary/StratumReadState.cs
+++ b/StratumLibrary/StratumReadState.cs
@@ -21,7 +21,7 @@ namespace Stratum
         /// <summary>
         /// Receive buffer size
         /// </summary>
-        public const int BufferSize = 8;
+        public const int BufferSize = 256;
         /// <summary>
         /// Receive buffer
         /// </summary>
diff --git a/StratumTest/Program.cs b/StratumTest/Program.cs
index 4131afc..ea64cbd 100644
--- a/StratumTest/Program.cs
+++ b/StratumTest/Program.cs
@@ -13,13 +13,13 @@ namespace StratumTest
 
             while (true)
             {
-				var res = s.Invoke<Newtonsoft.Json.Linq.JObject>("blockchain.headers.subscribe", new object[] {});
-
+                var res = s.Invoke<int>("blockchain.numblocks.subscribe");
+                
+                // var res = s.Invoke<Newtonsoft.Json.Linq.JObject>("blockchain.headers.subscribe");
                 // var res = s.Invoke<string>("blockchain.transaction.get", "101379cb55ac431c435db40b4325f858568b0de3d8bd652a23a19e5d62521a72");
-
-                //                var res = s.Invoke<Newtonsoft.Json.Linq.JObject>("blockchain.address.get_balance", "4PQtUNZ2aBYpZpVMPV2Qgz1PitCqgoT388");
-                //                var res = s.Invoke<Newtonsoft.Json.Linq.JArray>("blockchain.address.get_history", "4PQtUNZ2aBYpZpVMPV2Qgz1PitCqgoT388");
-                //                var res = s.Invoke<Newtonsoft.Json.Linq.JArray>("blockchain.address.listunspent", "4PQtUNZ2aBYpZpVMPV2Qgz1PitCqgoT388");
+                // var res = s.Invoke<Newtonsoft.Json.Linq.JObject>("blockchain.address.get_balance", "4PQtUNZ2aBYpZpVMPV2Qgz1PitCqgoT388");
+                // var res = s.Invoke<Newtonsoft.Json.Linq.JArray>("blockchain.address.get_history", "4PQtUNZ2aBYpZpVMPV2Qgz1PitCqgoT388");
+                // var res = s.Invoke<Newtonsoft.Json.Linq.JArray>("blockchain.address.listunspent", "4PQtUNZ2aBYpZpVMPV2Qgz1PitCqgoT388");
 
                 Console.Write(res.Result.ToString());
                 Console.ReadLine();
diff --git a/StratumTest/StratumTest.csproj b/StratumTest/StratumTest.csproj
index 607095f..d8fabb0 100644
--- a/StratumTest/StratumTest.csproj
+++ b/StratumTest/StratumTest.csproj
@@ -32,13 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />