Skip to content

Commit 6dd6fbd

Browse files
Watson1978Watson1978
authored
Use TRACE_PARSE_CALL() macro for debug log (#874)
I forgot to change these when I was add `-enable-trace-log` install option at #832.
1 parent 3311393 commit 6dd6fbd

4 files changed

Lines changed: 30 additions & 90 deletions

File tree

‎ext/oj/custom.c‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -937,9 +937,7 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
937937
break;
938938
default: break;
939939
}
940-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
941-
oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
942-
}
940+
TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rstr);
943941
}
944942
}
945943

@@ -998,9 +996,7 @@ static void hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
998996
break;
999997
default: break;
1000998
}
1001-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
1002-
oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
1003-
}
999+
TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rval);
10041000
}
10051001

10061002
static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
@@ -1011,19 +1007,15 @@ static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
10111007
case T_HASH: rb_hash_aset(parent->val, oj_calc_hash_key(pi, kval), value); break;
10121008
default: break;
10131009
}
1014-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
1015-
oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
1016-
}
1010+
TRACE_PARSE_CALL(pi->options.trace, "set_value", pi, value);
10171011
}
10181012

10191013
static void array_append_num(ParseInfo pi, NumInfo ni) {
10201014
Val parent = stack_peek(&pi->stack);
10211015
volatile VALUE rval = oj_num_as_value(ni);
10221016

10231017
rb_ary_push(parent->val, rval);
1024-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
1025-
oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
1026-
}
1018+
TRACE_PARSE_CALL(pi->options.trace, "append_number", pi, rval);
10271019
}
10281020

10291021
static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
@@ -1038,9 +1030,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
10381030
}
10391031
}
10401032
rb_ary_push(stack_peek(&pi->stack)->val, rstr);
1041-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
1042-
oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
1043-
}
1033+
TRACE_PARSE_CALL(pi->options.trace, "append_string", pi, rstr);
10441034
}
10451035

10461036
void oj_set_custom_callbacks(ParseInfo pi) {

‎ext/oj/object.c‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,7 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
446446
rb_class2name(rb_obj_class(parent->val)));
447447
return;
448448
}
449-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
450-
oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
451-
}
449+
TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rval);
452450
}
453451

454452
static void hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
@@ -517,9 +515,7 @@ static void hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
517515
rb_class2name(rb_obj_class(parent->val)));
518516
return;
519517
}
520-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
521-
oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, rval);
522-
}
518+
TRACE_PARSE_CALL(pi->options.trace, "add_number", pi, rval);
523519
}
524520

525521
static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
@@ -603,9 +599,7 @@ static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
603599
rb_class2name(rb_obj_class(parent->val)));
604600
return;
605601
}
606-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
607-
oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, value);
608-
}
602+
TRACE_PARSE_CALL(pi->options.trace, "add_value", pi, value);
609603
}
610604

611605
static VALUE start_hash(ParseInfo pi) {
@@ -651,32 +645,24 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
651645
}
652646
rval = str_to_value(pi, str, len, orig);
653647
rb_ary_push(stack_peek(&pi->stack)->val, rval);
654-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
655-
oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rval);
656-
}
648+
TRACE_PARSE_CALL(pi->options.trace, "append_string", pi, rval);
657649
}
658650

659651
static void array_append_num(ParseInfo pi, NumInfo ni) {
660652
volatile VALUE rval = oj_num_as_value(ni);
661653

662654
rb_ary_push(stack_peek(&pi->stack)->val, rval);
663-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
664-
oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
665-
}
655+
TRACE_PARSE_CALL(pi->options.trace, "append_number", pi, rval);
666656
}
667657

668658
static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
669659
pi->stack.head->val = str_to_value(pi, str, len, orig);
670-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
671-
oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, pi->stack.head->val);
672-
}
660+
TRACE_PARSE_CALL(pi->options.trace, "add_string", pi, pi->stack.head->val);
673661
}
674662

675663
static void add_num(ParseInfo pi, NumInfo ni) {
676664
pi->stack.head->val = oj_num_as_value(ni);
677-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
678-
oj_trace_parse_call("add_num", pi, __FILE__, __LINE__, pi->stack.head->val);
679-
}
665+
TRACE_PARSE_CALL(pi->options.trace, "add_num", pi, pi->stack.head->val);
680666
}
681667

682668
void oj_set_object_callbacks(ParseInfo pi) {

‎ext/oj/strict.c‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,29 +62,23 @@ static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
6262
}
6363

6464
static void add_value(ParseInfo pi, VALUE val) {
65-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
66-
oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
67-
}
65+
TRACE_PARSE_CALL(pi->options.trace, "add_value", pi, val);
6866
pi->stack.head->val = val;
6967
}
7068

7169
static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
7270
volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
7371

7472
pi->stack.head->val = rstr;
75-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
76-
oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, rstr);
77-
}
73+
TRACE_PARSE_CALL(pi->options.trace, "add_string", pi, rstr);
7874
}
7975

8076
static void add_num(ParseInfo pi, NumInfo ni) {
8177
if (ni->infinity || ni->nan) {
8278
oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
8379
}
8480
pi->stack.head->val = oj_num_as_value(ni);
85-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
86-
oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
87-
}
81+
TRACE_PARSE_CALL(pi->options.trace, "add_number", pi, pi->stack.head->val);
8882
}
8983

9084
static VALUE start_hash(ParseInfo pi) {
@@ -99,9 +93,7 @@ static void hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len,
9993
volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
10094

10195
rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), rstr);
102-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
103-
oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rstr);
104-
}
96+
TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rstr);
10597
}
10698

