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
39c3cb84
Commit
39c3cb84
authored
7 years ago
by
William F Godoy
Browse files
Options
Downloads
Patches
Plain Diff
Fixing DataMan conflict name
parent
de7d5d20
No related branches found
No related tags found
1 merge request
!294
Bp1read : Initial Reading Capabilities and latest API
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/adios2/toolkit/transportman/dataman/DataMan.cpp
+7
-4
7 additions, 4 deletions
source/adios2/toolkit/transportman/dataman/DataMan.cpp
with
7 additions
and
4 deletions
source/adios2/toolkit/transportman/dataman/DataMan.cpp
+
7
−
4
View file @
39c3cb84
...
@@ -24,10 +24,12 @@ DataMan::DataMan(MPI_Comm mpiComm, const bool debugMode)
...
@@ -24,10 +24,12 @@ DataMan::DataMan(MPI_Comm mpiComm, const bool debugMode)
:
TransportMan
(
mpiComm
,
debugMode
)
:
TransportMan
(
mpiComm
,
debugMode
)
{
{
}
}
void
DataMan
::
OpenWANTransports
(
const
std
::
string
&
name
,
const
Mode
openM
ode
,
void
DataMan
::
OpenWANTransports
(
const
std
::
string
&
name
,
const
Mode
m
ode
,
const
std
::
vector
<
Params
>
&
parametersVector
,
const
std
::
vector
<
Params
>
&
parametersVector
,
const
bool
profile
)
const
bool
profile
)
{
{
size_t
counter
=
0
;
for
(
const
auto
&
parameters
:
parametersVector
)
for
(
const
auto
&
parameters
:
parametersVector
)
{
{
std
::
shared_ptr
<
Transport
>
wanTransport
,
controlTransport
;
std
::
shared_ptr
<
Transport
>
wanTransport
,
controlTransport
;
...
@@ -73,18 +75,19 @@ void DataMan::OpenWANTransports(const std::string &name, const Mode openMode,
...
@@ -73,18 +75,19 @@ void DataMan::OpenWANTransports(const std::string &name, const Mode openMode,
controlTransport
=
std
::
make_shared
<
transport
::
WANZmq
>
(
controlTransport
=
std
::
make_shared
<
transport
::
WANZmq
>
(
ipAddress
,
portControl
,
m_MPIComm
,
m_DebugMode
);
ipAddress
,
portControl
,
m_MPIComm
,
m_DebugMode
);
wanTransport
->
Open
(
messageName
,
openM
ode
);
wanTransport
->
Open
(
messageName
,
m
ode
);
m_Transports
.
emplace
(
counter
,
std
::
move
(
wanTransport
));
m_Transports
.
emplace
(
counter
,
std
::
move
(
wanTransport
));
controlTransport
->
Open
(
messageName
,
openM
ode
);
controlTransport
->
Open
(
messageName
,
m
ode
);
m_ControlTransports
.
push_back
(
std
::
move
(
controlTransport
));
m_ControlTransports
.
push_back
(
std
::
move
(
controlTransport
));
if
(
openM
ode
==
Open
Mode
::
Read
)
if
(
m
ode
==
Mode
::
Read
)
{
{
m_Listening
=
true
;
m_Listening
=
true
;
m_ControlThreads
.
push_back
(
std
::
thread
(
&
DataMan
::
ReadThread
,
m_ControlThreads
.
push_back
(
std
::
thread
(
&
DataMan
::
ReadThread
,
this
,
wanTransport
,
this
,
wanTransport
,
controlTransport
));
controlTransport
));
}
}
++
counter
;
#else
#else
throw
std
::
invalid_argument
(
throw
std
::
invalid_argument
(
...
...
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