Merged Ralph's thread-hooks branch.

Minor modifications to fix the vxWorks epicsThreadInit() and rename some functions.
2012-07-04 13:28:55 -05:00
parent 9fe5ce82d3 39ed8f3d02
commit a857f7a5ed
16 changed files with 570 additions and 67 deletions
@@ -0,0 +1,127 @@
+/*************************************************************************\
+* Copyright (c) 2012 ITER Organization
+*
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+/* epicsThreadHooksTest.c */
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "epicsThread.h"
+#include "epicsExit.h"
+#include "epicsEvent.h"
+#include "errlog.h"
+#include "epicsUnitTest.h"
+#include "testMain.h"
+
+#define THREAD_NO 6
+#define HOOKS_NO 4
+
+epicsThreadPrivateId threadNo;
+static int order[THREAD_NO][HOOKS_NO];
+static int cnt[THREAD_NO];
+static int mine[THREAD_NO];
+static int called[THREAD_NO];
+static epicsThreadId tid[THREAD_NO];
+epicsEventId shutdown[THREAD_NO];
+
+static int newThreadIndex(epicsThreadId id)
+{
+    int i = 0;
+    while (tid[i] != 0 && i < THREAD_NO) i++;
+    tid[i] = id;
+    return i;
+}
+
+static int findThreadIndex(epicsThreadId id)
+{
+    int i = 0;
+    while (tid[i] !=  id && i < THREAD_NO) i++;
+    return i;
+}
+
+static void atExitHook1 (void *arg)
+{
+    int no = findThreadIndex(epicsThreadGetIdSelf());
+    order[no][3] = cnt[no]++;
+}
+
+static void atExitHook2 (void *arg)
+{
+    int no = findThreadIndex(epicsThreadGetIdSelf());
+    order[no][2] = cnt[no]++;
+}
+
+static void startHook1 (epicsThreadId id)
+{
+    int no = newThreadIndex(id);
+    order[no][0] = cnt[no]++;
+    epicsAtThreadExit(atExitHook1, NULL);
+}
+
+static void startHook2 (epicsThreadId id)
+{
+    int no = findThreadIndex(id);
+    order[no][1] = cnt[no]++;
+    epicsAtThreadExit(atExitHook2, NULL);
+}
+
+static void my_thread (void *arg)
+{
+    int no = findThreadIndex(epicsThreadGetIdSelf());
+    mine[no] = 1;
+    epicsEventMustWait((epicsEventId) arg);
+}
+
+static void mapper (epicsThreadId id)
+{
+    called[findThreadIndex(id)]++;
+}
+
+MAIN(epicsThreadHooksTest)
+{
+    int i;
+    int ok;
+
+    testPlan(THREAD_NO);
+    epicsThreadHookAdd(startHook1);
+    epicsThreadHookAdd(startHook2);
+
+    for (i = 0; i < THREAD_NO-1; i++) {
+        char name[10];
+
+        shutdown[i] = epicsEventCreate(epicsEventEmpty);
+        sprintf(name, "t%d", (int) i);
+        epicsThreadCreate(name, epicsThreadPriorityMedium,
+            epicsThreadGetStackSize(epicsThreadStackMedium),
+            my_thread, shutdown[i]);
+    }
+
+    epicsThreadMap(mapper);
+
+    ok = 1;
+    for (i = 0; i < THREAD_NO-1; i++) {
+        if (mine[i] && called[i] != 1) ok = 0;
+    }
+    testOk(ok, "All tasks covered once by epicsThreadMap");
+
+    for (i = 0; i < THREAD_NO-1; i++) {
+        epicsEventSignal(shutdown[i]);
+    }
+
+    epicsThreadSleep(1.0);
+
+    for (i = 0; i < THREAD_NO; i++) {
+        int j;
+
+        for (j = 0; j < HOOKS_NO; j++) {
+            if (mine[i] && order[i][j]!=j) ok = 0;
+        }
+        if (mine[i])
+            testOk(ok, "All hooks for task %d called in correct order", (int)i);
+    }
+    return testDone();
+}