Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ADIOS2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Podhorszki, Norbert
ADIOS2
Commits
4e97a27b
Commit
4e97a27b
authored
7 years ago
by
William F Godoy
Browse files
Options
Downloads
Patches
Plain Diff
Removed warning for void parameter and checking on
parent
600ba636
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!340
for BP buffer over WAN
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/adios2/toolkit/transportman/dataman/DataMan.cpp
+8
-6
8 additions, 6 deletions
source/adios2/toolkit/transportman/dataman/DataMan.cpp
source/adios2/toolkit/transportman/dataman/DataMan.h
+1
-1
1 addition, 1 deletion
source/adios2/toolkit/transportman/dataman/DataMan.h
with
9 additions
and
7 deletions
source/adios2/toolkit/transportman/dataman/DataMan.cpp
+
8
−
6
View file @
4e97a27b
...
...
@@ -38,6 +38,7 @@ DataMan::~DataMan()
void
DataMan
::
OpenWANTransports
(
const
std
::
string
&
name
,
const
Mode
mode
,
const
std
::
vector
<
Params
>
&
parametersVector
,
const
bool
profile
)
{
#ifdef ADIOS2_HAVE_ZEROMQ
size_t
counter
=
0
;
// remove MACRO when more libraries are added
...
...
@@ -134,13 +135,14 @@ void DataMan::WriteWAN(const void *buffer, nlohmann::json jmsg)
{
m_ControlTransports
[
m_CurrentTransport
]
->
Write
(
jmsg
.
dump
().
c_str
(),
jmsg
.
dump
().
size
());
m_Transports
[
m_CurrentTransport
]
->
Write
(
static_cast
<
const
char
*>
(
buffer
),
jmsg
[
"bytes"
].
get
<
size_t
>
());
m_Transports
[
m_CurrentTransport
]
->
Write
(
reinterpret_cast
<
const
char
*>
(
buffer
),
jmsg
[
"bytes"
].
get
<
size_t
>
());
}
void
DataMan
::
WriteWAN
(
const
char
*
buffer
,
size_t
size
)
void
DataMan
::
WriteWAN
(
const
void
*
buffer
,
size_t
size
)
{
m_Transports
[
m_CurrentTransport
]
->
Write
(
buffer
,
size
);
m_Transports
[
m_CurrentTransport
]
->
Write
(
reinterpret_cast
<
const
char
*>
(
buffer
),
size
);
}
void
DataMan
::
ReadWAN
(
void
*
buffer
,
nlohmann
::
json
jmsg
)
{}
...
...
@@ -205,11 +207,11 @@ void DataMan::ReadThread(std::shared_ptr<Transport> trans,
if
(
bufferSize
>
0
)
{
size_t
size
=
static_cast
<
size_t
>
(
bufferSize
);
const
size_t
size
=
static_cast
<
size_t
>
(
bufferSize
)
+
8
;
m_BP3Deserializer
->
m_Data
.
Resize
(
size
,
"in DataMan Streaming Listener"
);
trans
->
Read
(
m_BP3Deserializer
->
m_Data
.
m_Buffer
.
data
(),
size
);
trans
->
Read
(
m_BP3Deserializer
->
m_Data
.
m_Buffer
.
data
(),
size
,
0
);
m_BP3Deserializer
->
ParseMetadata
(
*
m_IO
);
const
auto
variablesInfo
=
m_IO
->
GetAvailableVariables
();
...
...
This diff is collapsed.
Click to expand it.
source/adios2/toolkit/transportman/dataman/DataMan.h
+
1
−
1
View file @
4e97a27b
...
...
@@ -44,7 +44,7 @@ public:
* @param buffer
* @param size can't use const due to C libraries...
*/
void
WriteWAN
(
const
char
*
buffer
,
size_t
size
);
void
WriteWAN
(
const
void
*
buffer
,
size_t
size
);
void
ReadWAN
(
void
*
buffer
,
nlohmann
::
json
jmsg
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment