1 files changed, 54 insertions, 20 deletions

diff --git a/vm_trace.c b/vm_trace.c
index 38880d2dc8..e610110058 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -1572,6 +1572,11 @@ Init_vm_trace(void)
     Init_postponed_job();
 }
 
+typedef struct rb_postponed_job_struct {
+    rb_postponed_job_func_t func;
+    void *data;
+} rb_postponed_job_t;
+
 #define MAX_POSTPONED_JOB                  1000
 #define MAX_POSTPONED_JOB_SPECIAL_ADDITION   24
 
@@ -1579,56 +1584,85 @@ static void
 Init_postponed_job(void)
 {
     rb_vm_t *vm = GET_VM();
-    vm->postponed_jobs = st_init_numtable();
+    vm->postponed_job_buffer = ALLOC_N(rb_postponed_job_t, MAX_POSTPONED_JOB);
+    vm->postponed_job_index = 0;
 }
 
 enum postponed_job_register_result {
     PJRR_SUCCESS     = 0,
-    PJRR_FULL        = 1
+    PJRR_FULL        = 1,
+    PJRR_INTERRUPTED = 2
 };
 
+/* Async-signal-safe */
 static enum postponed_job_register_result
 postponed_job_register(rb_execution_context_t *ec, rb_vm_t *vm,
-		       unsigned int flags, rb_postponed_job_func_t func, void *data, size_t max)
+		       unsigned int flags, rb_postponed_job_func_t func, void *data, int max, int expected_index)
 {
-    if (vm->postponed_jobs->num_entries >= max) return PJRR_FULL;
+    rb_postponed_job_t *pjob;
+
+    if (expected_index >= max) return PJRR_FULL; /* failed */
+
+    if (ATOMIC_CAS(vm->postponed_job_index, expected_index, expected_index+1) == expected_index) {
+	pjob = &vm->postponed_job_buffer[expected_index];
+    }
+    else {
+	return PJRR_INTERRUPTED;
+    }
 
-    st_add_direct(vm->postponed_jobs, (st_index_t)func, (st_data_t)data);
+    /* unused: pjob->flags = flags; */
+    pjob->func = func;
+    pjob->data = data;
 
     RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(ec);
 
     return PJRR_SUCCESS;
 }
 
-
-/* return 0 if job buffer is full */
+/*
+ * return 0 if job buffer is full
+ * Async-signal-safe
+ */
 int
 rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data)
 {
     rb_execution_context_t *ec = GET_EC();
     rb_vm_t *vm = rb_ec_vm_ptr(ec);
 
-    switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB )) {
+  begin:
+    switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB, vm->postponed_job_index)) {
       case PJRR_SUCCESS    : return 1;
       case PJRR_FULL       : return 0;
+      case PJRR_INTERRUPTED: goto begin;
       default: rb_bug("unreachable\n");
     }
 }
 
-/* return 0 if job buffer is full */
+/*
+ * return 0 if job buffer is full
+ * Async-signal-safe
+ */
 int
 rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data)
 {
     rb_execution_context_t *ec = GET_EC();
     rb_vm_t *vm = rb_ec_vm_ptr(ec);
-
-    if (st_lookup(vm->postponed_jobs, (st_data_t)func, 0)) {
-        RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(ec);
-        return 2;
+    rb_postponed_job_t *pjob;
+    int i, index;
+
+  begin:
+    index = vm->postponed_job_index;
+    for (i=0; i<index; i++) {
+	pjob = &vm->postponed_job_buffer[i];
+	if (pjob->func == func) {
+	    RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(ec);
+	    return 2;
+	}
     }
-    switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB + MAX_POSTPONED_JOB_SPECIAL_ADDITION)) {
+    switch (postponed_job_register(ec, vm, flags, func, data, MAX_POSTPONED_JOB + MAX_POSTPONED_JOB_SPECIAL_ADDITION, index)) {
       case PJRR_SUCCESS    : return 1;
       case PJRR_FULL       : return 0;
+      case PJRR_INTERRUPTED: goto begin;
       default: rb_bug("unreachable\n");
     }
 }
@@ -1647,12 +1681,12 @@ rb_postponed_job_flush(rb_vm_t *vm)
     {
 	EC_PUSH_TAG(ec);
 	if (EC_EXEC_TAG() == TAG_NONE) {
-            st_data_t k, v;
-            while (st_shift(vm->postponed_jobs, &k, &v)) {
-                rb_postponed_job_func_t func = (rb_postponed_job_func_t)k;
-                void *arg = (void *)v;
-
-                func(arg);
+	    int index;
+	    while ((index = vm->postponed_job_index) > 0) {
+		if (ATOMIC_CAS(vm->postponed_job_index, index, index-1) == index) {
+		    rb_postponed_job_t *pjob = &vm->postponed_job_buffer[index-1];
+		    (*pjob->func)(pjob->data);
+		}
 	    }
 	}
 	EC_POP_TAG();