Merge pull request booksbyus#656 from metadings/master

Updating C# Examples
linengier · Aug 11, 2016 · dafe237 · dafe237
2 parents fb9b7ac + 80cb955
commit dafe237
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 38 deletions.
diff --git a/examples/C#/README.md b/examples/C#/README.md
@@ -308,7 +308,7 @@ Use with LPClient.
 #### [Tripping](https://github.com/metadings/zguide/blob/master/examples/C%23/tripping.cs)
 
 ```
-	Usage: ./ZGuideExamples.exe Tripping
+	Usage: ./ZGuideExamples.exe [--verbose] Tripping
 ```
 
 #### [MMIEcho](https://github.com/metadings/zguide/blob/master/examples/C%23/mmiecho.cs)

diff --git a/examples/C#/mspoller.cs b/examples/C#/mspoller.cs
@@ -30,28 +30,24 @@ public static void MSPoller(string[] args)
 				subscriber.Connect("tcp://127.0.0.1:5556");
 				subscriber.SetOption(ZSocketOption.SUBSCRIBE, "10001 ");
 
-				var poll = ZPollItem.CreateReceiver();
+				var sockets = new ZSocket[] { receiver, subscriber };
+				var polls = new ZPollItem[] { ZPollItem.CreateReceiver(), ZPollItem.CreateReceiver() };
 
 				// Process messages from both sockets
 				ZError error;
-				ZMessage msg;
+				ZMessage[] msg;
 				while (true)
 				{
-					if (receiver.PollIn(poll, out msg, out error, TimeSpan.FromMilliseconds(64)))
+					if (sockets.PollIn(polls, out msg, out error, TimeSpan.FromMilliseconds(64)))
 					{
-						// Process task
-					}
-					else
-					{
-						if (error == ZError.ETERM)
-							return;	// Interrupted
-						if (error != ZError.EAGAIN)
-							throw new ZException(error);
-					}
-
-					if (subscriber.PollIn(poll, out msg, out error, TimeSpan.FromMilliseconds(64)))
-					{
-						// Process weather update
+						if (msg[0] != null)
+						{
+							// Process task
+						}
+						if (msg[1] != null)
+						{
+							// Process weather update
+						}
 					}
 					else
 					{

diff --git a/examples/C#/msreader.cs b/examples/C#/msreader.cs
@@ -36,28 +36,38 @@ public static void MSReader(string[] args)
 				ZFrame frame;
 				while (true)
 				{
-					if (null != (frame = receiver.ReceiveFrame(ZSocketFlags.DontWait, out error)))
+					while (true)
 					{
-						// Process task
-					}
-					else
-					{
-						if (error == ZError.ETERM)
-							return;	// Interrupted
-						if (error != ZError.EAGAIN)
-							throw new ZException(error);
-					}
+						if (null != (frame = receiver.ReceiveFrame(ZSocketFlags.DontWait, out error)))
+						{
+							// Process task
+						}
+						else
+						{
+							if (error == ZError.ETERM)
+								return;	// Interrupted
+							if (error != ZError.EAGAIN)
+								throw new ZException(error);
 
-					if (null != (frame = subscriber.ReceiveFrame(ZSocketFlags.DontWait, out error)))
-					{
-						// Process weather update
+							break;
+						}
 					}
-					else
+
+					while (true)
 					{
-						if (error == ZError.ETERM)
-							return;	// Interrupted
-						if (error != ZError.EAGAIN)
-							throw new ZException(error);
+						if (null != (frame = subscriber.ReceiveFrame(ZSocketFlags.DontWait, out error)))
+						{
+							// Process weather update
+						}
+						else
+						{
+							if (error == ZError.ETERM)
+								return;	// Interrupted
+							if (error != ZError.EAGAIN)
+								throw new ZException(error);
+
+							break;
+						}
 					}
 
 					// No activity, so sleep for 1 msec

diff --git a/examples/C#/tripping.cs b/examples/C#/tripping.cs
@@ -69,12 +69,11 @@ static void Tripping_ClientTask(ZContext ctx, ZSocket pipe, CancellationTokenSou
 
                 "Asynchronous round-trip test...".DumpString();
                 sw.Restart();
-                // sending 100000 requests => often ends in eagain exception in ZContext.Proxy!!
-                for (requests = 0; requests < 1000; requests++)
+                for (requests = 0; requests < 100000; requests++)
                     using (var outgoing = new ZFrame("hello"))
                         client.SendFrame(outgoing);
 
-                for (requests = 0; requests < 1000; requests++)
+                for (requests = 0; requests < 100000; requests++)
                     using (var reply = client.ReceiveFrame())
                         if (Verbose)
                             reply.ToString().DumpString();