Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
db8c2c7b
Commit
db8c2c7b
authored
Jun 23, 2014
by
Steven Murray
Browse files
Removed zmq dependency from libcastorlegacymsg.so
parent
9a3148df
Changes
34
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
db8c2c7b
...
...
@@ -196,9 +196,6 @@ ELSE(DEFINED PackageOnly)
add_subdirectory
(
rtcopy
)
add_subdirectory
(
test
)
endif
(
${
COMPILE_SERVER
}
STREQUAL
"1"
)
if
(
${
COMPILE_SERVER
}
STREQUAL
"1"
)
add_subdirectory
(
zmq
)
endif
(
${
COMPILE_SERVER
}
STREQUAL
"1"
)
ENDIF
(
DEFINED PackageOnly
)
...
...
castor/legacymsg/CMakeLists.txt
View file @
db8c2c7b
...
...
@@ -63,10 +63,6 @@ set (CASTOR_LEGACYMSG_LIB_SRC_FILES
TapeLabelRqstMsgBody.cpp
TapeStatDriveEntry.cpp
TapeMarshal.cpp
TapeserverProxy.cpp
TapeserverProxyFactory.cpp
TapeserverProxyTcpIp.cpp
TapeserverProxyTcpIpFactory.cpp
TapeStatRequestMsgBody.cpp
TapeStatReplyMsgBody.cpp
VdqmDrvRqstMsgBody.cpp
...
...
@@ -85,7 +81,6 @@ set (CASTOR_LEGACYMSG_LIB_SRC_FILES
VmgrTapeMountedMsgBody.cpp
)
add_library
(
castorlegacymsg SHARED
${
CASTOR_LEGACYMSG_LIB_SRC_FILES
}
)
CastorSetLibraryVersions
(
castorlegacymsg
)
target_link_libraries
(
castorlegacymsg castorclient castorcommon
castorMessages castorZMQWrapper
)
target_link_libraries
(
castorlegacymsg castorclient castorcommon
)
install
(
TARGETS castorlegacymsg LIBRARY DESTINATION
${
CASTOR_DEST_LIB_DIR
}
NAMELINK_SKIP
)
castor/messages/CMakeLists.txt
View file @
db8c2c7b
add_library
(
castorMessages SHARED
Header.pb.cc
Heartbeat.pb.cc
messages.cpp
NotifyDrive.pb.cc
TapeserverProxy.cpp
TapeserverProxyDummy.cpp
TapeserverProxyDummyFactory.cpp
TapeserverProxyFactory.cpp
TapeserverProxyZmq.cpp
TapeserverProxyZmqFactory.cpp
)
target_link_libraries
(
castorMessages protobuf
)
\ No newline at end of file
target_link_libraries
(
castorMessages protobuf
)
castor/
legacymsg
/TapeserverProxy.cpp
→
castor/
messages
/TapeserverProxy.cpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxy.cpp
* castor/
messages
/TapeserverProxy.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -22,10 +22,10 @@
* @author dkruse@cern.ch
*****************************************************************************/
#include
"castor/
legacymsg
/TapeserverProxy.hpp"
#include
"castor/
messages
/TapeserverProxy.hpp"
//-----------------------------------------------------------------------------
// destructor
//-----------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxy
::~
TapeserverProxy
()
{
castor
::
messages
::
TapeserverProxy
::~
TapeserverProxy
()
{
}
castor/
legacymsg
/TapeserverProxy.hpp
→
castor/
messages
/TapeserverProxy.hpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxy.hpp
* castor/
messages
/TapeserverProxy.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -23,12 +23,10 @@
#pragma once
#include
"castor/log/Logger.hpp"
#include
"castor/legacymsg/MessageHeader.hpp"
#include
"castor/legacymsg/TapeUpdateDriveRqstMsgBody.hpp"
#include
"castor/tape/tapeserver/client/ClientProxy.hpp"
namespace
castor
{
namespace
legacymsg
{
namespace
messages
{
/**
* Abstract class defining the interface to a proxy object representing the
...
...
@@ -130,6 +128,6 @@ public:
};
// class TapeserverProxy
}
// namespace
legacymsg
}
// namespace
messages
}
// namespace castor
castor/
legacymsg
/TapeserverProxyDummy.cpp
→
castor/
messages
/TapeserverProxyDummy.cpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxyDummy.cpp
* castor/
messages
/TapeserverProxyDummy.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -20,24 +20,24 @@
* @author dkruse@cern.ch
*****************************************************************************/
#include
"castor/
legacymsg
/TapeserverProxyDummy.hpp"
#include
"castor/
messages
/TapeserverProxyDummy.hpp"
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxyDummy
::
TapeserverProxyDummy
()
throw
()
{
castor
::
messages
::
TapeserverProxyDummy
::
TapeserverProxyDummy
()
throw
()
{
}
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxyDummy
::~
TapeserverProxyDummy
()
throw
()
{
castor
::
messages
::
TapeserverProxyDummy
::~
TapeserverProxyDummy
()
throw
()
{
}
//------------------------------------------------------------------------------
// gotReadMountDetailsFromClient
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxyDummy
::
gotReadMountDetailsFromClient
(
void
castor
::
messages
::
TapeserverProxyDummy
::
gotReadMountDetailsFromClient
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
}
...
...
@@ -46,7 +46,7 @@ void castor::legacymsg::TapeserverProxyDummy::gotReadMountDetailsFromClient(
// gotWriteMountDetailsFromClient
//------------------------------------------------------------------------------
uint64_t
castor
::
legacymsg
::
TapeserverProxyDummy
::
gotWriteMountDetailsFromClient
(
castor
::
messages
::
TapeserverProxyDummy
::
gotWriteMountDetailsFromClient
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
...
...
@@ -56,7 +56,7 @@ uint64_t
//------------------------------------------------------------------------------
// gotDumpMountDetailsFromClient
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxyDummy
::
gotDumpMountDetailsFromClient
(
void
castor
::
messages
::
TapeserverProxyDummy
::
gotDumpMountDetailsFromClient
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
}
...
...
@@ -64,7 +64,7 @@ void castor::legacymsg::TapeserverProxyDummy::gotDumpMountDetailsFromClient(
//------------------------------------------------------------------------------
// tapeMountedForRead
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxyDummy
::
tapeMountedForRead
(
void
castor
::
messages
::
TapeserverProxyDummy
::
tapeMountedForRead
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
}
...
...
@@ -72,7 +72,7 @@ void castor::legacymsg::TapeserverProxyDummy::tapeMountedForRead(
//------------------------------------------------------------------------------
// tapeMountedForWrite
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxyDummy
::
tapeMountedForWrite
(
void
castor
::
messages
::
TapeserverProxyDummy
::
tapeMountedForWrite
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
}
...
...
@@ -80,7 +80,7 @@ void castor::legacymsg::TapeserverProxyDummy::tapeMountedForWrite(
//------------------------------------------------------------------------------
// tapeUnmounting
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxyDummy
::
tapeUnmounting
(
void
castor
::
messages
::
TapeserverProxyDummy
::
tapeUnmounting
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
}
...
...
@@ -88,7 +88,7 @@ void castor::legacymsg::TapeserverProxyDummy::tapeUnmounting(
//------------------------------------------------------------------------------
// tapeUnmounted
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxyDummy
::
tapeUnmounted
(
void
castor
::
messages
::
TapeserverProxyDummy
::
tapeUnmounted
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
}
castor/
legacymsg
/TapeserverProxyDummy.hpp
→
castor/
messages
/TapeserverProxyDummy.hpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxyDummy.hpp
* castor/
messages
/TapeserverProxyDummy.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -22,10 +22,10 @@
#pragma once
#include
"castor/
legacymsg
/TapeserverProxy.hpp"
#include
"castor/
messages
/TapeserverProxy.hpp"
namespace
castor
{
namespace
legacymsg
{
namespace
messages
{
/**
* A dummy tapeserverd-proxy.
...
...
@@ -132,6 +132,6 @@ public:
};
// class TapeserverProxyDummy
}
// namespace
legacymsg
}
// namespace
messages
}
// namespace castor
castor/
legacymsg
/TapeserverProxyDummyFactory.cpp
→
castor/
messages
/TapeserverProxyDummyFactory.cpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxyDummyFactory.hpp
* castor/
messages
/TapeserverProxyDummyFactory.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -20,18 +20,18 @@
* @author dkruse@cern.ch
*****************************************************************************/
#include
"castor/
legacymsg
/TapeserverProxyDummy.hpp"
#include
"castor/
legacymsg
/TapeserverProxyDummyFactory.hpp"
#include
"castor/
messages
/TapeserverProxyDummy.hpp"
#include
"castor/
messages
/TapeserverProxyDummyFactory.hpp"
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxyDummyFactory
::~
TapeserverProxyDummyFactory
()
throw
()
{
castor
::
messages
::
TapeserverProxyDummyFactory
::~
TapeserverProxyDummyFactory
()
throw
()
{
}
//------------------------------------------------------------------------------
// create
//------------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxy
*
castor
::
legacymsg
::
TapeserverProxyDummyFactory
::
create
(
zmq
::
context_t
&
ctx
)
{
castor
::
messages
::
TapeserverProxy
*
castor
::
messages
::
TapeserverProxyDummyFactory
::
create
(
zmq
::
context_t
&
ctx
)
{
return
new
TapeserverProxyDummy
();
}
castor/
legacymsg
/TapeserverProxyDummyFactory.hpp
→
castor/
messages
/TapeserverProxyDummyFactory.hpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxyDummyFactory.hpp
* castor/
messages
/TapeserverProxyDummyFactory.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -22,10 +22,10 @@
#pragma once
#include
"castor/
legacymsg
/TapeserverProxyFactory.hpp"
#include
"castor/
messages
/TapeserverProxyFactory.hpp"
namespace
castor
{
namespace
legacymsg
{
namespace
messages
{
/**
* Concrete factory for creating objects of type TapeserverProxyDummy.
...
...
@@ -51,6 +51,6 @@ public:
};
// class TapeserverProxyDummyFactory
}
// namespace
legacymsg
}
// namespace
messages
}
// namespace castor
castor/
legacymsg
/TapeserverProxyFactory.cpp
→
castor/
messages
/TapeserverProxyFactory.cpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxyFactory.cpp
* castor/
messages
/TapeserverProxyFactory.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -20,10 +20,10 @@
* @author dkruse@cern.ch
*****************************************************************************/
#include
"castor/
legacymsg
/TapeserverProxyFactory.hpp"
#include
"castor/
messages
/TapeserverProxyFactory.hpp"
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxyFactory
::~
TapeserverProxyFactory
()
throw
()
{
castor
::
messages
::
TapeserverProxyFactory
::~
TapeserverProxyFactory
()
throw
()
{
}
castor/
legacymsg
/TapeserverProxyFactory.hpp
→
castor/
messages
/TapeserverProxyFactory.hpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxyFactory.hpp
* castor/
messages
/TapeserverProxyFactory.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -22,10 +22,10 @@
#pragma once
#include
"castor/
legacymsg
/TapeserverProxy.hpp"
#include
"castor/
messages
/TapeserverProxy.hpp"
#include
"zmq/castorZmqWrapper.hpp"
namespace
castor
{
namespace
legacymsg
{
namespace
messages
{
/**
* Abstract factory for creating objects of type TapeserverProxy.
...
...
@@ -51,6 +51,6 @@ public:
};
// class TapeserverProxyFactory
}
// namespace
legacymsg
}
// namespace
messages
}
// namespace castor
castor/
legacymsg
/TapeserverProxy
TcpIp
.cpp
→
castor/
messages
/TapeserverProxy
Zmq
.cpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxy
TcpIp
.cpp
* castor/
messages
/TapeserverProxy
Zmq
.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -21,12 +21,11 @@
*****************************************************************************/
#include
"castor/io/io.hpp"
#include
"castor/legacymsg/CommonMarshal.hpp"
#include
"castor/legacymsg/GenericReplyMsgBody.hpp"
#include
"castor/legacymsg/GenericMarshal.hpp"
#include
"castor/legacymsg/TapeMarshal.hpp"
#include
"castor/legacymsg/TapeserverProxyTcpIp.hpp"
#include
"castor/legacymsg/legacymsg.hpp"
#include
"castor/messages/Header.pb.h"
#include
"castor/messages/Constants.hpp"
#include
"castor/messages/TapeserverProxyZmq.hpp"
#include
"castor/messages/messages.hpp"
#include
"castor/messages/NotifyDrive.pb.h"
#include
"castor/tape/tapegateway/ClientType.hpp"
#include
"castor/tape/tapegateway/VolumeMode.hpp"
#include
"castor/utils/SmartFd.hpp"
...
...
@@ -34,10 +33,6 @@
#include
"h/rtcp_constants.h"
#include
"h/vdqm_constants.h"
#include
"h/Ctape.h"
#include
"castor/messages/Header.pb.h"
#include
"castor/messages/NotifyDrive.pb.h"
#include
"castor/messages/Constants.hpp"
#include
"zmq/castorZmqUtils.hpp"
namespace
{
castor
::
messages
::
NotifyDriveBeforeMountStarted_TapeClientType
...
...
@@ -72,22 +67,22 @@ namespace {
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
TapeserverProxy
TcpIp
(
log
::
Logger
&
log
,
castor
::
messages
::
TapeserverProxy
Zmq
::
TapeserverProxy
Zmq
(
log
::
Logger
&
log
,
const
unsigned
short
tapeserverPort
,
const
int
netTimeout
,
zmq
::
context_t
&
ctx
)
throw
()
:
m_log
(
log
),
m_tapeserverHostName
(
"localhost"
),
m_tapeserverPort
(
tapeserverPort
),
m_netTimeout
(
netTimeout
),
m_socket
(
ctx
,
ZMQ_REQ
)
{
castor
::
util
s
::
connectToLocalhost
(
m_socket
);
castor
::
message
s
::
connectToLocalhost
(
m_socket
);
}
//------------------------------------------------------------------------------
// gotReadMountDetailsFromClient
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
gotReadMountDetailsFromClient
(
void
castor
::
messages
::
TapeserverProxy
Zmq
::
gotReadMountDetailsFromClient
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveBeforeMountStarted
);
...
...
@@ -98,8 +93,8 @@ castor::tape::tapeserver::client::ClientProxy::VolumeInfo volInfo,
body
.
set_unitname
(
unitName
);
body
.
set_vid
(
volInfo
.
vid
);
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
}
...
...
@@ -108,10 +103,10 @@ castor::tape::tapeserver::client::ClientProxy::VolumeInfo volInfo,
// gotWriteMountDetailsFromClient
//------------------------------------------------------------------------------
uint64_t
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
gotWriteMountDetailsFromClient
(
castor
::
messages
::
TapeserverProxy
Zmq
::
gotWriteMountDetailsFromClient
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveBeforeMountStarted
);
...
...
@@ -122,8 +117,8 @@ uint64_t
body
.
set_unitname
(
unitName
);
body
.
set_vid
(
volInfo
.
vid
);
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
return
0
;
// TO BE DONE
}
...
...
@@ -131,10 +126,10 @@ uint64_t
//------------------------------------------------------------------------------
// gotDumpMountDetailsFromClient
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
gotDumpMountDetailsFromClient
(
void
castor
::
messages
::
TapeserverProxy
Zmq
::
gotDumpMountDetailsFromClient
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveBeforeMountStarted
);
...
...
@@ -145,8 +140,8 @@ void castor::legacymsg::TapeserverProxyTcpIp::gotDumpMountDetailsFromClient(
body
.
set_unitname
(
unitName
);
body
.
set_vid
(
volInfo
.
vid
);
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
}
...
...
@@ -154,10 +149,10 @@ void castor::legacymsg::TapeserverProxyTcpIp::gotDumpMountDetailsFromClient(
//------------------------------------------------------------------------------
// tapeMountedForRead
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
tapeMountedForRead
(
void
castor
::
messages
::
TapeserverProxy
Zmq
::
tapeMountedForRead
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveTapeMounted
);
...
...
@@ -167,8 +162,8 @@ void castor::legacymsg::TapeserverProxyTcpIp::tapeMountedForRead(
body
.
set_unitname
(
unitName
);
body
.
set_vid
(
volInfo
.
vid
);
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
}
...
...
@@ -176,10 +171,10 @@ void castor::legacymsg::TapeserverProxyTcpIp::tapeMountedForRead(
//------------------------------------------------------------------------------
// tapeMountedForWrite
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
tapeMountedForWrite
(
void
castor
::
messages
::
TapeserverProxy
Zmq
::
tapeMountedForWrite
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveTapeMounted
);
...
...
@@ -189,8 +184,8 @@ void castor::legacymsg::TapeserverProxyTcpIp::tapeMountedForWrite(
body
.
set_unitname
(
unitName
);
body
.
set_vid
(
volInfo
.
vid
);
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
}
...
...
@@ -198,18 +193,18 @@ void castor::legacymsg::TapeserverProxyTcpIp::tapeMountedForWrite(
//------------------------------------------------------------------------------
// tapeUnmounting
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
tapeUnmounting
(
void
castor
::
messages
::
TapeserverProxy
Zmq
::
tapeUnmounting
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveUnmountStarted
);
castor
::
messages
::
NotifyDriveUnmountStarted
body
;
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
}
...
...
@@ -217,18 +212,18 @@ void castor::legacymsg::TapeserverProxyTcpIp::tapeUnmounting(
//------------------------------------------------------------------------------
// tapeUnmounted
//------------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
tapeUnmounted
(
void
castor
::
messages
::
TapeserverProxy
Zmq
::
tapeUnmounted
(
castor
::
tape
::
tapeserver
::
client
::
ClientProxy
::
VolumeInfo
volInfo
,
const
std
::
string
&
unitName
)
{
castor
::
messages
::
Header
header
=
castor
::
util
s
::
preFilleHeader
();
castor
::
messages
::
Header
header
=
castor
::
message
s
::
preFilleHeader
();
header
.
set_bodyhashvalue
(
"PIPO"
);
header
.
set_bodysignature
(
"PIPO"
);
header
.
set_reqtype
(
castor
::
messages
::
reqType
::
NotifyDriveTapeUnmounted
);
castor
::
messages
::
NotifyDriveTapeUnmounted
body
;
castor
::
util
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
util
s
::
sendMessage
(
m_socket
,
body
);
castor
::
message
s
::
sendMessage
(
m_socket
,
header
,
ZMQ_SNDMORE
);
castor
::
message
s
::
sendMessage
(
m_socket
,
body
);
readReplyMsg
();
}
...
...
@@ -236,6 +231,6 @@ void castor::legacymsg::TapeserverProxyTcpIp::tapeUnmounted(
//-----------------------------------------------------------------------------
// readReplyMsg
//-----------------------------------------------------------------------------
void
castor
::
legacymsg
::
TapeserverProxy
TcpIp
::
readReplyMsg
()
{
void
castor
::
messages
::
TapeserverProxy
Zmq
::
readReplyMsg
()
{
}
castor/
legacymsg
/TapeserverProxy
TcpIp
.hpp
→
castor/
messages
/TapeserverProxy
Zmq
.hpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxy
TcpIp
.hpp
* castor/
messages
/TapeserverProxy
Zmq
.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -23,19 +23,17 @@
#pragma once
#include
"castor/log/Logger.hpp"
#include
"castor/legacymsg/MessageHeader.hpp"
#include
"castor/legacymsg/TapeUpdateDriveRqstMsgBody.hpp"
#include
"castor/legacymsg/TapeserverProxy.hpp"
#include
"castor/messages/TapeserverProxy.hpp"
#include
"castor/tape/tapeserver/client/ClientProxy.hpp"
#include
"zmq/castorZmqWrapper.hpp"
namespace
castor
{
namespace
legacymsg
{
namespace
messages
{
/**
* A concrete implementation of the interface to the internal network
* communications of the tapeserverd daemon.
*/
class
TapeserverProxy
TcpIp
:
public
TapeserverProxy
{
class
TapeserverProxy
Zmq
:
public
TapeserverProxy
{
public:
/**
...
...
@@ -48,7 +46,7 @@ public:
* @param netTimeout The timeout in seconds to be applied when performing
* network read and write operations.
*/
TapeserverProxy
TcpIp
(
log
::
Logger
&
log
,
const
unsigned
short
tapeserverPort
,
TapeserverProxy
Zmq
(
log
::
Logger
&
log
,
const
unsigned
short
tapeserverPort
,
const
int
netTimeout
,
zmq
::
context_t
&
ctx
)
throw
();
/**
...
...
@@ -137,15 +135,6 @@ public:
private:
/**
* Writes the specified message to the specified connection.
*
* @param body The body of the message.
*/
void
writeTapeUpdateDriveRqstMsg
(
const
int
fd
,
const
legacymsg
::
TapeUpdateDriveRqstMsgBody
&
body
);
/**
* Reads a reply message from the specified connection.
*
...
...
@@ -176,8 +165,8 @@ private:
zmq
::
socket_t
m_socket
;
};
// class TapeserverProxy
TcpIp
};
// class TapeserverProxy
Zmq
}
// namespace
legacymsg
}
// namespace
messages
}
// namespace castor
castor/
legacymsg
/TapeserverProxy
TcpIp
Factory.cpp
→
castor/
messages
/TapeserverProxy
Zmq
Factory.cpp
View file @
db8c2c7b
/******************************************************************************
* castor/
legacymsg
/TapeserverProxy
TcpIp
Factory.cpp
* castor/
messages
/TapeserverProxy
Zmq
Factory.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
...
...
@@ -20,13 +20,13 @@
* @author dkruse@cern.ch
*****************************************************************************/
#include
"castor/
legacymsg
/TapeserverProxy
TcpIp
.hpp"
#include
"castor/
legacymsg
/TapeserverProxy
TcpIp
Factory.hpp"
#include
"castor/
messages
/TapeserverProxy
Zmq
.hpp"
#include
"castor/
messages
/TapeserverProxy
Zmq
Factory.hpp"