Author: gonzalo
Date: 2005-04-15 19:52:21 -0400 (Fri, 15 Apr 2005)
New Revision: 43087
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/socket-io.h
trunk/mono/mono/metadata/threadpool.c
Log:
2005-04-15 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* socket-io.h: replaced old unused field with new 'blocking'.
* threadpool.c: restore socket blocking state on windows(tm).
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-04-15 23:50:42 UTC (rev 43086)
+++ trunk/mono/mono/metadata/ChangeLog 2005-04-15 23:52:21 UTC (rev 43087)
@@ -1,3 +1,8 @@
+2005-04-15 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * socket-io.h: replaced old unused field with new 'blocking'.
+ * threadpool.c: restore socket blocking state on windows(tm).
+
2005-04-14 Sebastien Pouliot <[EMAIL PROTECTED]>
* icall.c: don't return the codebase in the AssemblyName[] returned by
Modified: trunk/mono/mono/metadata/socket-io.h
===================================================================
--- trunk/mono/mono/metadata/socket-io.h 2005-04-15 23:50:42 UTC (rev
43086)
+++ trunk/mono/mono/metadata/socket-io.h 2005-04-15 23:52:21 UTC (rev
43087)
@@ -155,7 +155,7 @@
gint total;
MonoBoolean completed_synch;
MonoBoolean completed;
- MonoDelegate *real_callback;
+ MonoBoolean blocking;
gint error;
gint operation;
MonoAsyncResult *ares;
Modified: trunk/mono/mono/metadata/threadpool.c
===================================================================
--- trunk/mono/mono/metadata/threadpool.c 2005-04-15 23:50:42 UTC (rev
43086)
+++ trunk/mono/mono/metadata/threadpool.c 2005-04-15 23:52:21 UTC (rev
43087)
@@ -301,6 +301,13 @@
#ifdef EPOLL_DEBUG
g_print ("Dispatching event %d on socket %d\n", event,
state->handle);
#endif
+#ifdef PLATFORM_WIN32
+ {
+ int block;
+ block = state->blocking;
+ ioctlsocket (state->handle, FIONBIO, (gulong *) &block);
+ }
+#endif
InterlockedIncrement (&pending_io_items);
start_io_thread_or_queue (state->ares);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
