Merge pull request kevints#8 from andrewmains12/global_queue_offer

maxdjohnson · maxdjohnson · commit db545ac2978d · 2012-11-16T12:21:43.000-08:00
Some small fixes
diff --git a/gc-test/simple.rb b/gc-test/simple.rb
@@ -0,0 +1,9 @@
+#require 'GC'
+
+#gc.disable
+#Shallow graph
+1000000.times do
+  Hash.new
+end
+# GC.enable
+# GC.start
diff --git a/gc.c b/gc.c
@@ -437,7 +437,7 @@ typedef struct deque_struct {
 
 
 static void deque_init(deque_t* deque, int max_length);
-static void deque_init_with_buf(deque_t* deque, VALUE* buffer, int max_length);
+static void deque_destroy(deque_t* deque);
 /* Push val onto the front of deque. Returns 1 if successful, 0 if the stack is 
    already full.
 */
@@ -450,14 +450,19 @@ static int deque_full_p(deque_t* deque);
 static void deque_init(deque_t* deque, int max_length) {
     //TODO: check error and handle this reasonably
     VALUE* buffer = (VALUE*) malloc(sizeof(VALUE)*max_length);
-    deque_init_with_buf(deque, buffer, max_length);
-}
 
-static void deque_init_with_buf(deque_t* deque, VALUE* buffer, int max_length) {
     deque->buffer = buffer;
     deque->max_length = max_length;
     deque->length = 0;
-    deque->head = deque->tail = -1;  
+    deque->head = deque->tail = -1;
+}
+
+static void deque_destroy(deque_t* deque) {
+    free(deque->buffer);
+}
+
+static void deque_destroy_callback(void* deque) {
+    deque_destroy((deque_t*) deque);
 }
 
 static int deque_push(deque_t* deque, VALUE val) {
@@ -565,6 +570,7 @@ void global_queue_init(global_queue_t* global_queue) {
 }
 
 void global_queue_destroy(global_queue_t* global_queue) {
+    deque_destroy(&(global_queue->deque));
     pthread_mutex_destroy(&global_queue->lock);
     pthread_cond_destroy(&global_queue->wait_condition);
 }
@@ -647,7 +653,7 @@ void gc_mark_parallel(rb_objspace_t* objspace) {
     global_queue = &queuedata;
     global_queue_init(global_queue);
 
-    pthread_key_create(&thread_local_deque_k, NULL);
+    pthread_key_create(&thread_local_deque_k, deque_destroy_callback);
 
     pthread_attr_init(&attr);
     pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
@@ -2450,8 +2456,8 @@ gc_lazy_sweep(rb_objspace_t *objspace)
             return TRUE;
         }
     }
-
-    gc_marks(objspace);
+    //    gc_marks(objspace);
+    gc_mark_parallel(objspace);
 
     before_gc_sweep(objspace);
     if (objspace->heap.free_min > (heaps_used * HEAP_OBJ_LIMIT - objspace->heap.live_num)) {
