X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem%2FSystem.IO%2FKeventWatcher.cs;h=f17eb58d28dca262aeb2205bcaa41468a5183292;hb=b8893efbccd64f92c81082e42b8e480b74881927;hp=8078964da30ea9f5e252b24e710e5131ea7de5b5;hpb=d166de315fe333cc504423ff9c0f3dedc6f23a2d;p=mono.git

diff --git a/mcs/class/System/System.IO/KeventWatcher.cs b/mcs/class/System/System.IO/KeventWatcher.cs
index 8078964da30..f17eb58d28d 100644
--- a/mcs/class/System/System.IO/KeventWatcher.cs
+++ b/mcs/class/System/System.IO/KeventWatcher.cs
@@ -317,10 +317,17 @@ namespace System.IO {
 			var eventBuffer = new kevent[0]; // we don't want to take any events from the queue at this point
 			var changes = CreateChangeList (ref initialFds);
 
-			int numEvents = kevent (conn, changes, changes.Length, eventBuffer, eventBuffer.Length, ref immediate_timeout);
+			int numEvents;
+			int errno = 0;
+			do {
+				numEvents = kevent (conn, changes, changes.Length, eventBuffer, eventBuffer.Length, ref immediate_timeout);
+				if (numEvents == -1) {
+					errno = Marshal.GetLastWin32Error ();
+				}
+			} while (numEvents == -1 && errno == EINTR);
 
 			if (numEvents == -1) {
-				var errMsg = String.Format ("kevent() error at initial event registration, error code = '{0}'", Marshal.GetLastWin32Error ());
+				var errMsg = String.Format ("kevent() error at initial event registration, error code = '{0}'", errno);
 				throw new IOException (errMsg);
 			}
 		}
@@ -384,9 +391,10 @@ namespace System.IO {
 					// Stop () signals us to stop by closing the connection
 					if (requestStop)
 						break;
-					if (++retries == 3)
+					int errno = Marshal.GetLastWin32Error ();
+					if (errno != EINTR && ++retries == 3)
 						throw new IOException (String.Format (
-							"persistent kevent() error, error code = '{0}'", Marshal.GetLastWin32Error ()));
+							"persistent kevent() error, error code = '{0}'", errno));
 
 					continue;
 				}
@@ -646,6 +654,7 @@ namespace System.IO {
 		const int O_EVTONLY = 0x8000;
 		const int F_GETPATH = 50;
 		const int __DARWIN_MAXPATHLEN = 1024;
+		const int EINTR = 4;
 		static readonly kevent[] emptyEventList = new System.IO.kevent[0];
 		int maxFds = Int32.MaxValue;