Merge pull request #913 from Daniel15/fix-catchall-routing-master

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

diff --git a/mono/metadata/mono-cq.c b/mono/metadata/mono-cq.c
index 43d136fd73f183fae13c626a50b154adf1335c70..c2bf26db944e5cc12f7f2d8d00108ab38ec16514 100644 (file)
--- a/mono/metadata/mono-cq.c
+++ b/mono/metadata/mono-cq.c
@@ -5,11 +5,14 @@
  *   Gonzalo Paniagua Javier (gonzalo@novell.com)
  *
  * Copyright (c) 2011 Novell, Inc (http://www.novell.com)
+ * Copyright 2011 Xamarin Inc
  */
 
 #include <mono/metadata/object.h>
 #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__)
@@ -53,8 +56,8 @@ mono_cqitem_alloc (void)
                g_assert (monocq_item_vtable);
        }
        queue = (MonoCQItem *) mono_object_new_fast (monocq_item_vtable);
-       queue->array = mono_array_new (domain, mono_defaults.object_class, CQ_ARRAY_SIZE);
-       queue->array_state = mono_array_new (domain, mono_defaults.byte_class, CQ_ARRAY_SIZE);
+       MONO_OBJECT_SETREF (queue, array, mono_array_new (domain, mono_defaults.object_class, CQ_ARRAY_SIZE));
+       MONO_OBJECT_SETREF (queue, array_state, mono_array_new (domain, mono_defaults.byte_class, CQ_ARRAY_SIZE));
        return queue;
 }
 
@@ -64,8 +67,8 @@ mono_cq_create ()
        MonoCQ *cq;
 
        cq = g_new0 (MonoCQ, 1);
-       MONO_GC_REGISTER_ROOT (cq->head);
-       MONO_GC_REGISTER_ROOT (cq->tail);
+       MONO_GC_REGISTER_ROOT_SINGLE (cq->head);
+       MONO_GC_REGISTER_ROOT_SINGLE (cq->tail);
        cq->head = mono_mlist_alloc ((MonoObject *) mono_cqitem_alloc ());
        cq->tail = cq->head;
        CQ_DEBUG ("Created %p", cq);
@@ -79,7 +82,7 @@ mono_cq_destroy (MonoCQ *cq)
        if (!cq)
                return;
 
-       memset (cq, 0, sizeof (MonoCQ));
+       mono_gc_bzero_aligned (cq, sizeof (MonoCQ));
        MONO_GC_UNREGISTER_ROOT (cq->tail);
        MONO_GC_UNREGISTER_ROOT (cq->head);
        g_free (cq);
@@ -104,7 +107,11 @@ mono_cq_add_node (MonoCQ *cq)
        CQ_DEBUG ("Adding node");
        n = mono_mlist_alloc ((MonoObject *) mono_cqitem_alloc ());
        prev_tail = cq->tail;
-       prev_tail->next = n;
+       MONO_OBJECT_SETREF (prev_tail, next, n);
+
+       /* prev_tail->next must be visible before the new tail is */
+       STORE_STORE_FENCE;
+
        cq->tail = n;
 }
 
@@ -125,8 +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_set (queue->array_state, char, pos, TRUE);
+                       mono_array_setref_fast (queue->array, pos, obj);
+                       STORE_STORE_FENCE;
+                       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);
@@ -201,9 +209,23 @@ mono_cqitem_try_dequeue (MonoCQ *cq, MonoObject **obj)
                        while (mono_array_get (queue->array_state, char, pos) == FALSE) {
                                SleepEx (0, FALSE);
                        }
+                       LOAD_LOAD_FENCE;
                        *obj = mono_array_get (queue->array, MonoObject *, pos);
+
+                       /*
+                       Here don't need to fence since the only spot that reads it is the one above.
+                       Additionally, the first store is superfluous, so it can happen OOO with the second.
+                       */
                        mono_array_set (queue->array, MonoObject *, pos, NULL);
                        mono_array_set (queue->array_state, char, pos, FALSE);
+                       
+                       /*
+                       We should do a STORE_LOAD fence here to make sure subsequent loads see new state instead
+                       of the above stores. We can safely ignore this as the only issue of seeing a stale value
+                       is the thread yielding. Given how unfrequent this will be in practice, we better avoid the
+                       very expensive STORE_LOAD fence.
+                       */
+                       
                        if ((pos + 1) == CQ_ARRAY_SIZE) {
                                mono_cq_remove_node (cq);
                        }