8000 Compact MJIT methods to single so file by k0kubun · Pull Request #1921 · ruby/ruby · GitHub
[go: up one dir, main page]
Skip to content

Compact MJIT methods to single so file #1921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Compact MJIT methods to single so file #1921

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30e4764
Prepare for implementing compaction
k0kubun Jul 27, 2018
36a23eb
Allow linking multiple .o files
k0kubun Jul 28, 2018
9a73679
Link multiple .o files in the end
k0kubun Jul 28, 2018
824dcb6
Lazily dlclose compacted .so handle
k0kubun Jul 28, 2018
8dc336b
Load compacted JIT code
k0kubun Jul 28, 2018
a6dd1d6
Drop mjit_many_methods.yml for now
k0kubun Jul 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Load compacted JIT code
  • Loading branch information
@k0kubun
k0kubun committed Jul 28, 2018
commit 8dc336bbb1e9b61f72db85cd3f70a958c63a882c
27 changes: 20 additions & 7 deletions mjit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,19 +926,32 @@ compact_all_jit_code(void)
node->unit = unit;
add_to_list(node, &compact_units);

CRITICAL_SECTION_START(3, "in compact_all_jit_code to read list");
for (node = active_units.head; node != NULL; node = node->next) {
/* set JIT */
}
CRITICAL_SECTION_FINISH(3, "in compact_all_jit_code to read list");

if (!mjit_opts.save_temps) {
#ifdef _WIN32
unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */
#else
remove_file(so_file);
#endif
}

CRITICAL_SECTION_START(3, "in compact_all_jit_code to read list");
for (node = active_units.head; node != NULL; node = node->next) {
void *func;
char funcname[35]; /* TODO: reconsider `35` */
sprintf(funcname, "_mjit%d", node->unit->id);

if ((func = dlsym(handle, funcname)) == NULL) {
if (mjit_opts.warnings || mjit_opts.verbose)
fprintf(stderr, "MJIT warning: skipping to reload '%s' from '%s': %s\n", funcname, so_file, dlerror());
continue;
}

if (node->unit->iseq) { /* Check whether GCed or not */
/* Usage of jit_code might be not in a critical section. */
MJIT_ATOMIC_SET(node->unit->iseq->body->jit_func, (mjit_func_t)func);
}
}
CRITICAL_SECTION_FINISH(3, "in compact_all_jit_code to read list");
verbose(1, "JIT compaction (%.1fms): Compacted %d methods -> %s", end_time - start_time, active_units.length, so_file);
}
else {
Expand Down Expand Up @@ -1005,7 +1018,7 @@ remove_file(const char *filename)
static mjit_func_t
convert_unit_to_func(struct rb_mjit_unit *unit)
{
char c_file_buff[MAXPATHLEN], *c_file = c_file_buff, *so_file, funcname[35];
char c_file_buff[MAXPATHLEN], *c_file = c_file_buff, *so_file, funcname[35]; /* TODO: reconsider `35` */
int success;
int fd;
FILE *f;
Expand Down
0