From 82aa762de32fbf1fb71250b4aad0fee1e9296461 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 4 Aug 2023 21:11:12 -0400 Subject: [PATCH] update test --- test/t1.expected | 64 ++++++++++++++++++++++++------------------------ test/t1.ml | 9 +++++-- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/test/t1.expected b/test/t1.expected index d65d5d8..5ef21e0 100644 --- a/test/t1.expected +++ b/test/t1.expected @@ -46,8 +46,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 55.00,"name":"hello 3 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 56.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":57.00,"name":"c","ph":"C","args": {"n":9}}, -{"pid":2,"cat":"trace","id":13,"tid": 3,"ts": 58.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":13,"tid": 3,"ts": 59.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":13,"tid": 3,"ts": 58.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":13,"tid": 3,"ts": 59.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 54.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 62.00,"name":"hello 3 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 63.00,"name":"world","ph":"I"}, @@ -109,8 +109,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 133.00,"name":"hello 6 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 134.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":135.00,"name":"c","ph":"C","args": {"n":21}}, -{"pid":2,"cat":"trace","id":31,"tid": 3,"ts": 136.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":31,"tid": 3,"ts": 137.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":31,"tid": 3,"ts": 136.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":31,"tid": 3,"ts": 137.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 132.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 140.00,"name":"hello 6 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 141.00,"name":"world","ph":"I"}, @@ -172,8 +172,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 211.00,"name":"hello 9 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 212.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":213.00,"name":"c","ph":"C","args": {"n":33}}, -{"pid":2,"cat":"trace","id":49,"tid": 3,"ts": 214.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":49,"tid": 3,"ts": 215.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":49,"tid": 3,"ts": 214.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":49,"tid": 3,"ts": 215.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 210.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 218.00,"name":"hello 9 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 219.00,"name":"world","ph":"I"}, @@ -235,8 +235,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 289.00,"name":"hello 12 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 290.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":291.00,"name":"c","ph":"C","args": {"n":45}}, -{"pid":2,"cat":"trace","id":67,"tid": 3,"ts": 292.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":67,"tid": 3,"ts": 293.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":67,"tid": 3,"ts": 292.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":67,"tid": 3,"ts": 293.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 288.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 296.00,"name":"hello 12 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 297.00,"name":"world","ph":"I"}, @@ -298,8 +298,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 367.00,"name":"hello 15 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 368.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":369.00,"name":"c","ph":"C","args": {"n":57}}, -{"pid":2,"cat":"trace","id":85,"tid": 3,"ts": 370.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":85,"tid": 3,"ts": 371.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":85,"tid": 3,"ts": 370.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":85,"tid": 3,"ts": 371.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 366.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 374.00,"name":"hello 15 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 375.00,"name":"world","ph":"I"}, @@ -361,8 +361,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 445.00,"name":"hello 18 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 446.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":447.00,"name":"c","ph":"C","args": {"n":69}}, -{"pid":2,"cat":"trace","id":103,"tid": 3,"ts": 448.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":103,"tid": 3,"ts": 449.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":103,"tid": 3,"ts": 448.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":103,"tid": 3,"ts": 449.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 444.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 452.00,"name":"hello 18 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 453.00,"name":"world","ph":"I"}, @@ -424,8 +424,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 523.00,"name":"hello 21 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 524.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":525.00,"name":"c","ph":"C","args": {"n":81}}, -{"pid":2,"cat":"trace","id":121,"tid": 3,"ts": 526.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":121,"tid": 3,"ts": 527.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":121,"tid": 3,"ts": 526.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":121,"tid": 3,"ts": 527.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 522.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 530.00,"name":"hello 21 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 531.00,"name":"world","ph":"I"}, @@ -487,8 +487,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 601.00,"name":"hello 24 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 602.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":603.00,"name":"c","ph":"C","args": {"n":93}}, -{"pid":2,"cat":"trace","id":139,"tid": 3,"ts": 604.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":139,"tid": 3,"ts": 605.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":139,"tid": 3,"ts": 604.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":139,"tid": 3,"ts": 605.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 600.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 608.00,"name":"hello 24 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 609.00,"name":"world","ph":"I"}, @@ -550,8 +550,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 679.00,"name":"hello 27 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 680.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":681.00,"name":"c","ph":"C","args": {"n":105}}, -{"pid":2,"cat":"trace","id":157,"tid": 3,"ts": 682.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":157,"tid": 3,"ts": 683.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":157,"tid": 3,"ts": 682.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":157,"tid": 3,"ts": 683.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 678.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 686.00,"name":"hello 27 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 687.00,"name":"world","ph":"I"}, @@ -613,8 +613,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 757.00,"name":"hello 30 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 758.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":759.00,"name":"c","ph":"C","args": {"n":117}}, -{"pid":2,"cat":"trace","id":175,"tid": 3,"ts": 760.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":175,"tid": 3,"ts": 761.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":175,"tid": 3,"ts": 760.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":175,"tid": 3,"ts": 761.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 756.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 764.00,"name":"hello 30 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 765.00,"name":"world","ph":"I"}, @@ -676,8 +676,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 835.00,"name":"hello 33 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 836.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":837.00,"name":"c","ph":"C","args": {"n":129}}, -{"pid":2,"cat":"trace","id":193,"tid": 3,"ts": 838.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":193,"tid": 3,"ts": 839.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":193,"tid": 3,"ts": 838.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":193,"tid": 3,"ts": 839.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 834.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 842.00,"name":"hello 33 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 843.00,"name":"world","ph":"I"}, @@ -739,8 +739,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 913.00,"name":"hello 36 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 914.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":915.00,"name":"c","ph":"C","args": {"n":141}}, -{"pid":2,"cat":"trace","id":211,"tid": 3,"ts": 916.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":211,"tid": 3,"ts": 917.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":211,"tid": 3,"ts": 916.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":211,"tid": 3,"ts": 917.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 912.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 920.00,"name":"hello 36 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 921.00,"name":"world","ph":"I"}, @@ -802,8 +802,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 991.00,"name":"hello 39 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 992.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":993.00,"name":"c","ph":"C","args": {"n":153}}, -{"pid":2,"cat":"trace","id":229,"tid": 3,"ts": 994.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":229,"tid": 3,"ts": 995.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":229,"tid": 3,"ts": 994.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":229,"tid": 3,"ts": 995.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 990.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 998.00,"name":"hello 39 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 999.00,"name":"world","ph":"I"}, @@ -865,8 +865,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 1069.00,"name":"hello 42 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 1070.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":1071.00,"name":"c","ph":"C","args": {"n":165}}, -{"pid":2,"cat":"trace","id":247,"tid": 3,"ts": 1072.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":247,"tid": 3,"ts": 1073.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":247,"tid": 3,"ts": 1072.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":247,"tid": 3,"ts": 1073.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 1068.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 1076.00,"name":"hello 42 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 1077.00,"name":"world","ph":"I"}, @@ -928,8 +928,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 1147.00,"name":"hello 45 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 1148.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":1149.00,"name":"c","ph":"C","args": {"n":177}}, -{"pid":2,"cat":"trace","id":265,"tid": 3,"ts": 1150.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":265,"tid": 3,"ts": 1151.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":265,"tid": 3,"ts": 1150.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":265,"tid": 3,"ts": 1151.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 1146.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 1154.00,"name":"hello 45 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 1155.00,"name":"world","ph":"I"}, @@ -991,8 +991,8 @@ {"pid":2,"cat":"","tid": 3,"ts": 1225.00,"name":"hello 48 2","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 1226.00,"name":"world","ph":"I"}, {"pid":2,"tid":3,"ts":1227.00,"name":"c","ph":"C","args": {"n":189}}, -{"pid":2,"cat":"trace","id":283,"tid": 3,"ts": 1228.00,"name":"sub-sleep","ph":"b"}, -{"pid":2,"cat":"trace","id":283,"tid": 3,"ts": 1229.00,"name":"sub-sleep","ph":"e"}, +{"pid":2,"cat":"trace","id":283,"tid": 3,"ts": 1228.00,"name":"sub-sleep","ph":"B"}, +{"pid":2,"cat":"trace","id":283,"tid": 3,"ts": 1229.00,"name":"sub-sleep","ph":"E"}, {"pid":2,"cat":"","tid": 3,"dur": 6.00,"ts": 1224.00,"name":"inner.loop","ph":"X"}, {"pid":2,"cat":"","tid": 3,"ts": 1232.00,"name":"hello 48 3","ph":"I"}, {"pid":2,"cat":"","tid": 3,"ts": 1233.00,"name":"world","ph":"I"}, diff --git a/test/t1.ml b/test/t1.ml index 1fd80c6..b8ec249 100644 --- a/test/t1.ml +++ b/test/t1.ml @@ -20,8 +20,13 @@ let run () = if _j = 2 then ( (* fake micro sleep *) let _sp = - Trace.enter_manual_sub_span ~parent:pseudo_async_sp ~__FILE__ - ~__LINE__ "sub-sleep" + Trace.enter_manual_sub_span ~parent:pseudo_async_sp + ~flavor: + (if _i mod 3 = 0 then + `Sync + else + `Async) + ~__FILE__ ~__LINE__ "sub-sleep" in Thread.delay 0.005; Trace.exit_manual_span _sp