Changeset 132ab5d1 in mainline for kernel/test/synch/rcu1.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

kernel/test/synch/rcu1.c

@@ -51 +51 @@
 } 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
+/* Co-opt EPARTY error code for race detection. */
+#define ERACE   EPARTY
 
 /*-------------------------------------------------------------------*/
@@ -71 +69 @@
         
         if (!p->exited) {
-                *presult = ECBLOST;
+                *presult = ETIMEOUT;
         }
 }
@@ -116 +114 @@
                         do {
                                 int ret = thread_join_timeout(thread[i], 5 * 1000 * 1000, 0);
-                                joined = (ret != ESYNCH_TIMEOUT);
+                                joined = (ret != ETIMEOUT);
                                 
-                                if (ret == ESYNCH_OK_BLOCKED) {
+                                if (ret == EOK) {
                                         TPRINTF("%zu threads remain\n", thread_cnt - i - 1);
                                 }