Merge pull request #943 from ermshiperete/bug-novell-325669

[mono.git] / mono / metadata / mono-cq.c

diff --git a/mono/metadata/mono-cq.c b/mono/metadata/mono-cq.c
index 01be2ef71f21fb348c8d664a0aecc1e0f0952070..4be4640e97a6e62e0b9e072dfbc1057ab2be4b6e 100644 (file)
--- a/mono/metadata/mono-cq.c
+++ b/mono/metadata/mono-cq.c
@@ -12,6 +12,7 @@
 #include <mono/metadata/mono-cq.h>
 #include <mono/metadata/mono-mlist.h>
 #include <mono/utils/mono-memory-model.h>
+#include <mono/utils/atomic.h>
 
 #define CQ_DEBUG(...)
 //#define CQ_DEBUG(...) g_message(__VA_ARGS__)
@@ -81,7 +82,7 @@ mono_cq_destroy (MonoCQ *cq)
        if (!cq)
                return;
 
-       mono_gc_bzero (cq, sizeof (MonoCQ));
+       mono_gc_bzero_aligned (cq, sizeof (MonoCQ));
        MONO_GC_UNREGISTER_ROOT (cq->tail);
        MONO_GC_UNREGISTER_ROOT (cq->head);
        g_free (cq);
@@ -131,9 +132,9 @@ mono_cqitem_try_enqueue (MonoCQ *cq, MonoObject *obj)
                }
 
                if (InterlockedCompareExchange (&queue->last, pos + 1, pos) == pos) {
-                       mono_array_setref (queue->array, pos, obj);
+                       mono_array_setref_fast (queue->array, pos, obj);
                        STORE_STORE_FENCE;
-                       mono_array_set (queue->array_state, char, pos, TRUE);
+                       mono_array_set_fast (queue->array_state, char, pos, TRUE);
                        if ((pos + 1) == CQ_ARRAY_SIZE) {
                                CQ_DEBUG ("enqueue(): pos + 1 == CQ_ARRAY_SIZE, %d. Adding node.", CQ_ARRAY_SIZE);
                                mono_cq_add_node (cq);
@@ -187,6 +188,8 @@ mono_cq_remove_node (MonoCQ *cq)
        while (old_head->next == NULL)
                SleepEx (0, FALSE);
        cq->head = old_head->next;
+       
+       MONO_OBJECT_SETREF (old_head, next, NULL);
        old_head = NULL;
 }