Skip to content

Commit 0a6e4b8

Browse files
authored
Merge pull request #58 from art-daq/ron/comma-parse-bug
TRACE_NAMLVLSET "," parse bug
2 parents 38164de + ed16cc6 commit 0a6e4b8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/TRACE/trace.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define TRACE_H
99

1010
#if !defined(__CUDA_ARCH__) /* Allow inclusion into CUDA file (including .cu files) */
11-
# define TRACE_REV "$Revision: 1734 $$Date: 2026-02-25 07:39:20 -0600 (Wed, 25 Feb 2026) $"
11+
# define TRACE_REV "$Revision: 1739 $$Date: 2026-03-17 13:52:01 -0500 (Tue, 17 Mar 2026) $"
1212

1313
// The C++ streamer style macros...............................................
1414
/*
@@ -217,7 +217,7 @@
217217
debugging information. For example:
218218
if (TTEST(lvl)) {
219219
// prep code
220-
// possible looping -- severerl TLOGs/TRACEs
220+
// possible looping -- several TLOGs/TRACEs
221221
}
222222
NOTE: for C++ similar functionality can be obtain with TLOG*(...) macros and lambda's:
223223
TLOG() << [&](){
@@ -331,7 +331,7 @@ enum tlvle_t { TRACE_LVL_ENUM_0_9, TRACE_LVL_ENUM_10_63 };
331331
# endif
332332

333333
// clang-format off
334-
#define TRACE_REVx $_$Revision: 1734 $_$Date: 2026-02-25 07:39:20 -0600 (Wed, 25 Feb 2026) $
334+
#define TRACE_REVx $_$Revision: 1739 $_$Date: 2026-03-17 13:52:01 -0500 (Tue, 17 Mar 2026) $
335335
// Who would ever have an identifier/token that begins with $_$???
336336
#define $_$Revision 0?0
337337
#define $_$Date ,
@@ -2643,7 +2643,7 @@ static void trace_namLvlSet(void)
26432643
|| ((sts= sscanf(line, "%s %llx %llx %llx", name, &M, &S, &T)) && sts >= 3) //NOLINT
26442644
|| ((sts= sscanf(line, "%[^,],%llx,%llx,%llx", name, &M, &S, &T)) && sts >= 3) //NOLINT
26452645
|| ((sts= sscanf(line, "%s %llx", name, &S)) && sts == 2) //NOLINT
2646-
|| ((sts= sscanf(line, "%s[^,],%llx", name, &S)) && sts == 2)) //NOLINT
2646+
|| ((sts= sscanf(line, "%[^,],%llx", name, &S)) && sts == 2)) //NOLINT
26472647
// The last case is for when TRACE will remain "inactive" (not tracing to mem and not using lvls from trace file) -- just concerned about slow path
26482648
{
26492649
int32_t tid= (int32_t)trace_name2TID(name);

0 commit comments

Comments
 (0)