Author: jonpryor
Date: 2008-02-08 12:09:36 -0500 (Fri, 08 Feb 2008)
New Revision: 95280
Modified:
branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
Log:
* UnixSignal.cs: UnixSignal.WaitAny() should have the same return type
as
WaitHandle.WaitAny(). Oops.
Modified: branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/ChangeLog 2008-02-08
17:09:26 UTC (rev 95279)
+++ branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/ChangeLog 2008-02-08
17:09:36 UTC (rev 95280)
@@ -1,5 +1,10 @@
2008-02-08 Jonathan Pryor <[EMAIL PROTECTED]>
+ * UnixSignal.cs: UnixSignal.WaitAny() should have the same return type
as
+ WaitHandle.WaitAny(). Oops.
+
+2008-02-08 Jonathan Pryor <[EMAIL PROTECTED]>
+
* UnixSignal.cs: Modification of Info->count should be thread safe.
2008-01-28 Jonathan Pryor <[EMAIL PROTECTED]>
Modified: branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
===================================================================
--- branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
2008-02-08 17:09:26 UTC (rev 95279)
+++ branches/mono-1-9/mcs/class/Mono.Posix/Mono.Unix/UnixSignal.cs
2008-02-08 17:09:36 UTC (rev 95280)
@@ -131,16 +131,16 @@
AssertValid ();
if (exitContext)
throw new InvalidOperationException
("exitContext is not supported");
- return WaitAny (new UnixSignal[]{this},
millisecondsTimeout);
+ return WaitAny (new UnixSignal[]{this},
millisecondsTimeout) == 0;
}
#endregion
- public static bool WaitAny (UnixSignal[] signals)
+ public static int WaitAny (UnixSignal[] signals)
{
return WaitAny (signals, -1);
}
- public static bool WaitAny (UnixSignal[] signals, TimeSpan
timeout)
+ public static int WaitAny (UnixSignal[] signals, TimeSpan
timeout)
{
long ms = (long) timeout.TotalMilliseconds;
if (ms < -1 || ms > Int32.MaxValue)
@@ -148,7 +148,7 @@
return WaitAny (signals, (int) ms);
}
- public static unsafe bool WaitAny (UnixSignal[] signals, int
millisecondsTimeout)
+ public static unsafe int WaitAny (UnixSignal[] signals, int
millisecondsTimeout)
{
IntPtr[] infos = new IntPtr [signals.Length];
for (int i = 0; i < signals.Length; ++i) {
@@ -156,10 +156,7 @@
if (infos [i] == IntPtr.Zero)
throw new InvalidOperationException
("Disposed UnixSignal");
}
- int r = WaitAny (infos, infos.Length,
millisecondsTimeout);
- if (r > 0)
- return true;
- return false;
+ return WaitAny (infos, infos.Length,
millisecondsTimeout);
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
