Merge pull request #68 from mdavidsaver/win32

Extend portability

Author: shroffk

.github/workflows/ci-scripts-build.yml

@@ -16,80 +16,122 @@ env:
 
 jobs:
   build-client:
-    name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}${{ matrix.rtems }}/${{ matrix.extra }}
+    name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     # Set environment variables from matrix parameters
     env:
       BASE: ${{ matrix.base }}
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      RTEMS: ${{ matrix.rtems }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+          - name: Linux-Mingw-7.0
+            os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "7.0"
-            wine: "64"
+            cross: "windows-x64-mingw"
 
-          - os: ubuntu-latest
+          - name: Linux-static-7.0
+            os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "7.0"
 
-          - os: ubuntu-latest
+          - name: Linux-3.15
+            os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "3.15"
 
-          - os: ubuntu-latest
+          - name: Linux-3.14
+            os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "3.14"
 
-          - os: ubuntu-latest
+          - name: Linux-c++11-7.0
+            os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
 
-          - os: ubuntu-latest
-            cmp: gcc
+          - name: Linux-clang-7.0
+            os: ubuntu-latest
+            cmp: clang
             configuration: default
             base: "7.0"
 
-          - os: ubuntu-latest
+          - name: Linux-clang-c++11-7.0
+            os: ubuntu-latest
             cmp: clang
             configuration: default
             base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
 
-          - os: ubuntu-latest
+          - name: Linux-rtems5-7.0
+            os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            cross: "RTEMS-pc686-qemu@5"
+
+          - name: Linux-rtems4.10-7.0
+            os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "7.0"
-            rtems: "4.10"
+            cross: "[email protected]"
+            test: NO
 
-          - os: ubuntu-latest
+          - name: Linux-rtems4.9-7.0
+            os: ubuntu-20.04
             cmp: gcc
             configuration: default
             base: "7.0"
-            rtems: "4.9"
+            cross: "RTEMS-pc386-qemu@4.9"
 
-          - os: ubuntu-latest
+          - name: OSX-7.0
+            os: macos-latest
             cmp: clang
             configuration: default
             base: "7.0"
 
+          - name: msvc-7.0
+            os: windows-latest
+            cmp: vs2022
+            configuration: default
+            base: "7.0"
+
+          - name: msvc-static-7.0
+            os: windows-latest
+            cmp: vs2022
+            configuration: static
+            base: "7.0"
+
+          - name: msvc-debug-7.0
+            os: windows-latest
+            cmp: vs2022
+            configuration: debug
+            base: "7.0"
+
+          - name: mingw-7.0
+            os: windows-latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+
     defaults:
       run:
         working-directory: client
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dump analysis
@@ -105,14 +147,15 @@ jobs:
       run: python .ci/cue.py build
     - name: Run main module tests
       run: python .ci/cue.py test
-    - name: Collect and show test results
-      run: python .ci/cue.py test-results
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
+    - name: Collect and show test results
+      if: ${{ always() }}
+      run: python .ci/cue.py test-results
 
   docker:
     name: ${{ matrix.name }}
@@ -123,7 +166,6 @@ jobs:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
       BASE: ${{ matrix.base }}
-      WINE: ${{ matrix.wine }}
       LIBEVENT_TAG: ${{ matrix.libevent }}
       EXTRA: ${{ matrix.extra }}
       VV: "1"
@@ -169,7 +211,7 @@ jobs:
         # people would rather just break all existing scripts...
         [ -e /usr/bin/python ] || ln -sf /usr/bin/python3 /usr/bin/python
         python --version
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -183,12 +225,13 @@ jobs:
     - name: Run main module tests
       working-directory: ./client
       run: python .ci/cue.py test
-    - name: Collect and show test results
-      working-directory: ./client
-      run: python .ci/cue.py test-results
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
+    - name: Collect and show test results
+      if: ${{ always() }}
+      working-directory: ./client
+      run: python .ci/cue.py test-results

client/.ci

@@ -10,6 +10,9 @@ LIBRARY_IOC = reccaster
 # Will increment with ABI changes
 SHRLIB_VERSION = 0
 
+PROD_SYS_LIBS_WIN32 = iphlpapi netapi32 ws2_32
+LIB_SYS_LIBS_WIN32 = iphlpapi netapi32 ws2_32
+
 reccaster_SRCS += sockhelpers.c
 reccaster_SRCS += caster.c
 reccaster_SRCS += castudp.c
@@ -46,6 +49,10 @@ testAddEnvVars_SYS_LIBS_WIN32 = ws2_32
 TESTS += testAddEnvVars
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),)
+TESTPROD = $(TESTPROD_HOST)
+TESTSCRIPTS += $(TESTSCRIPTS_HOST)
+endif
 
 #===========================
 

