kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mjit_worker.c: don't use ruby_strdup

Browse source 
on MJIT worker. That may trigger GC. And handled strdup failure instead.

mjit_compile.c: update comment about GC

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-08-11 14:18:55 +00:00
parent 591b2566d7
commit 004b8ad0c3
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mjit_compile.c
View file

@ -8,7 +8,7 @@
/* NOTE: All functions in this file are executed on MJIT worker. So don't /* NOTE: All functions in this file are executed on MJIT worker. So don't
call Ruby methods (C functions that may call rb_funcall) or trigger call Ruby methods (C functions that may call rb_funcall) or trigger
GC (using xmalloc, ZALLOC, etc.) in this file. */ GC (using ZALLOC, xmalloc, xfree, etc.) in this file. */
#include "internal.h" #include "internal.h"
#include "vm_core.h" #include "vm_core.h"

15
mjit_worker.c
View file

@ -8,7 +8,7 @@
/* NOTE: All functions in this file are executed on MJIT worker. So don't /* NOTE: All functions in this file are executed on MJIT worker. So don't
call Ruby methods (C functions that may call rb_funcall) or trigger call Ruby methods (C functions that may call rb_funcall) or trigger
GC (using xmalloc, ZALLOC, etc.) in this file. */ GC (using ZALLOC, xmalloc, xfree, etc.) in this file. */
/* We utilize widely used C compilers (GCC and LLVM Clang) to /* We utilize widely used C compilers (GCC and LLVM Clang) to
implement MJIT. We feed them a C code generated from ISEQ. The implement MJIT. We feed them a C code generated from ISEQ. The
@ -78,7 +78,6 @@
#include "gc.h" #include "gc.h"
#include "ruby_assert.h" #include "ruby_assert.h"
#include "ruby/thread.h" #include "ruby/thread.h"
#include "ruby/util.h"
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
@ -95,9 +94,11 @@
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> # include <sys/param.h>
#endif #endif
#include "dln.h" #include "dln.h"
#include "ruby/util.h"
#undef strdup /* ruby_strdup may trigger GC */
#ifndef MAXPATHLEN #ifndef MAXPATHLEN
# define MAXPATHLEN 1024 # define MAXPATHLEN 1024
#endif #endif
@ -885,6 +886,8 @@ compact_all_jit_code(void)
if (!mjit_opts.save_temps) { if (!mjit_opts.save_temps) {
# ifdef _WIN32 # ifdef _WIN32
unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */ unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */
if (unit->so_file == NULL)
mjit_warning("failed to allocate memory to lazily remove '%s': %s", so_file, strerror(errno));
# else # else
remove_file(so_file); remove_file(so_file);
# endif # endif
@ -1085,6 +1088,10 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
/* Alwasy set o_file for compaction. The value is also used for lazy deletion. */ /* Alwasy set o_file for compaction. The value is also used for lazy deletion. */
unit->o_file = strdup(o_file); unit->o_file = strdup(o_file);
if (unit->o_file == NULL) {
mjit_warning("failed to allocate memory to remember '%s' (%s), removing it...", o_file, strerror(errno));
remove_file(o_file);
}
} }
#endif #endif
end_time = real_ms_time(); end_time = real_ms_time();
@ -1100,6 +1107,8 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
if (!mjit_opts.save_temps) { if (!mjit_opts.save_temps) {
#ifdef _WIN32 #ifdef _WIN32
unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */ unit->so_file = strdup(so_file); /* lazily delete on `clean_object_files()` */
if (unit->so_file == NULL)
mjit_warning("failed to allocate memory to lazily remove '%s': %s", so_file, strerror(errno));
#else #else
remove_file(so_file); remove_file(so_file);
#endif #endif