Merge pull request #1621 from schani/fix-warnings

[mono.git] / mono / utils / mono-mmap.c

diff --git a/mono/utils/mono-mmap.c b/mono/utils/mono-mmap.c
index 6caf9628380f2f3ab8cab48c096dd5a913286e17..799506684adf8a2c7a44def47e2e8fe33bcd7051 100644 (file)
--- a/mono/utils/mono-mmap.c
+++ b/mono/utils/mono-mmap.c
@@ -20,11 +20,13 @@
 #if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <errno.h>
 #endif
 
@@ -244,12 +246,6 @@ mono_shared_area_instances (void **array, int count)
        return 0;
 }
 
-int
-mono_pages_not_faulted (void *addr, size_t length)
-{
-       return -1;
-}
-
 #else
 #if defined(HAVE_MMAP)
 
@@ -450,30 +446,6 @@ mono_mprotect (void *addr, size_t length, int flags)
 }
 #endif // __native_client__
 
-int
-mono_pages_not_faulted (void *addr, size_t size)
-{
-       int i;
-       gint64 count;
-       int pagesize = mono_pagesize ();
-       int npages = (size + pagesize - 1) / pagesize;
-       char *faulted = g_malloc0 (sizeof (char*) * npages);
-
-       if (mincore (addr, size, faulted) != 0) {
-               count = -1;
-       } else {
-               count = 0;
-               for (i = 0; i < npages; ++i) {
-                       if (faulted [i] != 0)
-                               ++count;
-               }
-       }
-
-       g_free (faulted);
-
-       return count;
-}
-
 #else
 
 /* dummy malloc-based implementation */
@@ -513,12 +485,6 @@ mono_mprotect (void *addr, size_t length, int flags)
        return 0;
 }
 
-int
-mono_pages_not_faulted (void *addr, size_t length)
-{
-       return -1;
-}
-
 #endif // HAVE_MMAP
 
 #if defined(HAVE_SHM_OPEN) && !defined (DISABLE_SHARED_PERFCOUNTERS)
@@ -645,7 +611,7 @@ mono_shared_area (void)
        header->stats_start = sizeof (SAreaHeader);
        header->stats_end = sizeof (SAreaHeader);
 
-       atexit (mono_shared_area_remove);
+       mono_atexit (mono_shared_area_remove);
        return res;
 }
 
@@ -766,3 +732,35 @@ mono_valloc_aligned (size_t size, size_t alignment, int flags)
        return aligned;
 }
 #endif
+
+int
+mono_pages_not_faulted (void *addr, size_t size)
+{
+#ifdef HAVE_MINCORE
+       int i;
+       gint64 count;
+       int pagesize = mono_pagesize ();
+       int npages = (size + pagesize - 1) / pagesize;
+       char *faulted = g_malloc0 (sizeof (char*) * npages);
+
+       /*
+        * We cast `faulted` to void* because Linux wants an unsigned
+        * char* while BSD wants a char*.
+        */
+       if (mincore (addr, size, (void*)faulted) != 0) {
+               count = -1;
+       } else {
+               count = 0;
+               for (i = 0; i < npages; ++i) {
+                       if (faulted [i] != 0)
+                               ++count;
+               }
+       }
+
+       g_free (faulted);
+
+       return count;
+#else
+       return -1;
+#endif
+}