Changeset 0d56712 in mainline for kernel/test/synch/workq-test-core.h

Timestamp:

2012-07-07T00:27:01Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial

Children:

ff90f5f

Parents:

8a64e81e

Message:

workq: Added magic cookie integrity checks. Fixed test workqueue1.

File:

• kernel/test/synch/workq-test-core.h (modified) (4 diffs)

kernel/test/synch/workq-test-core.h

@@ -82 +82 @@
 }
 
+static void free_work(test_work_t *work)
+{
+        memsetb(work, sizeof(test_work_t), 0xfa);
+        free(work);
+}
+
 static void reproduce(work_t *work_item)
 {
@@ -112 +118 @@
                         if (child) {
                                 if (!core_workq_enqueue(&child->work_item, reproduce))
-                                        free(child);
+                                        free_work(child);
                         }
                 }
                 
                 if (!core_workq_enqueue(work_item, reproduce)) {
-                        if (!work->master) {
-                                free(work);
-                        }
+                        if (work->master) 
+                                TPRINTF("\nErr: Master work item exiting prematurely!\n");
+
+                        free_work(work);
                 }
         } else {
@@ -125 +132 @@
                 
                 if (work->master && new_wave(work)) {
-                                core_workq_enqueue(work_item, reproduce);
+                        if (!core_workq_enqueue(work_item, reproduce)) {
+                                TPRINTF("\nErr: Master work could not start a new wave!\n");
+                                free_work(work);
+                        }
                 } else {
                         if (work->master)
-                                TPRINTF("\nMaster work item done!\n");
+                                TPRINTF("\nMaster work item done.\n");
                                 
-                        memsetb(work, sizeof(test_work_t), 0xfa);
-                        free(work);
+                        free_work(work);
                 }
         }
@@ -180 +189 @@
         
         for (int i = 0; i < WAVES; ++i) {
-                if (atomic_get(&call_cnt[i]) != exp_call_cnt) {
+                if (atomic_get(&call_cnt[i]) == exp_call_cnt) {
+                        TPRINTF("Ok: %u calls in wave %d, as expected.\n",
+                                atomic_get(&call_cnt[i]), i);
+                } else {
                         success = false;
                         TPRINTF("Error: %u calls in wave %d, but %zu expected.\n",
                                 atomic_get(&call_cnt[i]), i, exp_call_cnt);
-                }
+                } 
         }