[sgen] Don't return unused thread count from stop/start world functions.

[mono.git] / mono / metadata / sgen-gray.c

diff --git a/mono/metadata/sgen-gray.c b/mono/metadata/sgen-gray.c
index 3a1da29784f834a519812339bf28ade40ee1513e..4dfca503335ea7a665c4670c69e4035afc7ce17c 100644 (file)
--- a/mono/metadata/sgen-gray.c
+++ b/mono/metadata/sgen-gray.c
@@ -21,17 +21,16 @@
 #include "config.h"
 #ifdef HAVE_SGEN_GC
 
-#include "metadata/sgen-gc.h"
-#include "utils/mono-counters.h"
-#include "sgen-protocol.h"
+#include "mono/metadata/sgen-gc.h"
+#include "mono/metadata/sgen-protocol.h"
 
 #ifdef HEAVY_STATISTICS
-unsigned long long stat_gray_queue_section_alloc;
-unsigned long long stat_gray_queue_section_free;
-unsigned long long stat_gray_queue_enqueue_fast_path;
-unsigned long long stat_gray_queue_dequeue_fast_path;
-unsigned long long stat_gray_queue_enqueue_slow_path;
-unsigned long long stat_gray_queue_dequeue_slow_path;
+guint64 stat_gray_queue_section_alloc;
+guint64 stat_gray_queue_section_free;
+guint64 stat_gray_queue_enqueue_fast_path;
+guint64 stat_gray_queue_dequeue_fast_path;
+guint64 stat_gray_queue_enqueue_slow_path;
+guint64 stat_gray_queue_dequeue_slow_path;
 #endif
 
 #define GRAY_QUEUE_LENGTH_LIMIT        64
@@ -99,7 +98,7 @@ sgen_gray_object_free_queue_section (GrayQueueSection *section)
 void
 sgen_gray_object_enqueue (SgenGrayQueue *queue, char *obj, mword desc)
 {
-       GrayQueueEntry entry = { obj, desc };
+       GrayQueueEntry entry = SGEN_GRAY_QUEUE_ENTRY (obj, desc);
 
        HEAVY_STAT (stat_gray_queue_enqueue_slow_path ++);
 
@@ -141,7 +140,7 @@ sgen_gray_object_dequeue (SgenGrayQueue *queue)
        }
 
        STATE_ASSERT (queue->first, GRAY_QUEUE_SECTION_STATE_ENQUEUED);
-       SGEN_ASSERT (9, queue->cursor >= GRAY_FIRST_CURSOR_POSITION (queue->first), "gray queue %p underflow, first %p, cursor %d", queue, queue->first, queue->cursor);
+       SGEN_ASSERT (9, queue->cursor >= GRAY_FIRST_CURSOR_POSITION (queue->first), "gray queue %p underflow", queue);
 
        entry = *queue->cursor--;