Changeset 433 for pjproject/trunk/pjlib/src/pjlib-test/thread.c

Timestamp:

May 10, 2006 7:24:40 PM (18 years ago)

Author:

bennylp

Message:

Merge-in RTEMS port patch by Phil Torre <ptorre@…>, alpha release.

File:

• pjproject/trunk/pjlib/src/pjlib-test/thread.c (modified) (16 diffs)

pjproject/trunk/pjlib/src/pjlib-test/thread.c

@@ -53 +53 @@
 #define THIS_FILE   "thread_test"
 
-static int quit_flag=0;
+static volatile int quit_flag=0;
+
+#if 0
+#   define TRACE__(args)        PJ_LOG(3,args)
+#else
+#   define TRACE__(args)
+#endif
+
 
 /*
@@ -66 +73 @@
     pj_thread_desc desc;
     pj_thread_t *this_thread;
+    unsigned id = *pcounter;
     pj_status_t rc;
+
+    TRACE__((THIS_FILE, "     thread %d running..", id));
 
     rc = pj_thread_register("thread", desc, &this_thread);
@@ -91 +101 @@
         (*pcounter)++;
         //Must sleep if platform doesn't do time-slicing.
-        pj_thread_sleep(0);
-    }
-
+        //pj_thread_sleep(0);
+    }
+
+    TRACE__((THIS_FILE, "     thread %d quitting..", id));
     return NULL;
 }
@@ -115 +126 @@
     quit_flag = 0;
 
+    TRACE__((THIS_FILE, "    Creating thread 0.."));
     rc = pj_thread_create(pool, "thread", (pj_thread_proc*)&thread_proc,
                           &counter,
@@ -126 +138 @@
     }
 
-    pj_thread_sleep(500);
+    TRACE__((THIS_FILE, "    Main thread waiting.."));
+    pj_thread_sleep(1500);
+    TRACE__((THIS_FILE, "    Main thread resuming.."));
 
     if (flags & PJ_THREAD_SUSPENDED) {
@@ -145 +159 @@
     PJ_LOG(3,(THIS_FILE, "..waiting for thread to quit.."));
 
-    pj_thread_sleep(500);
+    pj_thread_sleep(1500);
 
     quit_flag = 1;
@@ -176 +190 @@
     quit_flag = 0;
 
-    pool = pj_pool_create(mem, NULL, 4096, 0, NULL);
+    pool = pj_pool_create(mem, NULL, 4000, 4000, NULL);
     if (!pool)
         return -10;
@@ -184 +198 @@
     /* Create all threads in suspended mode. */
     for (i=0; i<NUM_THREADS; ++i) {
-        counter[i] = 0;
+        counter[i] = i;
         rc = pj_thread_create(pool, "thread", (pj_thread_proc*)&thread_proc, 
                               &counter[i], 
@@ -199 +213 @@
      * The purpose of this is to test whether all threads are suspended.
      */
+    TRACE__((THIS_FILE, "    Main thread waiting.."));
     pj_thread_sleep(1000);
+    TRACE__((THIS_FILE, "    Main thread resuming.."));
 
     /* Check that all counters are still zero. */
     for (i=0; i<NUM_THREADS; ++i) {
-        if (counter[i] != 0) {
+        if (counter[i] > i) {
             PJ_LOG(3,(THIS_FILE, "....ERROR! Thread %d-th is not suspended!", 
                       i));
@@ -212 +228 @@
     /* Now resume all threads. */
     for (i=0; i<NUM_THREADS; ++i) {
+        TRACE__((THIS_FILE, "    Resuming thread %d [%p]..", i, thread[i]));
         rc = pj_thread_resume(thread[i]);
         if (rc != PJ_SUCCESS) {
@@ -223 +240 @@
      * but it'll make user waits for longer for the test to finish.
      */
+    TRACE__((THIS_FILE, "    Main thread waiting (5s).."));
     pj_thread_sleep(5000);
+    TRACE__((THIS_FILE, "    Main thread resuming.."));
 
     /* Signal all threads to quit. */
@@ -230 +249 @@
     /* Wait until all threads quit, then destroy. */
     for (i=0; i<NUM_THREADS; ++i) {
+        TRACE__((THIS_FILE, "    Main thread joining thread %d [%p]..", 
+                            i, thread[i]));
         rc = pj_thread_join(thread[i]);
         if (rc != PJ_SUCCESS) {
@@ -235 +256 @@
             return -50;
         }
+        TRACE__((THIS_FILE, "    Destroying thread %d [%p]..", i, thread[i]));
         rc = pj_thread_destroy(thread[i]);
         if (rc != PJ_SUCCESS) {
@@ -241 +263 @@
         }
     }
+
+    TRACE__((THIS_FILE, "    Main thread calculating time slices.."));
 
     /* Now examine the value of the counters.
@@ -264 +288 @@
     diff = (highest-lowest)*100 / ((highest+lowest)/2);
     if ( diff >= 50) {
-        PJ_LOG(3,(THIS_FILE, "...ERROR: thread didn't have equal timeslice!"));
-        PJ_LOG(3,(THIS_FILE, ".....lowest counter=%u, highest counter=%u, diff=%u%%",
-                             lowest, highest, diff));
+        PJ_LOG(3,(THIS_FILE, 
+                  "...ERROR: thread didn't have equal timeslice!"));
+        PJ_LOG(3,(THIS_FILE, 
+                  ".....lowest counter=%u, highest counter=%u, diff=%u%%",
+                  lowest, highest, diff));
         return -80;
     } else {
@@ -274 +300 @@
     }
 
+    pj_pool_release(pool);
     return 0;
 }