Author: gonzalo
Date: 2005-04-13 22:11:02 -0400 (Wed, 13 Apr 2005)
New Revision: 42973
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/threadpool.c
Log:
2005-04-13 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* threadpool.c: fix non-AIO case.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-04-13 23:44:31 UTC (rev 42972)
+++ trunk/mono/mono/metadata/ChangeLog 2005-04-14 02:11:02 UTC (rev 42973)
@@ -1,3 +1,7 @@
+2005-04-13 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * threadpool.c: fix non-AIO case.
+
2005-04-13 Zoltan Varga <[EMAIL PROTECTED]>
* profiler.c (mono_profiler_install_simple): Add a 'jit' option to
Modified: trunk/mono/mono/metadata/threadpool.c
===================================================================
--- trunk/mono/mono/metadata/threadpool.c 2005-04-13 23:44:31 UTC (rev
42972)
+++ trunk/mono/mono/metadata/threadpool.c 2005-04-14 02:11:02 UTC (rev
42973)
@@ -515,11 +515,10 @@
if (ready == -1) {
int err = errno;
g_free (events);
- if (err != EBADF) {
+ if (err != EBADF)
g_warning ("epoll_wait: %d %s\n", err,
g_strerror (err));
- } else {
- close (epollfd);
- }
+
+ close (epollfd);
return;
}
@@ -639,10 +638,12 @@
#endif
#ifndef PLATFORM_WIN32
- if (data->epoll_disabled && pipe (data->pipe) != 0) {
- int err = errno;
- perror ("mono");
- g_assert (err);
+ if (data->epoll_disabled) {
+ if (pipe (data->pipe) != 0) {
+ int err = errno;
+ perror ("mono");
+ g_assert (err);
+ }
} else {
data->pipe [0] = -1;
data->pipe [1] = -1;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
