diff options
Diffstat (limited to 'debug.c')
-rw-r--r-- | debug.c | 472 |
1 files changed, 338 insertions, 134 deletions
@@ -14,9 +14,9 @@ #include <stdio.h> #include "eval_intern.h" +#include "encindex.h" #include "id.h" #include "internal/signal.h" -#include "internal/util.h" #include "ruby/encoding.h" #include "ruby/io.h" #include "ruby/ruby.h" @@ -51,31 +51,30 @@ const union { enum ruby_coderange_type enc_coderange_types; enum ruby_econv_flag_type econv_flag_types; rb_econv_result_t econv_result; + enum ruby_preserved_encindex encoding_index; enum ruby_robject_flags robject_flags; - enum ruby_robject_consts robject_consts; enum ruby_rmodule_flags rmodule_flags; enum ruby_rstring_flags rstring_flags; - enum ruby_rstring_consts rstring_consts; enum ruby_rarray_flags rarray_flags; enum ruby_rarray_consts rarray_consts; enum { - RUBY_FMODE_READABLE = FMODE_READABLE, - RUBY_FMODE_WRITABLE = FMODE_WRITABLE, - RUBY_FMODE_READWRITE = FMODE_READWRITE, - RUBY_FMODE_BINMODE = FMODE_BINMODE, - RUBY_FMODE_SYNC = FMODE_SYNC, - RUBY_FMODE_TTY = FMODE_TTY, - RUBY_FMODE_DUPLEX = FMODE_DUPLEX, - RUBY_FMODE_APPEND = FMODE_APPEND, - RUBY_FMODE_CREATE = FMODE_CREATE, - RUBY_FMODE_NOREVLOOKUP = 0x00000100, - RUBY_FMODE_TRUNC = FMODE_TRUNC, - RUBY_FMODE_TEXTMODE = FMODE_TEXTMODE, - RUBY_FMODE_PREP = 0x00010000, - RUBY_FMODE_SETENC_BY_BOM = FMODE_SETENC_BY_BOM, - RUBY_FMODE_UNIX = 0x00200000, - RUBY_FMODE_INET = 0x00400000, - RUBY_FMODE_INET6 = 0x00800000, + RUBY_FMODE_READABLE = FMODE_READABLE, + RUBY_FMODE_WRITABLE = FMODE_WRITABLE, + RUBY_FMODE_READWRITE = FMODE_READWRITE, + RUBY_FMODE_BINMODE = FMODE_BINMODE, + RUBY_FMODE_SYNC = FMODE_SYNC, + RUBY_FMODE_TTY = FMODE_TTY, + RUBY_FMODE_DUPLEX = FMODE_DUPLEX, + RUBY_FMODE_APPEND = FMODE_APPEND, + RUBY_FMODE_CREATE = FMODE_CREATE, + RUBY_FMODE_NOREVLOOKUP = 0x00000100, + RUBY_FMODE_TRUNC = FMODE_TRUNC, + RUBY_FMODE_TEXTMODE = FMODE_TEXTMODE, + RUBY_FMODE_EXTERNAL = 0x00010000, + RUBY_FMODE_SETENC_BY_BOM = FMODE_SETENC_BY_BOM, + RUBY_FMODE_UNIX = 0x00200000, + RUBY_FMODE_INET = 0x00400000, + RUBY_FMODE_INET6 = 0x00800000, RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT, RUBY_NODE_TYPEMASK = NODE_TYPEMASK, @@ -83,9 +82,9 @@ const union { RUBY_NODE_FL_NEWLINE = NODE_FL_NEWLINE } various; union { - enum imemo_type types; - enum {RUBY_IMEMO_MASK = IMEMO_MASK} mask; - struct RIMemo *ptr; + enum imemo_type types; + enum {RUBY_IMEMO_MASK = IMEMO_MASK} mask; + struct RIMemo *ptr; } imemo; struct RSymbol *symbol_ptr; enum vm_call_flag_bits vm_call_flags; @@ -97,9 +96,9 @@ int ruby_debug_print_indent(int level, int debug_level, int indent_level) { if (level < debug_level) { - fprintf(stderr, "%*s", indent_level, ""); - fflush(stderr); - return TRUE; + fprintf(stderr, "%*s", indent_level, ""); + fflush(stderr); + return TRUE; } return FALSE; } @@ -113,17 +112,17 @@ ruby_debug_printf(const char *format, ...) va_end(ap); } -#include "gc.h" +#include "internal/gc.h" VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj) { if (level < debug_level) { - char buff[0x100]; - rb_raw_obj_info(buff, 0x100, obj); + char buff[0x100]; + rb_raw_obj_info(buff, 0x100, obj); - fprintf(stderr, "DBG> %s: %s\n", header, buff); - fflush(stderr); + fprintf(stderr, "DBG> %s: %s\n", header, buff); + fflush(stderr); } return obj; } @@ -138,8 +137,8 @@ ID ruby_debug_print_id(int level, int debug_level, const char *header, ID id) { if (level < debug_level) { - fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id)); - fflush(stderr); + fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id)); + fflush(stderr); } return id; } @@ -148,13 +147,21 @@ NODE * ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node) { if (level < debug_level) { - fprintf(stderr, "DBG> %s: %s (%u)\n", header, - ruby_node_name(nd_type(node)), nd_line(node)); + fprintf(stderr, "DBG> %s: %s (id: %d, line: %d, location: (%d,%d)-(%d,%d))\n", + header, ruby_node_name(nd_type(node)), nd_node_id(node), nd_line(node), + nd_first_lineno(node), nd_first_column(node), + nd_last_lineno(node), nd_last_column(node)); } return (NODE *)node; } void +ruby_debug_print_n(const NODE *node) +{ + ruby_debug_print_node(0, 1, "", node); +} + +void ruby_debug_breakpoint(void) { /* */ @@ -178,12 +185,12 @@ ruby_env_debug_option(const char *str, int len, void *arg) int ov; size_t retlen; unsigned long n; +#define NAME_MATCH(name) (len == sizeof(name) - 1 && strncmp(str, (name), len) == 0) #define SET_WHEN(name, var, val) do { \ - if (len == sizeof(name) - 1 && \ - strncmp(str, (name), len) == 0) { \ - (var) = (val); \ - return 1; \ - } \ + if (NAME_MATCH(name)) { \ + (var) = (val); \ + return 1; \ + } \ } while (0) #define NAME_MATCH_VALUE(name) \ ((size_t)len >= sizeof(name)-1 && \ @@ -192,47 +199,47 @@ ruby_env_debug_option(const char *str, int len, void *arg) (str[sizeof(name)-1] == '=' && \ (str += sizeof(name), len -= sizeof(name), 1)))) #define SET_UINT(val) do { \ - n = ruby_scan_digits(str, len, 10, &retlen, &ov); \ - if (!ov && retlen) { \ - val = (unsigned int)n; \ - } \ - str += retlen; \ - len -= retlen; \ + n = ruby_scan_digits(str, len, 10, &retlen, &ov); \ + if (!ov && retlen) { \ + val = (unsigned int)n; \ + } \ + str += retlen; \ + len -= retlen; \ } while (0) #define SET_UINT_LIST(name, vals, num) do { \ - int i; \ - for (i = 0; i < (num); ++i) { \ - SET_UINT((vals)[i]); \ - if (!len || *str != ':') break; \ - ++str; \ - --len; \ - } \ - if (len > 0) { \ - fprintf(stderr, "ignored "name" option: `%.*s'\n", len, str); \ - } \ + int i; \ + for (i = 0; i < (num); ++i) { \ + SET_UINT((vals)[i]); \ + if (!len || *str != ':') break; \ + ++str; \ + --len; \ + } \ + if (len > 0) { \ + fprintf(stderr, "ignored "name" option: '%.*s'\n", len, str); \ + } \ } while (0) #define SET_WHEN_UINT(name, vals, num, req) \ - if (NAME_MATCH_VALUE(name)) SET_UINT_LIST(name, vals, num); + if (NAME_MATCH_VALUE(name)) { \ + if (!len) req; \ + else SET_UINT_LIST(name, vals, num); \ + return 1; \ + } - SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue); + if (NAME_MATCH("gc_stress")) { + rb_gc_initial_stress_set(Qtrue); + return 1; + } SET_WHEN("core", ruby_enable_coredump, 1); SET_WHEN("ci", ruby_on_ci, 1); - if (NAME_MATCH_VALUE("rgengc")) { - if (!len) ruby_rgengc_debug = 1; - else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1); - return 1; - } + SET_WHEN_UINT("rgengc", &ruby_rgengc_debug, 1, ruby_rgengc_debug = 1); #if defined _WIN32 # if RUBY_MSVCRT_VERSION >= 80 SET_WHEN("rtc_error", ruby_w32_rtc_error, 1); # endif #endif #if defined _WIN32 || defined __CYGWIN__ - if (NAME_MATCH_VALUE("codepage")) { - if (!len) fprintf(stderr, "missing codepage argument"); - else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage)); - return 1; - } + SET_WHEN_UINT("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage), + fprintf(stderr, "missing codepage argument")); #endif return 0; } @@ -241,15 +248,11 @@ static void set_debug_option(const char *str, int len, void *arg) { if (!ruby_env_debug_option(str, len, arg)) { - fprintf(stderr, "unexpected debug option: %.*s\n", len, str); + fprintf(stderr, "unexpected debug option: %.*s\n", len, str); } } -#ifdef USE_RUBY_DEBUG_LOG -STATIC_ASSERT(USE_RUBY_DEBUG_LOG, USE_RUBY_DEBUG_LOG ? RUBY_DEVEL : 1); -#endif - -#if RUBY_DEVEL +#if USE_RUBY_DEBUG_LOG static void setup_debug_log(void); #else #define setup_debug_log() @@ -262,23 +265,48 @@ ruby_set_debug_option(const char *str) setup_debug_log(); } -#if RUBY_DEVEL +#if USE_RUBY_DEBUG_LOG // RUBY_DEBUG_LOG features // See vm_debug.h comments for details. #define MAX_DEBUG_LOG 0x1000 #define MAX_DEBUG_LOG_MESSAGE_LEN 0x0200 -#define MAX_DEBUG_LOG_FILTER 0x0010 +#define MAX_DEBUG_LOG_FILTER_LEN 0x0020 +#define MAX_DEBUG_LOG_FILTER_NUM 0x0010 enum ruby_debug_log_mode ruby_debug_log_mode; +struct debug_log_filter { + enum debug_log_filter_type { + dlf_all, + dlf_file, // "file:..." + dlf_func, // "func:..." + } type; + bool negative; + char str[MAX_DEBUG_LOG_FILTER_LEN]; +}; + +static const char *dlf_type_names[] = { + "all", + "file", + "func", +}; + +#ifdef MAX_PATH +#define DEBUG_LOG_MAX_PATH (MAX_PATH-1) +#else +#define DEBUG_LOG_MAX_PATH 255 +#endif + static struct { char *mem; unsigned int cnt; - char filters[MAX_DEBUG_LOG_FILTER][MAX_DEBUG_LOG_FILTER]; + struct debug_log_filter filters[MAX_DEBUG_LOG_FILTER_NUM]; unsigned int filters_num; + bool show_pid; rb_nativethread_lock_t lock; + char output_file[DEBUG_LOG_MAX_PATH+1]; FILE *output; } debug_log; @@ -288,15 +316,86 @@ RUBY_DEBUG_LOG_MEM_ENTRY(unsigned int index) return &debug_log.mem[MAX_DEBUG_LOG_MESSAGE_LEN * index]; } +static enum debug_log_filter_type +filter_type(const char *str, int *skiplen) +{ + if (strncmp(str, "file:", 5) == 0) { + *skiplen = 5; + return dlf_file; + } + else if(strncmp(str, "func:", 5) == 0) { + *skiplen = 5; + return dlf_func; + } + else { + *skiplen = 0; + return dlf_all; + } +} + +static void +setup_debug_log_filter(void) +{ + const char *filter_config = getenv("RUBY_DEBUG_LOG_FILTER"); + + if (filter_config && strlen(filter_config) > 0) { + unsigned int i; + for (i=0; i<MAX_DEBUG_LOG_FILTER_NUM && filter_config; i++) { + size_t len; + const char *str = filter_config; + const char *p; + + if ((p = strchr(str, ',')) == NULL) { + len = strlen(str); + filter_config = NULL; + } + else { + len = p - str - 1; // 1 is ',' + filter_config = p + 1; + } + + // positive/negative + if (*str == '-') { + debug_log.filters[i].negative = true; + str++; + } + else if (*str == '+') { + // negative is false on default. + str++; + } + + // type + int skiplen; + debug_log.filters[i].type = filter_type(str, &skiplen); + len -= skiplen; + + if (len >= MAX_DEBUG_LOG_FILTER_LEN) { + fprintf(stderr, "too long: %s (max:%d)\n", str, MAX_DEBUG_LOG_FILTER_LEN - 1); + exit(1); + } + + // body + strncpy(debug_log.filters[i].str, str + skiplen, len); + debug_log.filters[i].str[len] = 0; + } + debug_log.filters_num = i; + + for (i=0; i<debug_log.filters_num; i++) { + fprintf(stderr, "RUBY_DEBUG_LOG_FILTER[%d]=%s (%s%s)\n", i, + debug_log.filters[i].str, + debug_log.filters[i].negative ? "-" : "", + dlf_type_names[debug_log.filters[i].type]); + } + } +} + static void setup_debug_log(void) { // check RUBY_DEBUG_LOG const char *log_config = getenv("RUBY_DEBUG_LOG"); - if (log_config) { - fprintf(stderr, "RUBY_DEBUG_LOG=%s\n", log_config); - - if (strcmp(log_config, "mem") == 0) { + if (log_config && strlen(log_config) > 0) { + if (strcmp(log_config, "mem") == 0) { debug_log.mem = (char *)malloc(MAX_DEBUG_LOG * MAX_DEBUG_LOG_MESSAGE_LEN); if (debug_log.mem == NULL) { fprintf(stderr, "setup_debug_log failed (can't allocate memory)\n"); @@ -309,58 +408,130 @@ setup_debug_log(void) } else { ruby_debug_log_mode |= ruby_debug_log_file; - if ((debug_log.output = fopen(log_config, "w")) == NULL) { + + // pid extension with %p + unsigned long len = strlen(log_config); + + for (unsigned long i=0, j=0; i<len; i++) { + const char c = log_config[i]; + + if (c == '%') { + i++; + switch (log_config[i]) { + case '%': + debug_log.output_file[j++] = '%'; + break; + case 'p': + snprintf(debug_log.output_file + j, DEBUG_LOG_MAX_PATH - j, "%d", getpid()); + j = strlen(debug_log.output_file); + break; + default: + fprintf(stderr, "can not parse RUBY_DEBUG_LOG filename: %s\n", log_config); + exit(1); + } + } + else { + debug_log.output_file[j++] = c; + } + + if (j >= DEBUG_LOG_MAX_PATH) { + fprintf(stderr, "RUBY_DEBUG_LOG=%s is too long\n", log_config); + exit(1); + } + } + + if ((debug_log.output = fopen(debug_log.output_file, "w")) == NULL) { fprintf(stderr, "can not open %s for RUBY_DEBUG_LOG\n", log_config); exit(1); } setvbuf(debug_log.output, NULL, _IONBF, 0); } + fprintf(stderr, "RUBY_DEBUG_LOG=%s %s%s%s\n", log_config, + (ruby_debug_log_mode & ruby_debug_log_memory) ? "[mem]" : "", + (ruby_debug_log_mode & ruby_debug_log_stderr) ? "[stderr]" : "", + (ruby_debug_log_mode & ruby_debug_log_file) ? "[file]" : ""); + if (debug_log.output_file[0]) { + fprintf(stderr, "RUBY_DEBUG_LOG filename=%s\n", debug_log.output_file); + } + rb_nativethread_lock_initialize(&debug_log.lock); + + setup_debug_log_filter(); + + if (getenv("RUBY_DEBUG_LOG_PID")) { + debug_log.show_pid = true; + } } +} - // check RUBY_DEBUG_LOG_FILTER - const char *filter_config = getenv("RUBY_DEBUG_LOG_FILTER"); - if (filter_config && strlen(filter_config) > 0) { - unsigned int i; - for (i=0; i<MAX_DEBUG_LOG_FILTER; i++) { - const char *p; - if ((p = strchr(filter_config, ',')) == NULL) { - if (strlen(filter_config) >= MAX_DEBUG_LOG_FILTER) { - fprintf(stderr, "too long: %s (max:%d)\n", filter_config, MAX_DEBUG_LOG_FILTER); - exit(1); - } - strncpy(debug_log.filters[i], filter_config, MAX_DEBUG_LOG_FILTER - 1); - i++; - break; - } - else { - size_t n = p - filter_config; - if (n >= MAX_DEBUG_LOG_FILTER) { - fprintf(stderr, "too long: %s (max:%d)\n", filter_config, MAX_DEBUG_LOG_FILTER); - exit(1); - } - strncpy(debug_log.filters[i], filter_config, n); - filter_config = p+1; - } +static bool +check_filter(const char *str, const struct debug_log_filter *filter, bool *state) +{ + if (filter->negative) { + if (strstr(str, filter->str) == NULL) { + *state = true; + return false; } - debug_log.filters_num = i; - for (i=0; i<debug_log.filters_num; i++) { - fprintf(stderr, "RUBY_DEBUG_LOG_FILTER[%d]=%s\n", i, debug_log.filters[i]); + else { + *state = false; + return true; + } + } + else { + if (strstr(str, filter->str) != NULL) { + *state = true; + return true; + } + else { + *state = false; + return false; } } } +// +// RUBY_DEBUG_LOG_FILTER=-foo,-bar,baz,boo +// returns true if +// (func_name or file_name) doesn't contain foo +// and +// (func_name or file_name) doesn't contain bar +// and +// (func_name or file_name) contains baz or boo +// +// RUBY_DEBUG_LOG_FILTER=foo,bar,-baz,-boo +// returns true if +// (func_name or file_name) contains foo or bar +// or +// (func_name or file_name) doesn't contain baz and +// (func_name or file_name) doesn't contain boo and +// +// You can specify "file:" (ex file:foo) or "func:" (ex func:foo) +// prefixes to specify the filter for. +// bool -ruby_debug_log_filter(const char *func_name) +ruby_debug_log_filter(const char *func_name, const char *file_name) { if (debug_log.filters_num > 0) { + bool state = false; + for (unsigned int i = 0; i<debug_log.filters_num; i++) { - if (strstr(func_name, debug_log.filters[i]) != NULL) { - return true; + const struct debug_log_filter *filter = &debug_log.filters[i]; + + switch (filter->type) { + case dlf_all: + if (check_filter(func_name, filter, &state)) return state; + if (check_filter(file_name, filter, &state)) return state; + break; + case dlf_func: + if (check_filter(func_name, filter, &state)) return state; + break; + case dlf_file: + if (check_filter(file_name, filter, &state)) return state; + break; } } - return false; + return state; } else { return true; @@ -378,6 +549,7 @@ pretty_filename(const char *path) return path; } +#undef ruby_debug_log void ruby_debug_log(const char *file, int line, const char *func_name, const char *fmt, ...) { @@ -385,10 +557,16 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm int len = 0; int r = 0; + if (debug_log.show_pid) { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "pid:%d\t", getpid()); + if (r < 0) rb_bug("ruby_debug_log returns %d", r); + len += r; + } + // message title if (func_name && len < MAX_DEBUG_LOG_MESSAGE_LEN) { r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "%s\t", func_name); - if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); + if (r < 0) rb_bug("ruby_debug_log returns %d", r); len += r; } @@ -407,13 +585,16 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm // C location if (file && len < MAX_DEBUG_LOG_MESSAGE_LEN) { r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "\t%s:%d", pretty_filename(file), line); - if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); + if (r < 0) rb_bug("ruby_debug_log returns %d", r); len += r; } + rb_execution_context_t *ec = rb_current_execution_context(false); + // Ruby location int ruby_line; - const char *ruby_file = rb_source_location_cstr(&ruby_line); + const char *ruby_file = ec ? rb_source_location_cstr(&ruby_line) : NULL; + if (len < MAX_DEBUG_LOG_MESSAGE_LEN) { if (ruby_file) { r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t%s:%d", pretty_filename(ruby_file), ruby_line); @@ -421,27 +602,50 @@ ruby_debug_log(const char *file, int line, const char *func_name, const char *fm else { r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t"); } - if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); + if (r < 0) rb_bug("ruby_debug_log returns %d", r); len += r; } - // ractor information - if (ruby_single_main_ractor == NULL) { - rb_ractor_t *cr = GET_RACTOR(); - if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%u/%u", - (unsigned int)rb_ractor_id(cr), GET_VM()->ractor.cnt); - if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); - len += r; - } +#ifdef RUBY_NT_SERIAL + // native thread information + if (len < MAX_DEBUG_LOG_MESSAGE_LEN) { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tnt:%d", ruby_nt_serial); + if (r < 0) rb_bug("ruby_debug_log returns %d", r); + len += r; } +#endif + + if (ec) { + rb_thread_t *th = ec ? rb_ec_thread_ptr(ec) : NULL; + + // ractor information + if (ruby_single_main_ractor == NULL) { + rb_ractor_t *cr = th ? th->ractor : NULL; + rb_vm_t *vm = GET_VM(); + + if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%d/%u (%u)", + cr ? (int)rb_ractor_id(cr) : -1, vm->ractor.cnt, vm->ractor.sched.running_cnt); - // thread information - if (!rb_thread_alone()) { - const rb_thread_t *th = GET_THREAD(); - if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { - r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%p", (void *)th); - if (r < 0) rb_bug("ruby_debug_log returns %d\n", r); + if (r < 0) rb_bug("ruby_debug_log returns %d", r); + len += r; + } + } + + // thread information + if (th && r && len < MAX_DEBUG_LOG_MESSAGE_LEN) { + rb_execution_context_t *rec = th->ractor ? th->ractor->threads.running_ec : NULL; + const rb_thread_t *rth = rec ? rec->thread_ptr : NULL; + const rb_thread_t *sth = th->ractor ? th->ractor->threads.sched.running : NULL; + + if (rth != th || sth != th) { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%u (rth:%d,sth:%d)", + rb_th_serial(th), rth ? (int)rb_th_serial(rth) : -1, sth ? (int)rb_th_serial(sth) : -1); + } + else { + r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%u", rb_th_serial(th)); + } + if (r < 0) rb_bug("ruby_debug_log returns %d", r); len += r; } } @@ -479,7 +683,7 @@ debug_log_dump(FILE *out, unsigned int n) int index = current_index - size + i; if (index < 0) index += MAX_DEBUG_LOG; VM_ASSERT(index <= MAX_DEBUG_LOG); - const char *mesg = RUBY_DEBUG_LOG_MEM_ENTRY(index);; + const char *mesg = RUBY_DEBUG_LOG_MEM_ENTRY(index); fprintf(out, "%4u: %s\n", debug_log.cnt - size + i, mesg); } } @@ -508,4 +712,4 @@ ruby_debug_log_dump(const char *fname, unsigned int n) fclose(fp); } } -#endif // #if RUBY_DEVEL +#endif // #if USE_RUBY_DEBUG_LOG |