Commit 9a2322e8 authored by Deike Kleberg's avatar Deike Kleberg
Browse files

interim 3

parent 0665bb25
......@@ -14,7 +14,6 @@
#include "pio_util.h"
extern int reshArrayCompare ( int, int );
extern void reshArrayPrint ( char * );
extern void reshPackBufferCreate ( char **, int *, MPI_Comm );
extern void reshPackBufferDestroy ( char ** );
extern void rpcUnpackResources ( char *, int, MPI_Comm );
......
......@@ -195,16 +195,14 @@ extern "C" {
/* deike */
/* parallel io types, A: asynchronous, B: blocking */
#define PIO_NONE 0
#define PIO_MPI_NONB 1
#define PIO_POSIX_NONB 2
#define PIO_POSIX_ASYNCH 3
#define PIO_POSIX_FPGUARD_SENDRECV 4
#define PIO_POSIX_FPGUARD_THREAD_REFUSE 5
#define PIO_POSIX_FPGUARD_THREAD 6
#define PIO_MAXIOMODUS PIO_POSIX_FPGUARD_SENDRECV
#define PIO_MINIOMODUSWITHSPECIALPROCS PIO_POSIX_NONB
#define PIO_NONE 0
#define PIO_MPI_NONB 1
#define PIO_POSIX_NONB 2
#define PIO_POSIX_ASYNCH 3
#define PIO_POSIX_FPGUARD_SENDRECV 4
#define PIO_MAXIOMODUS PIO_POSIX_FPGUARD_SENDRECV
#define PIO_MINIOMODUSWITHSPECIALPROCS PIO_POSIX_NONB
int pioInit ( int, int, int );
......
......@@ -86,22 +86,10 @@ size_t pioFileWrite ( int fileID, int tsID, const void *buffer, size_t len )
case PIO_POSIX_ASYNCH:
iret = fwPOSIXASYNCH ( fileID, tsID, buffer, len );
break;
#endif
#endif
case PIO_POSIX_FPGUARD_SENDRECV:
iret = fwPOSIXFPGUARDSENDRECV ( fileID, tsID, buffer, len );
break;
/*
case PIO_POSIX_FPGUARD_THREAD:
iret = fwPOSIXFPGUARDTHREAD ( fileID, tsID, buffer, len );
break;
*/
/*
case PIO_POSIX_FPGUARD_THREAD_REFUSE:
iret = fwPOSIXFPGUARDTHREADREFUSE ( fileID, tsID, buffer, len );
break;
*/
case PIO_POSIX_NONB:
iret = fwPOSIXNONB ( fileID, tsID, buffer, len );
break;
......@@ -128,17 +116,6 @@ int pioFileClose ( int id )
case PIO_POSIX_FPGUARD_SENDRECV:
iret = fcPOSIXFPGUARDSENDRECV ( id );
break;
/*
case PIO_POSIX_FPGUARD_THREAD:
iret = fcPOSIXFPGUARDTHREAD ( id );
break;
*/
/*
case PIO_POSIX_FPGUARD_THREAD_REFUSE:
iret = fcPOSIXFPGUARDTHREADREFUSE ( id );
break;
*/
case PIO_POSIX_NONB:
iret = fcPOSIXNONB ( id );
break;
......@@ -166,17 +143,6 @@ int pioFileOpenW ( const char *filename )
case PIO_POSIX_FPGUARD_SENDRECV:
iret = fowPOSIXFPGUARDSENDRECV ( filename );
break;
/*
case PIO_POSIX_FPGUARD_THREAD:
iret = fowPOSIXFPGUARDTHREAD ( filename );
break;
*/
/*
case PIO_POSIX_FPGUARD_THREAD_REFUSE:
iret = fowPOSIXFPGUARDTHREADREFUSE ( filename );
break;
*/
case PIO_POSIX_NONB:
iret = fowPOSIXNONB ( filename );
break;
......@@ -216,17 +182,6 @@ void backendInit ( void )
case PIO_POSIX_FPGUARD_SENDRECV:
initPOSIXFPGUARDSENDRECV ();
break;
/*
case PIO_POSIX_FPGUARD_THREAD:
collectingData = initPOSIXFPGUARDTHREAD ();
break;
*/
/*
case PIO_POSIX_FPGUARD_THREAD_REFUSE:
collectingData = initPOSIXFPGUARDTHREADREFUSE ();
break;
*/
case PIO_POSIX_NONB:
initPOSIXNONB ();
break;
......@@ -237,15 +192,6 @@ void backendInit ( void )
void backendFinalize ( void )
{
/*
switch ( pioinfo->type )
{
case PIO_POSIX_FPGUARD_THREAD:
finalizePOSIXFPGUARDTHREAD ();
break;
}
*/
commDestroy ();
MPI_Finalize ();
exit ( 0 );
......
......@@ -86,6 +86,7 @@ int fcPOSIXASYNCH ( int );
size_t fwPOSIXASYNCH( int, int, const void *, size_t );
void initPOSIXASYNCH ( void );
#endif
/* pio_posixfpguardsendrecv.c */
void fpgPOSIXFPGUARDSENDRECV ( void );
int fowPOSIXFPGUARDSENDRECV ( const char * );
......@@ -93,22 +94,6 @@ int fcPOSIXFPGUARDSENDRECV ( int );
size_t fwPOSIXFPGUARDSENDRECV ( int, int, const void *, size_t );
void initPOSIXFPGUARDSENDRECV ( void );
/* pio_posixfpguardthread.c */
void * fpgPOSIXFPGUARDTHREAD ( void * );
int fowPOSIXFPGUARDTHREAD ( const char * );
int fcPOSIXFPGUARDTHREAD ( int );
size_t fwPOSIXFPGUARDTHREAD ( int, int, const void *, size_t );
int initPOSIXFPGUARDTHREAD ( void );
void finalizePOSIXFPGUARDTHREAD ( void );
/* pio_posixfpguardthreadrefuse.c */
void * fpgPOSIXFPGUARDTHREADREFUSE ( void * );
int fowPOSIXFPGUARDTHREADREFUSE ( const char * );
int fcPOSIXFPGUARDTHREADREFUSE ( int );
size_t fwPOSIXFPGUARDTHREADREFUSE ( int, int, const void *, size_t );
int initPOSIXFPGUARDTHREADREFUSE ( void );
void finalizePOSIXFPGUARDTHREADREFUSE ( void );
/* pio_posixnonb.c */
void pwPOSIXNONB ( void );
int fowPOSIXNONB ( const char * );
......
......@@ -23,9 +23,6 @@
#include "vlist_var.h"
extern resOps streamOps;
extern void reshArrayPrint ( char * );
extern void arrayDestroy ( void );
MPI_Comm * commPio;
......
......@@ -160,6 +160,9 @@ void printArray ( char *, void *, int, int, const char *, const char *, int );
if ( ddebug == MAXDEBUG ) \
printArray ( ps, array, n, datatype, __func__, __FILE__, __LINE__ )
void reshArrayPrint ( char * );
#endif
/*
* Local Variables:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment