Updating C# Examples: Interrupt

metadings · Jan 24, 2015 · 5593267 · 5593267
1 parent 5848f7d
commit 5593267
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/examples/C#/ZGuideExamples.csproj b/examples/C#/ZGuideExamples.csproj
@@ -18,7 +18,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Externalconsole>true</Externalconsole>
-    <Commandlineparameters>PPQueue Ulrich0</Commandlineparameters>
+    <Commandlineparameters>Interrupt</Commandlineparameters>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>

diff --git a/examples/C#/interrupt.cs b/examples/C#/interrupt.cs
@@ -23,47 +23,42 @@ public static void Interrupt(IDictionary<string, string> dict, string[] args)
 			{
 				Console.CancelKeyPress += (sender, e) =>
 				{
-					// e.Cancel = false;
-					context.Terminate();
+					e.Cancel = false;
+					// context.Terminate();
 				};
 
-				var thread = new Thread(() =>
+				responder.Bind("tcp://*:5555");
+
+				var error = ZError.None;
+				ZFrame request;
+				while (true)
 				{
-					while (true)
+					if (Console.KeyAvailable)
 					{
-						if (Console.KeyAvailable)
+						ConsoleKeyInfo info = Console.ReadKey(true);
+						if (info.Modifiers == ConsoleModifiers.Control && info.Key == ConsoleKey.C)
 						{
-							ConsoleKeyInfo info = Console.ReadKey(true);
-							if (info.Modifiers == ConsoleModifiers.Control && info.Key == ConsoleKey.C)
-							{
-								break;
-							} 
-							if (info.Key == ConsoleKey.Escape)
-							{
-								context.Terminate();
-								break;
-							}
+							// error = ZError.ETERM;
+							// break;
+							context.Terminate();
+						} 
+						if (info.Key == ConsoleKey.Escape)
+						{
+							context.Terminate();
 						}
-						Thread.Sleep(1);
 					}
-				});
-				thread.Start();
-				thread.Join(64);
-
-
-				responder.Bind("tcp://*:5555");
 
-				ZError error;
-				ZFrame request;
-				while (true)
-				{
-					if (null == (request = responder.ReceiveFrame(out error)))
+					if (null == (request = responder.ReceiveFrame(ZSocketFlags.DontWait, out error)))
 					{
-						if (error == ZError.ETERM)
+						if (error == ZError.EAGAIN)
 						{
-							Console.WriteLine("Terminating, you have pressed ESC.");
-							break;
+							error = ZError.None;
+							Thread.Sleep(1);
+
+							continue;
 						}
+						if (error == ZError.ETERM)
+							break;	// Interrupted
 						throw new ZException(error);
 					}
 
@@ -78,15 +73,21 @@ public static void Interrupt(IDictionary<string, string> dict, string[] args)
 							if (!responder.Send(response, out error))
 							{
 								if (error == ZError.ETERM)
-								{
-									Console.WriteLine("Terminating, you have pressed ESC.");
-									break;
-								}
+									break;	// Interrupted
 								throw new ZException(error);
 							}
 						}
 					}
 				}
+
+				if (error == ZError.ETERM)
+				{
+					Console.WriteLine("Terminating, you have pressed ESC.");
+				}
+				else
+				{
+					throw new ZException(error);
+				}
 			}
 		}
 	}