Add support for OP_GENERIC_CLASS_INIT

[mono.git] / mono / io-layer / handles.c

diff --git a/mono/io-layer/handles.c b/mono/io-layer/handles.c
index cb0033f5a1ba613a88c4f7a3b3b93f69ab764588..c6657dea405fae40128ca2d373287dabc312e384 100644 (file)
--- a/mono/io-layer/handles.c
+++ b/mono/io-layer/handles.c
@@ -13,7 +13,9 @@
 #include <pthread.h>
 #include <errno.h>
 #include <unistd.h>
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 #include <string.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
@@ -42,6 +44,7 @@
 #include <mono/io-layer/process-private.h>
 
 #include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-proclib.h>
 #undef DEBUG_REFS
 
 #if 0
@@ -216,6 +219,12 @@ static void handle_cleanup (void)
                g_free (_wapi_private_handles [i]);
 }
 
+int
+wapi_getdtablesize (void)
+{
+       return eg_getdtablesize ();
+}
+
 /*
  * wapi_init:
  *
@@ -226,19 +235,8 @@ wapi_init (void)
 {
        g_assert ((sizeof (handle_ops) / sizeof (handle_ops[0]))
                  == WAPI_HANDLE_COUNT);
-       
-#ifdef HAVE_GETRLIMIT
-       {
-               struct rlimit limit;
-               int res;
 
-               res = getrlimit (RLIMIT_NOFILE, &limit);
-               g_assert (res == 0);
-               _wapi_fd_reserve = limit.rlim_cur;
-       }
-#else
-       _wapi_fd_reserve = getdtablesize();
-#endif
+       _wapi_fd_reserve = wapi_getdtablesize ();
 
        /* This is needed by the code in _wapi_handle_new_internal */
        _wapi_fd_reserve = (_wapi_fd_reserve + (_WAPI_HANDLE_INITIAL_COUNT - 1)) & ~(_WAPI_HANDLE_INITIAL_COUNT - 1);
@@ -281,13 +279,6 @@ wapi_init (void)
        _wapi_global_signal_mutex = &_WAPI_PRIVATE_HANDLES (GPOINTER_TO_UINT (_wapi_global_signal_handle)).signal_mutex;
 
        wapi_processes_init ();
-
-       /* Using g_atexit here instead of an explicit function call in
-        * a cleanup routine lets us cope when a third-party library
-        * calls exit (eg if an X client loses the connection to its
-        * server.)
-        */
-       g_atexit (handle_cleanup);
 }
 
 void
@@ -300,6 +291,7 @@ wapi_cleanup (void)
        _wapi_error_cleanup ();
        _wapi_thread_cleanup ();
        wapi_processes_cleanup ();
+       handle_cleanup ();
 }
 
 static void _wapi_handle_init_shared (struct _WapiHandleShared *handle,
@@ -1511,6 +1503,13 @@ static int timedwait_signal_poll_cond (pthread_cond_t *cond, mono_mutex_t *mutex
        int ret;
 
        if (!alertable) {
+               /*
+                * pthread_cond_(timed)wait() can return 0 even if the condition was not
+                * signalled.  This happens at least on Darwin.  We surface this, i.e., we
+                * get spurious wake-ups.
+                *
+                * http://pubs.opengroup.org/onlinepubs/007908775/xsh/pthread_cond_wait.html
+                */
                if (timeout)
                        ret=mono_cond_timedwait (cond, mutex, timeout);
                else
@@ -1647,7 +1646,7 @@ wapi_share_info_hash (gconstpointer data)
        return s->inode;
 }
 
-gboolean _wapi_handle_get_or_set_share (dev_t device, ino_t inode,
+gboolean _wapi_handle_get_or_set_share (guint64 device, guint64 inode,
                                        guint32 new_sharemode,
                                        guint32 new_access,
                                        guint32 *old_sharemode,
@@ -1814,8 +1813,6 @@ static void _wapi_handle_check_share_by_pid (struct _WapiFileShare *share_info)
 void _wapi_handle_check_share (struct _WapiFileShare *share_info, int fd)
 {
        gboolean found = FALSE, proc_fds = FALSE;
-       pid_t self = _wapi_getpid ();
-       int pid;
        int thr_ret, i;
        
        /* Prevents entries from expiring under us if we remove this