Replace switch over backend write methods with specific override.

src/pio.c

@@ -33,32 +33,6 @@ const char *token = "%";
 
 /***************************************************************/
 
-size_t
-cdiPioFileWrite(int fileID, const void *restrict buffer, size_t len, int tsID)
-{
-  size_t iret = 0;
-
-  switch ( commInqIOMode ())
-    {
-    case PIO_MPI:
-      iret = fwMPINONB(fileID, buffer, len, tsID);
-      break;
-#ifndef _SX
-    case PIO_ASYNCH:
-#endif
-    case PIO_WRITER:
-      iret = pioSendWrite(fileID, buffer, len, tsID);
-      break;
-    case PIO_FPGUARD:
-      iret = fwPOSIXFPGUARDSENDRECV(fileID, buffer, len, tsID);
-      break;
-    }
-
-  return iret;
-}
-
-/***************************************************************/
-
 void cdiPioFileWritingInit(void)
 {
   int IOMode = commInqIOMode ();

src/pio.h

@@ -11,8 +11,6 @@
 
 void cdiPioFileWritingInit(void);
 void cdiPioFileWritingFinalize(void);
-size_t cdiPioFileWrite(int fileID, const void *restrict buffer, size_t len,
-                       int tsID);
 
 #endif
 /*

src/pio_impl.h

@@ -91,13 +91,11 @@ typedef void (*elemOp)(void *elem, void *data);
 void listSetForeach(listSet *q, elemOp func, void *data);
 
 /* pio_mpinonb.c */
-size_t fwMPINONB(int, const void *, size_t, int);
 void initMPINONB(void);
 void      finalizeMPINONB ( void );
 
 
 /* common functionality for file split between collectors and writer(s) */
-size_t pioSendWrite(int, const void *, size_t, int);
 void pioSendInitialize(void);
 void pioSendFinalize(void);
 
@@ -108,7 +106,6 @@ void pioWriterAIO(void);
 #endif
 
 /* pio_posixfpguardsendrecv.c */
-size_t fwPOSIXFPGUARDSENDRECV(int, const void *, size_t, int);
 void      initPOSIXFPGUARDSENDRECV(void);
 void      finalizePOSIXFPGUARDSENDRECV ( void );
 

src/pio_mpinonb.c

@@ -173,7 +173,8 @@ writeMPINONB(aFiledataM *of)
 
 /***************************************************************/
 
-size_t fwMPINONB(int fileID, const void *buffer, size_t len, int tsID)
+static size_t
+fwMPINONB(int fileID, const void *buffer, size_t len, int tsID)
 {
   int error = 0;
   int filled = 0;
@@ -311,6 +312,7 @@ initMPINONB(void)
 
   namespaceSwitchSet(NSSWITCH_FILE_OPEN, NSSW_FUNC(fowMPINONB));
   namespaceSwitchSet(NSSWITCH_FILE_CLOSE, NSSW_FUNC(fcMPINONB));
+  namespaceSwitchSet(NSSWITCH_FILE_WRITE, NSSW_FUNC(fwMPINONB));
 
   if ( bibAFiledataM == NULL )
     xabort ( "listSetNew did not succeed" );

src/pio_posixfpguardsendrecv.c

@@ -381,7 +381,7 @@ flushOp(aFiledataPF *a, int tsID)
 }
 
 
-size_t
+static size_t
 fwPOSIXFPGUARDSENDRECV(int fileID, const void *buffer, size_t len, int tsID)
 {
   int error = 0;
@@ -538,6 +538,8 @@ initPOSIXFPGUARDSENDRECV(void)
                          NSSW_FUNC(fowPOSIXFPGUARDSENDRECV));
       namespaceSwitchSet(NSSWITCH_FILE_CLOSE,
                          NSSW_FUNC(fcPOSIXFPGUARDSENDRECV));
+      namespaceSwitchSet(NSSWITCH_FILE_WRITE,
+                         NSSW_FUNC(fwPOSIXFPGUARDSENDRECV));
       bibAFiledataPF = listSetNew(destroyAFiledataPF, compareNamesAPF);
     }
 }

src/pio_record_send.c

@@ -149,7 +149,7 @@ flushOp(remoteFileBuf *fb, int tsID)
 }
 
 
-size_t
+static size_t
 pioSendWrite(int id, const void *buffer, size_t len, int tsID)
 {
   int error = 0;
@@ -319,6 +319,7 @@ pioSendInitialize(void)
     {
       namespaceSwitchSet(NSSWITCH_FILE_OPEN, NSSW_FUNC(pioSendOpen));
       namespaceSwitchSet(NSSWITCH_FILE_CLOSE, NSSW_FUNC(pioSendClose));
+      namespaceSwitchSet(NSSWITCH_FILE_WRITE, NSSW_FUNC(pioSendWrite));
       bibRemoteFileBuf = listSetNew(destroyRemoteFileBuf, compareNames);
     }
 }

src/pio_server.c

@@ -1024,8 +1024,6 @@ void cdiPioCollectorMessageLoop(void)
   namespaceSwitchSet(NSSWITCH_CDF_STREAM_SETUP,
                      NSSW_FUNC(cdiPioServerCdfDefVars));
 #endif
-  namespaceSwitchSet(NSSWITCH_FILE_WRITE,
-                     NSSW_FUNC(cdiPioFileWrite));
 
   int *streamActivity = NULL;
   for ( ;; )