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
3368696b
Commit
3368696b
authored
7 years ago
by
Wang, Ruonan
Browse files
Options
Downloads
Patches
Plain Diff
fixed a few error handling and solved the Windows build error
parent
04a5e5b2
No related branches found
No related tags found
1 merge request
!270
Finished DataMan Transport Manager refactoring but full functionality still pending on Read API
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
source/adios2/ADIOSConfig.h.in
+0
-3
0 additions, 3 deletions
source/adios2/ADIOSConfig.h.in
source/adios2/CMakeLists.txt
+3
-5
3 additions, 5 deletions
source/adios2/CMakeLists.txt
source/adios2/toolkit/transport/wan/WANZmq.cpp
+10
-1
10 additions, 1 deletion
source/adios2/toolkit/transport/wan/WANZmq.cpp
with
13 additions
and
9 deletions
source/adios2/ADIOSConfig.h.in
+
0
−
3
View file @
3368696b
...
@@ -42,9 +42,6 @@
...
@@ -42,9 +42,6 @@
/* CMake Option: ADIOS_USE_ZeroMQ=ON */
/* CMake Option: ADIOS_USE_ZeroMQ=ON */
#cmakedefine ADIOS2_HAVE_ZEROMQ
#cmakedefine ADIOS2_HAVE_ZEROMQ
/* CMake Option: ADIOS_USE_DataMan=ON */
#cmakedefine ADIOS2_HAVE_DATAMAN
/* CMake Option: ADIOS_USE_SysVShMem=ON */
/* CMake Option: ADIOS_USE_SysVShMem=ON */
#cmakedefine ADIOS2_HAVE_SYSVSHMEM
#cmakedefine ADIOS2_HAVE_SYSVSHMEM
...
...
This diff is collapsed.
Click to expand it.
source/adios2/CMakeLists.txt
+
3
−
5
View file @
3368696b
...
@@ -74,13 +74,11 @@ if(ADIOS2_HAVE_ZeroMQ)
...
@@ -74,13 +74,11 @@ if(ADIOS2_HAVE_ZeroMQ)
target_link_libraries
(
adios2 PRIVATE ZeroMQ::ZMQ
)
target_link_libraries
(
adios2 PRIVATE ZeroMQ::ZMQ
)
endif
()
endif
()
if
(
ADIOS2_HAVE_DataMan
)
target_sources
(
adios2 PRIVATE
target_sources
(
adios2 PRIVATE
engine/dataman/DataManReader.cpp
engine/dataman/DataManReader.cpp
engine/dataman/DataManWriter.cpp
engine/dataman/DataManWriter.cpp
)
)
target_link_libraries
(
adios2 PRIVATE NLohmannJson
)
target_link_libraries
(
adios2 PRIVATE NLohmannJson
)
endif
()
if
(
ADIOS2_HAVE_BZip2
)
if
(
ADIOS2_HAVE_BZip2
)
...
...
This diff is collapsed.
Click to expand it.
source/adios2/toolkit/transport/wan/WANZmq.cpp
+
10
−
1
View file @
3368696b
...
@@ -24,6 +24,10 @@ WANZmq::WANZmq(const std::string ipAddress, const std::string port,
...
@@ -24,6 +24,10 @@ WANZmq::WANZmq(const std::string ipAddress, const std::string port,
m_Port
(
port
)
m_Port
(
port
)
{
{
m_Context
=
zmq_ctx_new
();
m_Context
=
zmq_ctx_new
();
if
(
m_Context
==
nullptr
||
m_Context
==
NULL
)
{
throw
std
::
runtime_error
(
"ERROR: Creating ZeroMQ context failed"
);
}
if
(
m_DebugMode
)
if
(
m_DebugMode
)
{
{
// TODO verify port is unsigned int
// TODO verify port is unsigned int
...
@@ -57,6 +61,11 @@ void WANZmq::Open(const std::string &name, const OpenMode openMode)
...
@@ -57,6 +61,11 @@ void WANZmq::Open(const std::string &name, const OpenMode openMode)
m_Socket
=
zmq_socket
(
m_Context
,
ZMQ_REQ
);
m_Socket
=
zmq_socket
(
m_Context
,
ZMQ_REQ
);
const
std
::
string
fullIP
(
"tcp://"
+
m_IPAddress
+
":"
+
m_Port
);
const
std
::
string
fullIP
(
"tcp://"
+
m_IPAddress
+
":"
+
m_Port
);
int
err
=
zmq_connect
(
m_Socket
,
fullIP
.
c_str
());
int
err
=
zmq_connect
(
m_Socket
,
fullIP
.
c_str
());
if
(
err
)
{
throw
std
::
runtime_error
(
"ERROR: zmq_connect() failed with "
+
std
::
to_string
(
err
));
}
if
(
m_Profiler
.
IsActive
)
if
(
m_Profiler
.
IsActive
)
{
{
...
@@ -93,7 +102,7 @@ void WANZmq::Open(const std::string &name, const OpenMode openMode)
...
@@ -93,7 +102,7 @@ void WANZmq::Open(const std::string &name, const OpenMode openMode)
if
(
m_DebugMode
)
if
(
m_DebugMode
)
{
{
if
(
m_Socket
==
NULL
)
// something goes wrong
if
(
m_Socket
==
nullptr
||
m_Socket
==
NULL
)
// something goes wrong
{
{
throw
std
::
ios_base
::
failure
(
throw
std
::
ios_base
::
failure
(
"ERROR: couldn't open socket for address "
+
m_Name
+
"ERROR: couldn't open socket for address "
+
m_Name
+
...
...
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