Skip to content

Commit 5a73c6b

Browse files
committed
Merge branch 'js/trace2-raise-format-version'
When we added a new event type to trace2 event stream, we forgot to raise the format version number, which has been corrected. * js/trace2-raise-format-version: trace2: increment event format version
2 parents 2c0fa66 + 04480e6 commit 5a73c6b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Documentation/technical/api-trace2.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ yields
128128

129129
------------
130130
$ cat ~/log.event
131-
{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"}
131+
{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"3","exe":"2.20.1.155.g426c96fcdb"}
132132
{"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
133133
{"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
134134
{"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
@@ -391,7 +391,7 @@ only present on the "start" and "atexit" events.
391391
{
392392
"event":"version",
393393
...
394-
"evt":"2", # EVENT format version
394+
"evt":"3", # EVENT format version
395395
"exe":"2.20.1.155.g426c96fcdb" # git version
396396
}
397397
------------

trace2/tr2_tgt_event.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 };
2020
* a new field to an existing event, do not require an increment to the EVENT
2121
* format version.
2222
*/
23-
#define TR2_EVENT_VERSION "2"
23+
#define TR2_EVENT_VERSION "3"
2424

2525
/*
2626
* Region nesting limit for messages written to the event target.

0 commit comments

Comments
 (0)