Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
bd46e09b
Commit
bd46e09b
authored
Nov 19, 2013
by
Thomas Jahns
🤸
Browse files
Remove now unneeded size argument from RDMA window serialization.
parent
22759cd0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/pio_client.c
View file @
bd46e09b
...
...
@@ -47,7 +47,7 @@ cdiPioClientStreamOpen(const char *filename, const char *filemode,
.
filetype
=
filetype
}
};
pioBufferFuncCall
(
header
,
&
(
struct
memCpyDataDesc
){
filename
,
filename_len
+
1
},
0
,
memcpyPackFunc
);
filename_len
+
1
},
memcpyPackFunc
);
xdebug
(
"WROTE FUNCTION CALL IN BUFFER OF WINS: %s, filenamesz=%zu,"
" filename=%s, filetype=%d"
,
funcMap
[(
-
1
-
STREAMOPEN
)],
filename_len
+
1
,
filename
,
...
...
@@ -78,7 +78,7 @@ cdiPioClientStreamDefVlist_(int streamID, int vlistID)
header
=
(
struct
winHeaderEntry
){
.
id
=
STREAMDEFVLIST
,
.
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,"
" vlistID=%d"
,
funcMap
[(
-
1
-
STREAMDEFVLIST
)],
streamID
,
vlistID
);
break
;
...
...
@@ -169,7 +169,7 @@ cdiPioClientStreamClose(stream_t *streamptr, int recordBufIsToBeDeleted)
.
id
=
STREAMCLOSE
,
.
specific
.
funcArgs
.
streamChange
=
{
streamptr
->
self
,
CDI_UNDEFID
}
};
pioBufferFuncCall
(
header
,
NULL
,
0
,
nullPackFunc
);
pioBufferFuncCall
(
header
,
NULL
,
nullPackFunc
);
xdebug
(
"WROTE FUNCTION CALL IN BUFFER OF WINS: %s, streamID=%d"
,
funcMap
[
-
1
-
STREAMCLOSE
],
streamptr
->
self
);
break
;
...
...
@@ -204,7 +204,7 @@ cdiPioClientStreamDefTimestep_(stream_t *streamptr, int tsID)
.
id
=
STREAMDEFTIMESTEP
,
.
specific
.
funcArgs
.
streamNewTimestep
=
{
streamptr
->
self
,
tsID
}
};
xassert
(
sizeof
(
void
*
)
>=
sizeof
(
int
));
pioBufferFuncCall
(
header
,
(
void
*
)(
intptr_t
)
taxisID
,
0
,
cdiPioTaxisPackWrap
);
pioBufferFuncCall
(
header
,
(
void
*
)(
intptr_t
)
taxisID
,
cdiPioTaxisPackWrap
);
break
;
case
STAGE_CLEANUP
:
break
;
...
...
src/pio_interface.c
View file @
bd46e09b
...
...
@@ -484,7 +484,7 @@ void modelWinCreate ( void )
static
void
modelWinEnqueue
(
int
collID
,
struct
winHeaderEntry
header
,
const
void
*
data
,
size_t
size
,
struct
winHeaderEntry
header
,
const
void
*
data
,
valPackFunc
packFunc
)
{
struct
winHeaderEntry
*
winDict
...
...
@@ -581,14 +581,13 @@ pioBufferPartData(int streamID, int varID, const double *data,
=
{
.
id
=
streamID
,
.
specific
.
dataRecord
=
{
varID
,
nmiss
},
.
offset
=
-
1
};
modelWinEnqueue
(
collID
,
dataHeader
,
&
(
struct
memCpyDataDesc
){
data
,
chunk
*
sizeof
(
data
[
0
])},
0
,
memcpyPackFunc
);
memcpyPackFunc
);
{
struct
winHeaderEntry
partHeader
=
{
.
id
=
PARTDESCMARKER
,
.
specific
.
partDesc
=
{
.
uid
=
xt_idxlist_get_uid
(
partDesc
)
},
.
offset
=
0
};
modelWinEnqueue
(
collID
,
partHeader
,
partDesc
,
0
,
cdiPio_xt_idxlist_pack_wrap
);
modelWinEnqueue
(
collID
,
partHeader
,
partDesc
,
cdiPio_xt_idxlist_pack_wrap
);
}
txWin
[
collID
].
refuseFuncCall
=
1
;
...
...
@@ -597,8 +596,7 @@ pioBufferPartData(int streamID, int varID, const double *data,
/************************************************************************/
void
pioBufferFuncCall
(
struct
winHeaderEntry
header
,
const
void
*
data
,
size_t
data_len
,
valPackFunc
dataPackFunc
)
const
void
*
data
,
valPackFunc
dataPackFunc
)
{
int
rankGlob
=
commInqRankGlob
();
int
root
=
commInqRootGlob
();
...
...
@@ -623,7 +621,7 @@ void pioBufferFuncCall(struct winHeaderEntry header,
xassert
(
txWin
[
collID
].
dictRPCUsed
+
txWin
[
collID
].
dictDataUsed
<
txWin
[
collID
].
dictSize
);
xassert
(
txWin
[
collID
].
refuseFuncCall
==
0
);
modelWinEnqueue
(
collID
,
header
,
data
,
data_len
,
dataPackFunc
);
modelWinEnqueue
(
collID
,
header
,
data
,
dataPackFunc
);
}
xdebug
(
"%s"
,
"RETURN"
);
...
...
src/pio_interface.h
View file @
bd46e09b
...
...
@@ -17,8 +17,7 @@ void
pioBufferPartData
(
int
streamID
,
int
varID
,
const
double
*
data
,
int
nmiss
,
Xt_idxlist
partDesc
);
void
pioBufferFuncCall
(
struct
winHeaderEntry
header
,
const
void
*
data
,
size_t
dataSize
,
valPackFunc
dataPackFunc
);
const
void
*
data
,
valPackFunc
dataPackFunc
);
struct
memCpyDataDesc
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment