Add key "instance" in example2.json so that the file is flexible to generate workload with multiple small tasks.
Fix all trailing commas in /doc/examples/* so that those JSON file could be tuned by tune_json.py script. A trailing comma in mp3.json needs to be removed manually since it's added by workgen script when adding suspend key.
Signed-off-by: Pi-Cheng Chen pi-cheng.chen@linaro.org --- doc/examples/browser.json | 36 ++++++++++++++++++------------------ doc/examples/example1.json | 6 +++--- doc/examples/example2.json | 7 ++++--- doc/examples/example3.json | 8 ++++---- doc/examples/example4.json | 8 ++++---- doc/examples/mp3.json | 16 ++++++++-------- 6 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/doc/examples/browser.json b/doc/examples/browser.json index a5b4dee..b1436c6 100644 --- a/doc/examples/browser.json +++ b/doc/examples/browser.json @@ -9,57 +9,57 @@ "run" : 15000, "resume" : "Browser", "run" : 7000, - "sleep" : 8000, + "sleep" : 8000 }, "render1" : { "loop" : 50, "resume" : "BrowserSub", - "run" : 3000, + "run" : 3000 }, "render2" : { "loop" : 1, "suspend" : "Browser", "run" : 10000, "resume" : "Browser", - "run" : 5000, + "run" : 5000 }, "render3" : { "loop" : 20, "resume" : "BrowserSub", - "run" : 3000, + "run" : 3000 }, "stop" : { "loop" : 1, "run" : 2000, "sleep" : 200000, "suspend" : "Browser", - "sleep" : 600000, + "sleep" : 600000 }, "scroll" : { "loop" : 4, "resume" : "Browser", "suspend" : "BrowserNext", - "run" : 1000, + "run" : 1000 }, "stop2" : { "loop" : 1, "suspend" : "Browser", "run" : 200, - "sleep" : 800000, - }, + "sleep" : 800000 + } } }, "BrowserSub1" : { "priority" : -6, "loop" : -1, "suspend" : "BrowserSub", - "run" : 100, + "run" : 100 }, "BrowserSub2" : { "priority" : -6, "loop" : -1, "suspend" : "BrowserSub", - "run" : 100, + "run" : 100 }, "BrowserDisplay" : { "priority" : -6, @@ -73,7 +73,7 @@ "unlock" : "mutex11", "run" : 300, "resume" : "Binder-display", - "run" : 400, + "run" : 400 }, "Binder-dummy" : { "priority" : -6, @@ -85,7 +85,7 @@ "lock" : "mutex11", "signal" : "queue11", "unlock" : "mutex11", - "run" : 100, + "run" : 100 }, "Binder-display" : { "priority" : -6, @@ -93,7 +93,7 @@ "suspend", "run" : 300, "resume" : "Event-Browser", - "resume" : "Event-Display", + "resume" : "Event-Display" }, "Event-Browser" : { "priority" : -9, @@ -102,7 +102,7 @@ "run" : 50, "sleep" : 16000, "run" : 50, - "resume" : "Browser", + "resume" : "Browser" }, "Event-Display" : { "priority" : -9, @@ -111,13 +111,13 @@ "run" : 50, "sleep" : 16000, "run" : 50, - "resume" : "Display", + "resume" : "Display" }, "Display" : { "priority" : -8, "loop" : -1, "suspend", - "run" : 16000, - }, - }, + "run" : 16000 + } + } } diff --git a/doc/examples/example1.json b/doc/examples/example1.json index bf3fe1e..df4df4f 100644 --- a/doc/examples/example1.json +++ b/doc/examples/example1.json @@ -7,7 +7,7 @@ "thread0" : { "loop" : -1, "run" : 1000, - "sleep" : 9000, - }, - }, + "sleep" : 9000 + } + } } diff --git a/doc/examples/example2.json b/doc/examples/example2.json index c5116f6..a1d9746 100644 --- a/doc/examples/example2.json +++ b/doc/examples/example2.json @@ -5,9 +5,10 @@ */ "tasks" : { "thread0" : { + "instance" : 1, "loop" : -1, "run" : 1000, - "timer" : { "ref" : "tick", "period" : 10000 }, - }, - }, + "timer" : { "ref" : "tick", "period" : 10000 } + } + } } diff --git a/doc/examples/example3.json b/doc/examples/example3.json index 56039c3..4ec6e0d 100644 --- a/doc/examples/example3.json +++ b/doc/examples/example3.json @@ -10,14 +10,14 @@ "light" : { "loop" : 100, "run" : 1000, - "timer" : { "ref" : "tick", "period" : 10000 }, + "timer" : { "ref" : "tick", "period" : 10000 } }, "heavy" : { "loop" : 100, "run" : 9000, - "timer" : { "ref" : "tick", "period" : 10000 }, + "timer" : { "ref" : "tick", "period" : 10000 } } } - }, - }, + } + } } diff --git a/doc/examples/example4.json b/doc/examples/example4.json index 2865075..19d2be2 100644 --- a/doc/examples/example4.json +++ b/doc/examples/example4.json @@ -8,13 +8,13 @@ "loop" : -1, "run" : 10000, "resume" : "thread1", - "suspend", + "suspend" }, "thread1" : { "loop" : -1, "run" : 10000, "resume" : "thread0", - "suspend", - }, - }, + "suspend" + } + } } diff --git a/doc/examples/mp3.json b/doc/examples/mp3.json index c1b40f0..b42e7d5 100644 --- a/doc/examples/mp3.json +++ b/doc/examples/mp3.json @@ -7,11 +7,11 @@ "p1" : { "loop" : 1, "resume" : "AudioOut", - "timer" : { "ref" : "tick", "period": 6000 }, + "timer" : { "ref" : "tick", "period": 6000 } }, "p2" : { "loop" : 4, - "timer" : { "ref" : "tick", "period": 6000 }, + "timer" : { "ref" : "tick", "period": 6000 } } } }, @@ -21,14 +21,14 @@ "run" : 275, "resume" : "AudioTrack", "run" : 4725, - "suspend", + "suspend" }, "AudioTrack" : { "priority" : -16, "loop" : -1, "suspend", "run" : 300, - "resume" : "mp3.decoder", + "resume" : "mp3.decoder" }, "mp3.decoder" : { "priority" : -2, @@ -39,7 +39,7 @@ "signal" : "queue", "wait" : { "ref" : "queue", "mutex": "mutex" }, "unlock" : "mutex", - "run" : 150, + "run" : 150 }, "OMXCall" : { "priority" : -2, @@ -50,8 +50,8 @@ "run" : 300, "lock" : "mutex", "signal" : "queue", - "unlock" : "mutex", - }, + "unlock" : "mutex" + } }, "global" : { "default_policy" : "SCHED_OTHER", @@ -62,6 +62,6 @@ "log_basename" : "mp3", "lock_pages" : true, "frag" : 1, - "calibration" : "CPU0", + "calibration" : "CPU0" } }