Changeset 1c1da4b in mainline

Timestamp:

2012-07-16T15:38:45Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

0ca7286

Parents:

0cf813d

Message:

rcu: Cleaned up rcu1 test a bit. Now it uses wired threads.

File:

• kernel/test/synch/rcu1.c (modified) (15 diffs)

kernel/test/synch/rcu1.c ¶

@@ -50 +50 @@
 } exited_t;
 
+/* Callback raced with preexisting readers. */
 #define ERACE   123
+/* Waited for too long for the callback to exit; consider it lost. */
 #define ECBLOST 432
 
@@ -85 +87 @@
                 
         if(thread[k]) {
-                /* Try to distribute evenly but allow migration. */
-                thread[k]->cpu = &cpus[k % config.cpu_active];
+                /* Distribute evenly. */
+                thread_wire(thread[k], &cpus[k % config.cpu_active]);
                 thread_ready(thread[k]);
         }
@@ -208 +210 @@
                 
                 for (volatile size_t k = 0; k < nop_iters; ++k) {
-                        // nop, but increment volatile k                        
+                        /* nop, but increment volatile k */
                 }
                 
@@ -338 +340 @@
         join_one();
         
-        TPRINTF("\nJoined one-cb reader, wait for cb.\n");
+        TPRINTF("\nJoined one-cb reader, wait for callback.\n");
         size_t loop_cnt = 0;
-        size_t max_loops = 4; /* 200 ms */
+        size_t max_loops = 4; /* 200 ms total */
         
         while (!one_cb_is_done && loop_cnt < max_loops) {
@@ -526 +528 @@
         
         int result = EOK;
-        wait_for_cb_exit(2, p, &result);
+        wait_for_cb_exit(2 /* secs */, p, &result);
         
         if (result != EOK) {
@@ -689 +691 @@
         join_one();
         
+        /* Wait at most 4 secs. */
         wait_for_cb_exit(4, &p->e, &p->result);
         
@@ -703 +706 @@
 static bool do_reader_preempt(void)
 {
-        TPRINTF("\nReader preempts; after GP start, before GP, twice before GP\n");
+        TPRINTF("\nReaders will be preempted.\n");
         
         bool success = true;
@@ -744 +747 @@
         rcu_read_lock();
 
-        /* Contain synch accessing after reader section beginning. */
+        /* Order accesses of synch after the reader section begins. */
         memory_barrier();
         
@@ -750 +753 @@
         
         while (!synch->synch_running) {
-                /* 0.5 sec*/
+                /* 0.5 sec */
                 delay(500 * 1000);
         }
@@ -829 +832 @@
 {
         /* 5 us * 1000 * 1000 iters == 5 sec per updater thread */
-        /*delay(5);*/
+        delay(5);
         free(item);
 }
@@ -847 +850 @@
                 }
                 
-                /* Print a dot if we make progress of 1% */
-                if (s->master && 0 == (i % (s->iters/100 + 1)))
+                /* Print a dot if we make a progress of 1% */
+                if (s->master && 0 == (i % (s->iters/100)))
                         TPRINTF(".");
         }
@@ -855 +858 @@
 static bool do_stress(void)
 {
-        //size_t cb_per_thread = 1000 * 1000;
         size_t cb_per_thread = 1000 * 1000;
         bool done = false;
@@ -861 +863 @@
         stress_t worker = { .iters = cb_per_thread, .master = false }; 
         
-        size_t thread_cnt = min(MAX_THREADS, config.cpu_active);
+        size_t thread_cnt = min(MAX_THREADS / 2, config.cpu_active);
         /* Each cpu has one reader and one updater. */
         size_t reader_cnt = thread_cnt;
@@ -873 +875 @@
         bin_order_suffix(max_used_mem, &mem_units, &mem_suffix, false);
 
-        TPRINTF("\nStress: Run %zu nop-readers and %zu updaters. %zu callbacks "
+        TPRINTF("\nStress: Run %zu nop-readers and %zu updaters. %zu callbacks"
                 " total (max %" PRIu64 " %s used). Be very patient.\n", 
                 reader_cnt, updater_cnt, exp_upd_calls, mem_units, mem_suffix);
@@ -914 +916 @@
                 --e->count_down;
                 
-                if (0 == (e->count_down % (e->total_cnt/100 + 1))) {
+                if (0 == (e->count_down % (e->total_cnt/100))) {
                         TPRINTF("*");
                 }