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

Fix wrong #ifdef usages with #if

Browse source 
Apparently #ifdef is always true
This commit is contained in:
Takashi Kokubun 2020-11-20 23:48:39 -08:00
parent 27d5af59a3
commit 8750d001c2
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mjit.c
View file

@ -887,7 +887,7 @@ skip_cleaning_object_files(struct rb_mjit_unit_list *list)
// No mutex for list, assuming MJIT worker does not exist yet since it's immediately after fork. // No mutex for list, assuming MJIT worker does not exist yet since it's immediately after fork.
list_for_each_safe(&list->head, unit, next, unode) { list_for_each_safe(&list->head, unit, next, unode) {
#ifdef USE_JIT_COMPACTION #if USE_JIT_COMPACTION
if (unit->c_file) unit->c_file_inherited_p = true; if (unit->c_file) unit->c_file_inherited_p = true;
#endif #endif

14
mjit_worker.c
View file

@ -140,10 +140,10 @@ typedef intptr_t pid_t;
// JIT compaction requires the header transformation because linking multiple .o files // JIT compaction requires the header transformation because linking multiple .o files
// doesn't work without having `static` in the same function definitions. We currently // doesn't work without having `static` in the same function definitions. We currently
// don't support transforming the MJIT header on Windows. // don't support transforming the MJIT header on Windows.
#ifndef _WIN32 #ifdef _WIN32
# define USE_JIT_COMPACTION 1
#else
# define USE_JIT_COMPACTION 0 # define USE_JIT_COMPACTION 0
#else
# define USE_JIT_COMPACTION 1
#endif #endif
// The unit structure that holds metadata of ISeq for MJIT. // The unit structure that holds metadata of ISeq for MJIT.
@ -153,7 +153,7 @@ struct rb_mjit_unit {
// Dlopen handle of the loaded object file. // Dlopen handle of the loaded object file.
void *handle; void *handle;
rb_iseq_t *iseq; rb_iseq_t *iseq;
#ifdef USE_JIT_COMPACTION #if USE_JIT_COMPACTION
// This value is always set for `compact_all_jit_code`. Also used for lazy deletion. // This value is always set for `compact_all_jit_code`. Also used for lazy deletion.
char *c_file; char *c_file;
// true if it's inherited from parent Ruby process and lazy deletion should be skipped. // true if it's inherited from parent Ruby process and lazy deletion should be skipped.
@ -401,7 +401,7 @@ remove_file(const char *filename)
static void static void
clean_temp_files(struct rb_mjit_unit *unit) clean_temp_files(struct rb_mjit_unit *unit)
{ {
#ifdef USE_JIT_COMPACTION #if USE_JIT_COMPACTION
if (unit->c_file) { if (unit->c_file) {
char *c_file = unit->c_file; char *c_file = unit->c_file;
@ -1172,7 +1172,7 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
start_time = real_ms_time(); start_time = real_ms_time();
success = compile_c_to_so(c_file, so_file); success = compile_c_to_so(c_file, so_file);
#ifdef USE_JIT_COMPACTION #if USE_JIT_COMPACTION
if (success) { if (success) {
// Always set c_file for compaction. The value is also used for lazy deletion. // Always set c_file for compaction. The value is also used for lazy deletion.
unit->c_file = strdup(c_file); unit->c_file = strdup(c_file);
@ -1311,7 +1311,7 @@ mjit_worker(void)
} }
CRITICAL_SECTION_FINISH(3, "in jit func replace"); CRITICAL_SECTION_FINISH(3, "in jit func replace");
#ifdef USE_JIT_COMPACTION #if USE_JIT_COMPACTION
// Combine .o files to one .so and reload all jit_func to improve memory locality. // Combine .o files to one .so and reload all jit_func to improve memory locality.
if (compact_units.length < max_compact_size if (compact_units.length < max_compact_size
&& ((!mjit_opts.wait && unit_queue.length == 0 && active_units.length > 1) && ((!mjit_opts.wait && unit_queue.length == 0 && active_units.length > 1)