Changeset d230358 in mainline

Timestamp:

2018-11-16T15:58:30Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

af2d3e3

Parents:

b0beb9b1

Message:

Move ping_pong into a separate performance measuring tool 'perf'.

Files:

• .gitignore (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• uspace/app/perf/Makefile (added)
• uspace/app/perf/doc/doxygroups.h (added)
• uspace/app/perf/ipc/ping_pong.c (moved) (moved from uspace/app/tester/ipc/ping_pong.c ) (6 diffs)
• uspace/app/perf/ipc/ping_pong.def (moved) (moved from uspace/app/tester/ipc/ping_pong.def ) (1 diff)
• uspace/app/perf/perf.c (added)
• uspace/app/perf/perf.h (added)
• uspace/app/tester/Makefile (modified) (1 diff)
• uspace/app/tester/tester.c (modified) (1 diff)

.gitignore

@@ -129 +129 @@
 uspace/app/nic/nic
 uspace/app/nterm/nterm
+uspace/app/perf/perf
 uspace/app/ping/ping
 uspace/app/ping6/ping6

boot/Makefile.common

@@ -190 +190 @@
         mkmfs \
         nic \
+        perf \
         rcutest \
         rcubench \

uspace/app/perf/ipc/ping_pong.c

@@ -34 +34 @@
 #include <async.h>
 #include <errno.h>
-#include "../tester.h"
+#include "../perf.h"
 
 #define MIN_DURATION_SECS  10
@@ -50 +50 @@
 
                 if (retval != EOK) {
-                        TPRINTF("Error sending ping message.\n");
+                        printf("Error sending ping message.\n");
                         return EIO;
                 }
@@ -64 +64 @@
 static void ping_pong_report(uint64_t niter, uint64_t duration)
 {
-        TPRINTF("Completed %" PRIu64 " round trips in %" PRIu64 " us",
+        printf("Completed %" PRIu64 " round trips in %" PRIu64 " us",
             niter, duration);
 
         if (duration > 0) {
-                TPRINTF(", %" PRIu64 " rt/s.\n", niter * 1000 * 1000 / duration);
+                printf(", %" PRIu64 " rt/s.\n", niter * 1000 * 1000 / duration);
         } else {
-                TPRINTF(".\n");
+                printf(".\n");
         }
 }
 
-const char *test_ping_pong(void)
+const char *bench_ping_pong(void)
 {
         errno_t rc;
@@ -80 +80 @@
         uint64_t dsmp[NUM_SAMPLES];
 
-        TPRINTF("Benchmark ns server ping time\n");
-        TPRINTF("Warm up and determine work size...\n");
+        printf("Benchmark ns server ping time\n");
+        printf("Warm up and determine work size...\n");
 
         struct timespec start;
@@ -101 +101 @@
         }
 
-        TPRINTF("Measure %d samples...\n", NUM_SAMPLES);
+        printf("Measure %d samples...\n", NUM_SAMPLES);
 
         int i;
@@ -129 +129 @@
         double stddev = qd / (NUM_SAMPLES - 1); // XXX sqrt
 
-        TPRINTF("Average: %.0f rt/s Std.dev^2: %.0f rt/s Samples: %d\n",
+        printf("Average: %.0f rt/s Std.dev^2: %.0f rt/s Samples: %d\n",
             avg, stddev, NUM_SAMPLES);
 

uspace/app/perf/ipc/ping_pong.def

@@ -2 +2 @@
         "ping_pong",
         "IPC ping-pong benchmark",
-        &test_ping_pong,
-        true
+        &bench_ping_pong
 },

uspace/app/tester/Makefile

@@ -56 +56 @@
         float/float2.c \
         vfs/vfs1.c \
-        ipc/ping_pong.c \
         ipc/starve.c \
         loop/loop1.c \

uspace/app/tester/tester.c

@@ -66 +66 @@
 #include "float/float2.def"
 #include "vfs/vfs1.def"
-#include "ipc/ping_pong.def"
 #include "ipc/starve.def"
 #include "loop/loop1.def"