summaryrefslogtreecommitdiff
path: root/mjit_worker.c
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-17 17:12:47 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-17 17:12:47 +0000
commit3fc26f601397f9b3e2893488749481f4df96df07 (patch)
treeedc26ea39bfff298172ab1b75924a4e0defd1377 /mjit_worker.c
parentcebc640790c084c110ae413231b976941fbfdc7f (diff)
Drop rb_mjit_unit from mjit_copy_job
and guard iseq from GC by marking iseq in mjit_copy_job. This is a refactoring for implementing inlining later and should not be fixing or introducing any bugs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mjit_worker.c')
-rw-r--r--mjit_worker.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/mjit_worker.c b/mjit_worker.c
index 2ca79d8..94eda53 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -1126,7 +1126,7 @@ convert_unit_to_func(struct rb_mjit_unit *unit, struct rb_call_cache *cc_entries
}
typedef struct {
- struct rb_mjit_unit *unit;
+ const rb_iseq_t *iseq;
struct rb_call_cache *cc_entries;
union iseq_inline_storage_entry *is_entries;
bool finish_p;
@@ -1134,7 +1134,7 @@ typedef struct {
/* Singleton MJIT copy job. This is made global since it needs to be durable even when MJIT worker thread is stopped.
(ex: register job -> MJIT pause -> MJIT resume -> dispatch job. Actually this should be just cancelled by finish_p check) */
-static mjit_copy_job_t mjit_copy_job;
+static mjit_copy_job_t mjit_copy_job = { .iseq = NULL, .finish_p = true };
static void mjit_copy_job_handler(void *data);
@@ -1204,14 +1204,12 @@ mjit_worker(void)
verbose(3, "Getting wakeup from client");
}
unit = get_from_list(&unit_queue);
+ if (unit) job->iseq = unit->iseq;
job->finish_p = true; // disable dispatching this job in mjit_copy_job_handler while it's being modified
CRITICAL_SECTION_FINISH(3, "in worker dequeue");
if (unit) {
- mjit_func_t func;
const struct rb_iseq_constant_body *body = unit->iseq->body;
-
- job->unit = unit;
job->cc_entries = NULL;
if (body->ci_size > 0 || body->ci_kw_size > 0)
job->cc_entries = alloca(sizeof(struct rb_call_cache) * (body->ci_size + body->ci_kw_size));
@@ -1226,8 +1224,8 @@ mjit_worker(void)
}
}
- /* JIT compile */
- func = convert_unit_to_func(unit, job->cc_entries, job->is_entries);
+ // JIT compile
+ mjit_func_t func = convert_unit_to_func(unit, job->cc_entries, job->is_entries);
CRITICAL_SECTION_START(3, "in jit func replace");
while (in_gc) { /* Make sure we're not GC-ing when touching ISeq */