From da0588ea3276721c5dc864a68bce20afbc4a400d Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 2 Jun 2020 16:24:09 -0400 Subject: [PATCH] chore: make demo workloads more realistic --- demo.txt | 6 +++--- post_body.txt | 2 +- runtime/src/sandbox.c | 5 +++-- runtime/tests/test_fibonacci_multiple.json | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/demo.txt b/demo.txt index 758150e..e8c0017 100644 --- a/demo.txt +++ b/demo.txt @@ -1,10 +1,10 @@ LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" ./awsmrt ../tests/test_fibonacci_multiple.json -# fib(40) +# fib(20) -ab -n 10000 -c 1000 -p post_body.txt -v 4 localhost:10000/ +ab -n 100000 -c 100 -p post_body.txt -v 4 localhost:10000/ # fib(10) -ab -n 1000 -c 100 -p post_body2.txt -v 4 localhost:10001/ \ No newline at end of file +ab -n 100000 -c 100 -p post_body2.txt -v 4 localhost:10001/ \ No newline at end of file diff --git a/post_body.txt b/post_body.txt index 597975b..2edeafb 100644 --- a/post_body.txt +++ b/post_body.txt @@ -1 +1 @@ -35 \ No newline at end of file +20 \ No newline at end of file diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c index a95d67f..fd76463 100644 --- a/runtime/src/sandbox.c +++ b/runtime/src/sandbox.c @@ -142,10 +142,11 @@ sandbox_build_and_send_client_response(struct sandbox *sandbox) done: assert(sndsz == sandbox->request_response_data_length); - sandbox->total_time = __getcycles() - sandbox->start_time; + uint64_t end_time = __getcycles(); + sandbox->total_time = end_time - sandbox->start_time; uint64_t total_time_us = sandbox->total_time / runtime_processor_speed_MHz; - printf("%s():%d, %d, %lu\n", sandbox->module->name, sandbox->module->port, + printf("%s():%d, %u, %lu\n", sandbox->module->name, sandbox->module->port, sandbox->module->relative_deadline_us, total_time_us); #ifndef USE_HTTP_UVIO diff --git a/runtime/tests/test_fibonacci_multiple.json b/runtime/tests/test_fibonacci_multiple.json index ca31327..c64899d 100644 --- a/runtime/tests/test_fibonacci_multiple.json +++ b/runtime/tests/test_fibonacci_multiple.json @@ -3,7 +3,7 @@ "name": "fibonacci", "path": "fibonacci_wasm.so", "port": 10000, - "relative-deadline-us": 50000000, + "relative-deadline-us": 80000, "argsize": 1, "http-req-headers": [], "http-req-content-type": "text/plain", @@ -17,7 +17,7 @@ "name": "fibonacci2", "path": "fibonacci_wasm.so", "port": 10001, - "relative-deadline-us": 50000, + "relative-deadline-us": 8000, "argsize": 1, "http-req-headers": [], "http-req-content-type": "text/plain",