Merge pull request #2532 from lambdageek/monoerror-mono_object_new

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

diff --git a/mono/utils/mono-counters.c b/mono/utils/mono-counters.c
index 2c7dd19eb9fdbe645bd24c523eff158f5fa05048..17170a40ed2bec07c33b774255203416740f5543 100644 (file)
--- a/mono/utils/mono-counters.c
+++ b/mono/utils/mono-counters.c
@@ -8,7 +8,7 @@
 #include "config.h"
 #include "mono-counters.h"
 #include "mono-proclib.h"
-#include "mono-mutex.h"
+#include "mono-os-mutex.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -138,7 +138,7 @@ mono_counters_init (void)
        if (initialized)
                return;
 
-       mono_mutex_init (&counters_mutex);
+       mono_os_mutex_init (&counters_mutex);
 
        initialize_system_counters ();
 
@@ -155,19 +155,19 @@ register_internal (const char *name, int type, void *addr, int size)
        if ((type & MONO_COUNTER_VARIANCE_MASK) == 0)
                type |= MONO_COUNTER_MONOTONIC;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        for (counter = counters; counter; counter = counter->next) {
                if (counter->addr == addr) {
                        g_warning ("you are registering twice the same counter address");
-                       mono_mutex_unlock (&counters_mutex);
+                       mono_os_mutex_unlock (&counters_mutex);
                        return;
                }
        }
 
        counter = (MonoCounter *) malloc (sizeof (MonoCounter));
        if (!counter) {
-               mono_mutex_unlock (&counters_mutex);
+               mono_os_mutex_unlock (&counters_mutex);
                return;
        }
        counter->name = g_strdup (name);
@@ -191,7 +191,7 @@ register_internal (const char *name, int type, void *addr, int size)
        for (register_callback = register_callbacks; register_callback; register_callback = register_callback->next)
                ((MonoCounterRegisterCallback)register_callback->data) (counter);
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 /**
@@ -291,9 +291,9 @@ mono_counters_on_register (MonoCounterRegisterCallback callback)
                return;
        }
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
        register_callbacks = g_slist_append (register_callbacks, (gpointer) callback);
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 typedef int (*IntFunc) (void);
@@ -437,16 +437,16 @@ mono_counters_foreach (CountersEnumCallback cb, gpointer user_data)
                return;
        }
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        for (counter = counters; counter; counter = counter->next) {
                if (!cb (counter, user_data)) {
-                       mono_mutex_unlock (&counters_mutex);
+                       mono_os_mutex_unlock (&counters_mutex);
                        return;
                }
        }
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 #define COPY_COUNTER(type,functype) do {       \
@@ -600,10 +600,10 @@ mono_counters_dump (int section_mask, FILE *outfile)
        if (!initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        if (!counters) {
-               mono_mutex_unlock (&counters_mutex);
+               mono_os_mutex_unlock (&counters_mutex);
                return;
        }
 
@@ -622,7 +622,7 @@ mono_counters_dump (int section_mask, FILE *outfile)
        }
 
        fflush (outfile);
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 /**
@@ -638,7 +638,7 @@ mono_counters_cleanup (void)
        if (!initialized)
                return;
 
-       mono_mutex_lock (&counters_mutex);
+       mono_os_mutex_lock (&counters_mutex);
 
        counter = counters;
        counters = NULL;
@@ -649,7 +649,7 @@ mono_counters_cleanup (void)
                free (tmp);
        }
 
-       mono_mutex_unlock (&counters_mutex);
+       mono_os_mutex_unlock (&counters_mutex);
 }
 
 static MonoResourceCallback limit_reached = NULL;