Changeset a35b458 in mainline for uspace/app/rcubench/rcubench.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/app/rcubench/rcubench.c (modified) (16 diffs)

uspace/app/rcubench/rcubench.c

@@ -61 +61 @@
         size_t nthreads;
         futex_t done_threads;
-        
+
         futex_t bench_fut;
 } bench_t;
@@ -72 +72 @@
         const size_t iters = bench->iters;
         int val = 0;
-        
+
         for (size_t i = 0; i < iters; ++i) {
                 __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &val);
@@ -83 +83 @@
         const size_t iters = bench->iters;
         futex_t loc_fut = FUTEX_INITIALIZER;
-        
+
         for (size_t i = 0; i < iters; ++i) {
                 futex_lock(&loc_fut);
@@ -96 +96 @@
         const size_t iters = bench->iters;
         futex_t loc_fut = FUTEX_INITIALIZER;
-        
+
         for (size_t i = 0; i < iters; ++i) {
                 futex_down(&loc_fut);
@@ -108 +108 @@
 {
         bench_t *bench = (bench_t*)arg;
-        
+
         bench->func(bench);
-        
+
         /* Signal another thread completed. */
         futex_up(&bench->done_threads);
@@ -118 +118 @@
 {
         assert(1 <= bench->nthreads);
-        
+
         if (2 <= bench->nthreads) {
                 printf("Creating %zu additional threads...\n", bench->nthreads - 1);
         }
-        
+
         /* Create and run the first nthreads - 1 threads.*/
         for (size_t k = 1; k < bench->nthreads; ++k) {
@@ -134 +134 @@
                 thread_detach(tid);
         }
-        
+
         /*
          * Run the last thread in place so that we create multiple threads
@@ -141 +141 @@
          */
         thread_func(bench);
-        
+
         printf("Waiting for remaining threads to complete.\n");
-        
+
         /* Wait for threads to complete. */
         for (size_t k = 0; k < bench->nthreads; ++k) {
@@ -168 +168 @@
 {
         va_list args;
-        
+
         va_start(args, fmt);
         vfprintf(results_fd, fmt, args);
         va_end(args);
-        
+
         va_start(args, fmt);
         vprintf(fmt, args);
@@ -202 +202 @@
 
         futex_initialize(&bench->bench_fut, 1);
-        
+
         if (0 == str_cmp(argv[1], "sys-futex")) {
                 bench->func = kernel_futex_bench;
@@ -213 +213 @@
                 return false;
         }
-        
+
         bench->name = argv[1];
-        
+
         /* Determine iteration count. */
         uint32_t iter_cnt = 0;
@@ -226 +226 @@
                 return false;
         }
-        
+
         /* Determine thread count. */
         uint32_t thread_cnt = 0;
@@ -237 +237 @@
                 return false;
         }
-        
+
         return true;
 }
@@ -245 +245 @@
         const char *err = "(error)";
         bench_t bench;
-        
+
         futex_initialize(&bench.done_threads, 0);
-        
+
         if (!parse_cmd_line(argc, argv, &bench, &err)) {
                 printf("%s\n", err);
@@ -253 +253 @@
                 return -1;
         }
-        
+
         open_results();
-        
+
         print_res("Running '%s' futex bench in '%zu' threads with '%zu' iterations.\n",
                 bench.name, bench.nthreads, bench.iters);
-        
+
         struct timeval start, end;
         getuptime(&start);
-        
+
         run_threads_and_wait(&bench);
-        
+
         getuptime(&end);
         int64_t duration = tv_sub_diff(&end, &start);
-        
+
         uint64_t secs = (uint64_t)duration / 1000 / 1000;
         uint64_t total_iters = (uint64_t)bench.iters * bench.nthreads;
         uint64_t iters_per_sec = 0;
-        
+
         if (0 < duration) {
                 iters_per_sec = total_iters * 1000 * 1000 / duration;
         }
-        
+
         print_res("Completed %" PRIu64 " iterations in %" PRId64  " usecs (%" PRIu64
                 " secs); %" PRIu64 " iters/sec\n",
@@ -280 +280 @@
 
         close_results();
-        
+
         return 0;
 }