Commit bd46e09b authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Remove now unneeded size argument from RDMA window serialization.

parent 22759cd0
...@@ -47,7 +47,7 @@ cdiPioClientStreamOpen(const char *filename, const char *filemode, ...@@ -47,7 +47,7 @@ cdiPioClientStreamOpen(const char *filename, const char *filemode,
.filetype = filetype } }; .filetype = filetype } };
pioBufferFuncCall(header, pioBufferFuncCall(header,
&(struct memCpyDataDesc){filename, &(struct memCpyDataDesc){filename,
filename_len + 1}, 0, memcpyPackFunc); filename_len + 1}, memcpyPackFunc);
xdebug("WROTE FUNCTION CALL IN BUFFER OF WINS: %s, filenamesz=%zu," xdebug("WROTE FUNCTION CALL IN BUFFER OF WINS: %s, filenamesz=%zu,"
" filename=%s, filetype=%d", " filename=%s, filetype=%d",
funcMap[(-1 - STREAMOPEN)], filename_len + 1, filename, funcMap[(-1 - STREAMOPEN)], filename_len + 1, filename,
...@@ -78,7 +78,7 @@ cdiPioClientStreamDefVlist_(int streamID, int vlistID) ...@@ -78,7 +78,7 @@ cdiPioClientStreamDefVlist_(int streamID, int vlistID)
header = (struct winHeaderEntry){ header = (struct winHeaderEntry){
.id = STREAMDEFVLIST, .id = STREAMDEFVLIST,
.specific.funcArgs.streamChange = { streamID, vlistID } }; .specific.funcArgs.streamChange = { streamID, vlistID } };
pioBufferFuncCall(header, NULL, 0, nullPackFunc); pioBufferFuncCall(header, NULL, nullPackFunc);
xdebug("WROTE FUNCTION CALL IN BUFFER OF WINS: %s, streamID=%d," xdebug("WROTE FUNCTION CALL IN BUFFER OF WINS: %s, streamID=%d,"
" vlistID=%d", funcMap[(-1 - STREAMDEFVLIST)], streamID, vlistID); " vlistID=%d", funcMap[(-1 - STREAMDEFVLIST)], streamID, vlistID);
break; break;
...@@ -169,7 +169,7 @@ cdiPioClientStreamClose(stream_t *streamptr, int recordBufIsToBeDeleted) ...@@ -169,7 +169,7 @@ cdiPioClientStreamClose(stream_t *streamptr, int recordBufIsToBeDeleted)
.id = STREAMCLOSE, .id = STREAMCLOSE,
.specific.funcArgs.streamChange .specific.funcArgs.streamChange
= { streamptr->self, CDI_UNDEFID } }; = { streamptr->self, CDI_UNDEFID } };
pioBufferFuncCall(header, NULL, 0, nullPackFunc); pioBufferFuncCall(header, NULL, nullPackFunc);
xdebug("WROTE FUNCTION CALL IN BUFFER OF WINS: %s, streamID=%d", xdebug("WROTE FUNCTION CALL IN BUFFER OF WINS: %s, streamID=%d",
funcMap[-1 - STREAMCLOSE], streamptr->self); funcMap[-1 - STREAMCLOSE], streamptr->self);
break; break;
...@@ -204,7 +204,7 @@ cdiPioClientStreamDefTimestep_(stream_t *streamptr, int tsID) ...@@ -204,7 +204,7 @@ cdiPioClientStreamDefTimestep_(stream_t *streamptr, int tsID)
.id = STREAMDEFTIMESTEP, .id = STREAMDEFTIMESTEP,
.specific.funcArgs.streamNewTimestep = { streamptr->self, tsID } }; .specific.funcArgs.streamNewTimestep = { streamptr->self, tsID } };
xassert(sizeof (void *) >= sizeof (int)); xassert(sizeof (void *) >= sizeof (int));
pioBufferFuncCall(header, (void *)(intptr_t)taxisID, 0, cdiPioTaxisPackWrap); pioBufferFuncCall(header, (void *)(intptr_t)taxisID, cdiPioTaxisPackWrap);
break; break;
case STAGE_CLEANUP: case STAGE_CLEANUP:
break; break;
......
...@@ -484,7 +484,7 @@ void modelWinCreate ( void ) ...@@ -484,7 +484,7 @@ void modelWinCreate ( void )
static void static void
modelWinEnqueue(int collID, modelWinEnqueue(int collID,
struct winHeaderEntry header, const void *data, size_t size, struct winHeaderEntry header, const void *data,
valPackFunc packFunc) valPackFunc packFunc)
{ {
struct winHeaderEntry *winDict struct winHeaderEntry *winDict
...@@ -581,14 +581,13 @@ pioBufferPartData(int streamID, int varID, const double *data, ...@@ -581,14 +581,13 @@ pioBufferPartData(int streamID, int varID, const double *data,
= { .id = streamID, .specific.dataRecord = { varID, nmiss }, .offset = -1 }; = { .id = streamID, .specific.dataRecord = { varID, nmiss }, .offset = -1 };
modelWinEnqueue(collID, dataHeader, modelWinEnqueue(collID, dataHeader,
&(struct memCpyDataDesc){data, chunk * sizeof (data[0])}, &(struct memCpyDataDesc){data, chunk * sizeof (data[0])},
0, memcpyPackFunc); memcpyPackFunc);
{ {
struct winHeaderEntry partHeader struct winHeaderEntry partHeader
= { .id = PARTDESCMARKER, = { .id = PARTDESCMARKER,
.specific.partDesc = { .uid = xt_idxlist_get_uid(partDesc) }, .specific.partDesc = { .uid = xt_idxlist_get_uid(partDesc) },
.offset = 0 }; .offset = 0 };
modelWinEnqueue(collID, partHeader, partDesc, 0, modelWinEnqueue(collID, partHeader, partDesc, cdiPio_xt_idxlist_pack_wrap);
cdiPio_xt_idxlist_pack_wrap);
} }
txWin[collID].refuseFuncCall = 1; txWin[collID].refuseFuncCall = 1;
...@@ -597,8 +596,7 @@ pioBufferPartData(int streamID, int varID, const double *data, ...@@ -597,8 +596,7 @@ pioBufferPartData(int streamID, int varID, const double *data,
/************************************************************************/ /************************************************************************/
void pioBufferFuncCall(struct winHeaderEntry header, void pioBufferFuncCall(struct winHeaderEntry header,
const void *data, size_t data_len, const void *data, valPackFunc dataPackFunc)
valPackFunc dataPackFunc)
{ {
int rankGlob = commInqRankGlob (); int rankGlob = commInqRankGlob ();
int root = commInqRootGlob (); int root = commInqRootGlob ();
...@@ -623,7 +621,7 @@ void pioBufferFuncCall(struct winHeaderEntry header, ...@@ -623,7 +621,7 @@ void pioBufferFuncCall(struct winHeaderEntry header,
xassert(txWin[collID].dictRPCUsed + txWin[collID].dictDataUsed xassert(txWin[collID].dictRPCUsed + txWin[collID].dictDataUsed
< txWin[collID].dictSize); < txWin[collID].dictSize);
xassert(txWin[collID].refuseFuncCall == 0); xassert(txWin[collID].refuseFuncCall == 0);
modelWinEnqueue(collID, header, data, data_len, dataPackFunc); modelWinEnqueue(collID, header, data, dataPackFunc);
} }
xdebug("%s", "RETURN"); xdebug("%s", "RETURN");
......
...@@ -17,8 +17,7 @@ void ...@@ -17,8 +17,7 @@ void
pioBufferPartData(int streamID, int varID, const double *data, pioBufferPartData(int streamID, int varID, const double *data,
int nmiss, Xt_idxlist partDesc); int nmiss, Xt_idxlist partDesc);
void pioBufferFuncCall(struct winHeaderEntry header, void pioBufferFuncCall(struct winHeaderEntry header,
const void *data, size_t dataSize, const void *data, valPackFunc dataPackFunc);
valPackFunc dataPackFunc);
struct memCpyDataDesc struct memCpyDataDesc
......
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