Changes in kernel/test/synch/rcu1.c [7850dda:b7fd2a0] in mainline

File:

• kernel/test/synch/rcu1.c (modified) (6 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
-
-/*-------------------------------------------------------------------*/
-static void wait_for_cb_exit(size_t secs, exited_t *p, int *presult)
+/* Co-opt EPARTY error code for race detection. */
+#define ERACE   EPARTY
+
+/*-------------------------------------------------------------------*/
+static void wait_for_cb_exit(size_t secs, exited_t *p, errno_t *presult)
 {
         size_t loops = 0;
@@ -71 +69 @@
         
         if (!p->exited) {
-                *presult = ECBLOST;
+                *presult = ETIMEOUT;
         }
 }
@@ -115 +113 @@
                         bool joined = false;
                         do {
-                                int ret = thread_join_timeout(thread[i], 5 * 1000 * 1000, 0);
-                                joined = (ret != ESYNCH_TIMEOUT);
+                                errno_t ret = thread_join_timeout(thread[i], 5 * 1000 * 1000, 0);
+                                joined = (ret != ETIMEOUT);
                                 
-                                if (ret == ESYNCH_OK_BLOCKED) {
+                                if (ret == EOK) {
                                         TPRINTF("%zu threads remain\n", thread_cnt - i - 1);
                                 }
@@ -367 +365 @@
 
 
-static int seq_test_result = EOK;
+static errno_t seq_test_result = EOK;
 
 static atomic_t cur_time = {1};
@@ -536 +534 @@
         join_one();
         
-        int result = EOK;
+        errno_t result = EOK;
         wait_for_cb_exit(2 /* secs */, p, &result);
         
@@ -555 +553 @@
 typedef struct preempt_struct {
         exited_t e;
-        int result;
+        errno_t result;
 } preempt_t;