10799
static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
@@ -112,16 +104,12 @@ static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
112104
}
113105
v = oj_num_as_value(ni);
114106
rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), v);
115-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
116-
oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, v);
117-
}
107+
TRACE_PARSE_CALL(pi->options.trace, "set_number", pi, v);
118108
}
119109

120110
static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
121111
rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), value);
122-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
123-
oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
124-
}
112+
TRACE_PARSE_CALL(pi->options.trace, "set_value", pi, value);
125113
}
126114

127115
static VALUE start_array(ParseInfo pi) {
@@ -133,9 +121,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
133121
volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
134122

135123
rb_ary_push(stack_peek(&pi->stack)->val, rstr);
136-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
137-
oj_trace_parse_call("append_string", pi, __FILE__, __LINE__, rstr);
138-
}
124+
TRACE_PARSE_CALL(pi->options.trace, "append_string", pi, rstr);
139125
}
140126

141127
static void array_append_num(ParseInfo pi, NumInfo ni) {
@@ -146,16 +132,12 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
146132
}
147133
v = oj_num_as_value(ni);
148134
rb_ary_push(stack_peek(&pi->stack)->val, v);
149-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
150-
oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, v);
151-
}
135+
TRACE_PARSE_CALL(pi->options.trace, "append_number", pi, v);
152136
}
153137

154138
static void array_append_value(ParseInfo pi, VALUE value) {
155139
rb_ary_push(stack_peek(&pi->stack)->val, value);
156-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
157-
oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
158-
}
140+
TRACE_PARSE_CALL(pi->options.trace, "append_value", pi, value);
159141
}
160142

161143
void oj_set_strict_callbacks(ParseInfo pi) {

‎ext/oj/wab.c‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,7 @@ static VALUE noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
318318
}
319319

320320
static void add_value(ParseInfo pi, VALUE val) {
321-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
322-
oj_trace_parse_call("add_value", pi, __FILE__, __LINE__, val);
323-
}
321+
TRACE_PARSE_CALL(pi->options.trace, "add_value", pi, val);
324322
pi->stack.head->val = val;
325323
}
326324

@@ -468,19 +466,15 @@ static VALUE cstr_to_rstr(ParseInfo pi, const char *str, size_t len) {
468466

469467
static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
470468
pi->stack.head->val = cstr_to_rstr(pi, str, len);
471-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
472-
oj_trace_parse_call("add_string", pi, __FILE__, __LINE__, pi->stack.head->val);
473-
}
469+
TRACE_PARSE_CALL(pi->options.trace, "add_string", pi, pi->stack.head->val);
474470
}
475471

476472
static void add_num(ParseInfo pi, NumInfo ni) {
477473
if (ni->infinity || ni->nan) {
478474
oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
479475
}
480476
pi->stack.head->val = oj_num_as_value(ni);
481-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
482-
oj_trace_parse_call("add_number", pi, __FILE__, __LINE__, pi->stack.head->val);
483-
}
477+
TRACE_PARSE_CALL(pi->options.trace, "add_number", pi, pi->stack.head->val);
484478
}
485479

486480
static VALUE start_hash(ParseInfo pi) {
@@ -495,9 +489,7 @@ static void hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len,
495489
volatile VALUE rval = cstr_to_rstr(pi, str, len);
496490

497491
rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
498-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
499-
oj_trace_parse_call("set_string", pi, __FILE__, __LINE__, rval);
500-
}
492+
TRACE_PARSE_CALL(pi->options.trace, "set_string", pi, rval);
501493
}
502494

503495
static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
@@ -508,16 +500,12 @@ static void hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
508500
}
509501
rval = oj_num_as_value(ni);
510502
rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
511-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
512-
oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, rval);
513-
}
503+
TRACE_PARSE_CALL(pi->options.trace, "set_number", pi, rval);
514504
}
515505

516506
static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
517507
rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), value);
518-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
519-
oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
520-
}
508+
TRACE_PARSE_CALL(pi->options.trace, "set_value", pi, value);
521509
}
522510

523511
static VALUE start_array(ParseInfo pi) {
@@ -529,9 +517,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
529517
volatile VALUE rval = cstr_to_rstr(pi, str, len);
530518

531519
rb_ary_push(stack_peek(&pi->stack)->val, rval);
532-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
533-
oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, rval);
534-
}
520+
TRACE_PARSE_CALL(pi->options.trace, "set_value", pi, rval);
535521
}
536522

537523
static void array_append_num(ParseInfo pi, NumInfo ni) {
@@ -542,16 +528,12 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
542528
}
543529
rval = oj_num_as_value(ni);
544530
rb_ary_push(stack_peek(&pi->stack)->val, rval);
545-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
546-
oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
547-
}
531+
TRACE_PARSE_CALL(pi->options.trace, "append_number", pi, rval);
548532
}
549533

550534
static void array_append_value(ParseInfo pi, VALUE value) {
551535
rb_ary_push(stack_peek(&pi->stack)->val, value);
552-
if (RB_UNLIKELY(Yes == pi->options.trace)) {
553-
oj_trace_parse_call("append_value", pi, __FILE__, __LINE__, value);
554-
}
536+
TRACE_PARSE_CALL(pi->options.trace, "append_value", pi, value);
555537
}
556538

557539
void oj_set_wab_callbacks(ParseInfo pi) {

0 commit comments

Comments
 (0)
⚡