diff options
| -rw-r--r-- | mjit.c | 32 | ||||
| -rw-r--r-- | test/lib/jit_support.rb | 9 | ||||
| -rw-r--r-- | test/ruby/test_jit.rb | 12 |
3 files changed, 47 insertions, 6 deletions
@@ -115,7 +115,7 @@ extern int rb_thread_create_mjit_thread(void (*child_hook)(void), void (*worker_ #define dlopen(name,flag) ((void*)LoadLibrary(name)) #define dlerror() strerror(rb_w32_map_errno(GetLastError())) #define dlsym(handle,name) ((void*)GetProcAddress((handle),(name))) -#define dlclose(handle) (CloseHandle(handle)) +#define dlclose(handle) (FreeLibrary(handle)) #define RTLD_NOW -1 #define waitpid(pid,stat_loc,options) (WaitForSingleObject((HANDLE)(pid), INFINITE), GetExitCodeProcess((HANDLE)(pid), (LPDWORD)(stat_loc))) @@ -148,6 +148,10 @@ struct rb_mjit_unit { /* Dlopen handle of the loaded object file. */ void *handle; const rb_iseq_t *iseq; +#ifdef _WIN32 + /* DLL cannot be removed while loaded on Windows */ + char *so_file; +#endif /* Only used by unload_units. Flag to check this unit is currently on stack or not. */ char used_code_p; }; @@ -442,12 +446,30 @@ mjit_free_iseq(const rb_iseq_t *iseq) } static void +clean_so_file(struct rb_mjit_unit *unit) +{ +#ifdef _WIN32 +# undef Sleep + char *so_file = unit->so_file; + if (so_file) { + unit->so_file = NULL; + if (remove(so_file)) { + fprintf(stderr, "failed to remove \"%s\": %s\n", + so_file, strerror(errno)); + } + free(so_file); + } +#endif +} + +static void free_unit(struct rb_mjit_unit *unit) { if (unit->iseq) /* ISeq is not GCed */ unit->iseq->body->jit_func = 0; if (unit->handle) /* handle is NULL if it's in queue */ dlclose(unit->handle); + clean_so_file(unit); xfree(unit); } @@ -865,8 +887,13 @@ convert_unit_to_func(struct rb_mjit_unit *unit) } func = load_func_from_so(so_file, funcname, unit); - if (!mjit_opts.save_temps) + if (!mjit_opts.save_temps) { +#ifdef _WIN32 + unit->so_file = strdup(so_file); +#else remove(so_file); +#endif + } if ((ptrdiff_t)func > (ptrdiff_t)LAST_JIT_ISEQ_FUNC) { struct rb_mjit_unit_node *node = create_list_node(unit); @@ -1095,6 +1122,7 @@ unload_units(void) assert(unit->handle != NULL); dlclose(unit->handle); unit->handle = NULL; + clean_so_file(unit); } verbose(1, "Too many JIT code -- %d units unloaded", units_num - active_units.length); } diff --git a/test/lib/jit_support.rb b/test/lib/jit_support.rb index a6c22165be..3b0d21094d 100644 --- a/test/lib/jit_support.rb +++ b/test/lib/jit_support.rb @@ -7,9 +7,12 @@ module JITSupport ] module_function - def eval_with_jit(script, verbose: 0, min_calls: 5, timeout: JIT_TIMEOUT) - EnvUtil.invoke_ruby( - ['--disable-gems', '--jit-wait', "--jit-verbose=#{verbose}", "--jit-min-calls=#{min_calls}", '-e', script], + def eval_with_jit(env = nil, script, verbose: 0, min_calls: 5, save_temps: false, timeout: JIT_TIMEOUT) + args = ['--disable-gems', '--jit-wait', "--jit-verbose=#{verbose}", "--jit-min-calls=#{min_calls}"] + args << '--jit-save-temps' if save_temps + args << '-e' << script + args.unshift(env) if env + EnvUtil.invoke_ruby(args, '', true, true, timeout: timeout, ) end diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index b6cc48f80d..7542f8087e 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -564,6 +564,16 @@ class TestJIT < Test::Unit::TestCase end; end + def test_clean_so + Dir.mktmpdir("jit_test_clean_so_") do |dir| + code = "x = 0; 10.times {|i|x+=i}" + eval_with_jit({"TMPDIR"=>dir}, code) + assert_send([Dir, :empty?, dir]) + eval_with_jit({"TMPDIR"=>dir}, code, save_temps: true) + assert_not_send([Dir, :empty?, dir]) + end + end + private # The shortest way to test one proc @@ -606,7 +616,7 @@ class TestJIT < Test::Unit::TestCase # Run Ruby script with --jit-wait (Synchronous JIT compilation). # Returns [stdout, stderr] - def eval_with_jit(script, **opts) + def eval_with_jit(env = nil, script, **opts) stdout, stderr, status = super assert_equal(true, status.success?, "Failed to run script with JIT:\n#{code_block(script)}\nstdout:\n#{code_block(stdout)}\nstderr:\n#{code_block(stderr)}") [stdout, stderr] |