[sgen] Fix internal allocator DTrace probes commit.

diff --git a/data/mono.d b/data/mono.d
index 0933e3b76453208ed910b5a04bdf7722e22a3086..dae3c397d0ed200d87adf97af68f4640e72b9991 100644 (file)
--- a/data/mono.d
+++ b/data/mono.d
@@ -75,7 +75,7 @@ provider mono {
        probe gc__global__remset__add (uintptr_t ref_addr, uintptr_t obj_addr, uintptr_t size, char *ns_name, char *class_name);
        probe gc__obj__cemented (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
 
-       probe gc__internal__alloc (uintptr_t addr, int type, uintptr_t size);
+       probe gc__internal__alloc (uintptr_t addr, uintptr_t size, int type);
        probe gc__internal__dealloc (uintptr_t add, uintptr_t size, int type);
 };
 

diff --git a/mono/metadata/sgen-internal.c b/mono/metadata/sgen-internal.c
index ad97e0d08920c82019fed08504ccd359e1c1f2bf..097cb7917a7917851cde225313f32cf66f9134ed 100644 (file)
--- a/mono/metadata/sgen-internal.c
+++ b/mono/metadata/sgen-internal.c
@@ -135,7 +135,7 @@ sgen_alloc_internal_dynamic (size_t size, int type, gboolean assert_on_failure)
                memset (p, 0, size);
        }
 
-       MONO_GC_INTERNAL_ALLOC (p, size, type);
+       MONO_GC_INTERNAL_ALLOC ((mword)p, size, type);
        return p;
 }
 
@@ -150,7 +150,7 @@ sgen_free_internal_dynamic (void *addr, size_t size, int type)
        else
                mono_lock_free_free (addr);
 
-       MONO_GC_INTERNAL_DEALLOC (addr, size, type);
+       MONO_GC_INTERNAL_DEALLOC ((mword)addr, size, type);
 }
 
 void*
@@ -163,7 +163,7 @@ sgen_alloc_internal (int type)
        p = mono_lock_free_alloc (&allocators [index]);
        memset (p, 0, size);
 
-       MONO_GC_INTERNAL_ALLOC (p, size, type);
+       MONO_GC_INTERNAL_ALLOC ((mword)p, size, type);
 
        return p;
 }
@@ -183,7 +183,7 @@ sgen_free_internal (void *addr, int type)
 
        if (MONO_GC_INTERNAL_DEALLOC_ENABLED ()) {
                int size = allocator_sizes [index];
-               MONO_GC_INTERNAL_DEALLOC (addr, size, type);
+               MONO_GC_INTERNAL_DEALLOC ((mword)addr, size, type);
        }
 }
 

diff --git a/mono/utils/dtrace.h b/mono/utils/dtrace.h
index 2cee8fa483b71dbdf96ff91598eea4c47d7bb5ba..4e242ba10e07027afb2be3993c2fcb3b3ef229fd 100644 (file)
--- a/mono/utils/dtrace.h
+++ b/mono/utils/dtrace.h
@@ -186,10 +186,10 @@
 #define MONO_GC_OBJ_CEMENTED_ENABLED() (0)
 
 
-#define MONO_GC_INTERNAL_ALLOC(addr,size)
+#define MONO_GC_INTERNAL_ALLOC(addr,size,type)
 #define MONO_GC_INTERNAL_ALLOC_ENABLED()       (0)
 
-#define MONO_GC_INTERNAL_DEALLOC(addr,size)
+#define MONO_GC_INTERNAL_DEALLOC(addr,size,type)
 #define MONO_GC_INTERNAL_DEALLOC_ENABLED()     (0)
 
 #endif