client/castApp/src/Makefile

@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include <errlog.h>
-#include <cantProceed.h>
 #include <epicsAssert.h>
 #include <epicsThread.h>
 #include <epicsStdio.h>
@@ -102,8 +101,7 @@ static void casterThread(void* junk)
 static
 void casterShowMsgDefault(void* arg, struct _caster_t* self)
 {
-    errlogMessage(self->lastmsg);
-    errlogMessage("\n");
+    errlogPrintf("%s\n", self->lastmsg);
 }
 
 void casterInit(caster_t *self)
@@ -118,7 +116,7 @@ void casterInit(caster_t *self)
     self->timeout = reccastTimeout;
 
     if(shSocketPair(self->wakeup))
-        cantProceed("casterInit failed to create shutdown socket");
+        errlogPrintf("Error: casterInit failed to create shutdown socket: %d\n", SOCKERRNO);
 }
 
 void casterShutdown(caster_t *self)
@@ -130,8 +128,10 @@ void casterShutdown(caster_t *self)
     self->shutdown = 1;
     epicsMutexUnlock(self->lock);
 
-    if(sizeof(junk)!=send(self->wakeup[0], (char*)&junk, sizeof(junk), 0))
-        cantProceed("casterShutdown notification failed");
+    if(sizeof(junk)!=send(self->wakeup[0], (char*)&junk, sizeof(junk), 0)) {
+        errlogPrintf("Warning: casterShutdown notification failed.  Skipping.");
+        return;
+    }
 
     epicsEventMustWait(self->shutdownEvent);
 
@@ -153,6 +153,10 @@ void casterShutdown(caster_t *self)
 int casterStart(caster_t *self)
 {
     epicsThreadId id;
+    if(self->wakeup[0]==INVALID_SOCKET) {
+        /* casterInit() failed */
+        return 2;
+    }
     id = epicsThreadCreate("reccaster",
                            epicsThreadPriorityMedium,
                            epicsThreadGetStackSize(epicsThreadStackSmall),

client/castApp/src/caster.c

@@ -202,6 +202,7 @@ static void addReccasterEnvVarsCallFunc(const iocshArgBuf *args)
 
 static void reccasterRegistrar(void)
 {
+    osiSockAttach();
     initHookRegister(&casthook);
     casterInit(&thecaster);
     thepriv.lock = epicsMutexMustCreate();

client/castApp/src/castinit.c

@@ -29,7 +29,7 @@ int doCasterTCPPhase(caster_t *self)
         ERRRET(-1, self, "Failed to create socket");
 
     if(shConnect(&sock, &self->nameserv))
-        ERRTO(done, self, "caster failed to connect");
+        ERRTO(done, self, "Failed to connect (%d)", (int)SOCKERRNO);
 
     if(self->testhook)
         (*self->testhook)(self, casterTCPSetup);
@@ -74,10 +74,14 @@ int doCasterTCPPhase(caster_t *self)
     shSetTimeout(&sock, self->timeout*4.0);
 
     while(!self->shutdown) {
+        int err;
         blen = casterRecvPMsg(&sock, &msgid, &buf.bytes, sizeof(buf.bytes), 0);
+        err = SOCKERRNO;
         if(blen==0)
             break; /* normal end of connection */
-        else if(blen<0 && SOCKERRNO==SOCK_ETIMEDOUT)
+        else if(blen<0 && (err==SOCK_ECONNRESET || err==SOCK_ECONNABORTED))
+            ERRTO(done, self, "RecCaster connection closed by peer");
+        else if(blen<0 && err==SOCK_ETIMEDOUT)
             ERRTO(done, self, "RecCaster server timeout");
         else if(blen<0)
             ERRTO(done, self, "Missing ping header");