Merge changes from 3.15 branch into 7.0

2020-04-15 21:39:54 -05:00
parent ad44c7a501 45cf2ea5ce
commit 85d1982890
57 changed files with 4118 additions and 1470 deletions
@@ -383,5 +383,11 @@ extern "C" {
    }
 } // extern "C"

-// Ensure the main thread gets a unique ID
-epicsThreadId epicsThreadMainId = epicsThreadGetIdSelf();
+static epicsThreadId initMainThread(void) {
+    epicsThreadId main = epicsThreadGetIdSelf();
+    epicsThreadSetOkToBlock(1);
+    return main;
+}
+
+// Ensure the main thread gets a unique ID and allows blocking I/O
+epicsThreadId epicsThreadMainId = initMainThread();