Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FairMQChannel: replace ResetChannel() with Invalidate()

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-09-22 10:47:01 +02:00 committed by Dennis Klein
parent cfa18ccfce
commit cf004f69b2
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fairmq/FairMQChannel.cxx
View File

@ -81,7 +81,7 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, const strin
, fPortRangeMin(DefaultPortRangeMin) , fPortRangeMin(DefaultPortRangeMin)
, fPortRangeMax(DefaultPortRangeMax) , fPortRangeMax(DefaultPortRangeMax)
, fAutoBind(DefaultAutoBind) , fAutoBind(DefaultAutoBind)
, fIsValid(false) , fValid(false)
, fMultipart(false) , fMultipart(false)
{} {}
@ -126,7 +126,7 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan, const string& newName)
, fPortRangeMin(chan.fPortRangeMin) , fPortRangeMin(chan.fPortRangeMin)
, fPortRangeMax(chan.fPortRangeMax) , fPortRangeMax(chan.fPortRangeMax)
, fAutoBind(chan.fAutoBind) , fAutoBind(chan.fAutoBind)
, fIsValid(false) , fValid(false)
, fMultipart(chan.fMultipart) , fMultipart(chan.fMultipart)
{} {}
@ -152,7 +152,7 @@ FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
fPortRangeMin = chan.fPortRangeMin; fPortRangeMin = chan.fPortRangeMin;
fPortRangeMax = chan.fPortRangeMax; fPortRangeMax = chan.fPortRangeMax;
fAutoBind = chan.fAutoBind; fAutoBind = chan.fAutoBind;
fIsValid = false; fValid = false;
fMultipart = chan.fMultipart; fMultipart = chan.fMultipart;
return *this; return *this;
@ -348,7 +348,7 @@ try {
stringstream ss; stringstream ss;
ss << "Validating channel '" << fName << "'... "; ss << "Validating channel '" << fName << "'... ";
if (fIsValid) { if (fValid) {
ss << "ALREADY VALID"; ss << "ALREADY VALID";
LOG(debug) << ss.str(); LOG(debug) << ss.str();
return true; return true;
@ -483,7 +483,7 @@ try {
throw ChannelConfigurationError(tools::ToString("invalid socket rate logging interval (cannot be negative): '", fRateLogging, "'")); throw ChannelConfigurationError(tools::ToString("invalid socket rate logging interval (cannot be negative): '", fRateLogging, "'"));
} }
fIsValid = true; fValid = true;
ss << "VALID"; ss << "VALID";
LOG(debug) << ss.str(); LOG(debug) << ss.str();
return true; return true;
@ -559,9 +559,3 @@ bool FairMQChannel::BindEndpoint(string& endpoint)
} }
} }
void FairMQChannel::ResetChannel()
{
fIsValid = false;
// TODO: implement channel resetting
}

8
fairmq/FairMQChannel.h
View File

@ -230,7 +230,7 @@ class FairMQChannel
/// Checks if the configured channel settings are valid (checks the validity parameter, without running full validation (as oposed to ValidateChannel())) /// Checks if the configured channel settings are valid (checks the validity parameter, without running full validation (as oposed to ValidateChannel()))
/// @return true if channel settings are valid, false otherwise. /// @return true if channel settings are valid, false otherwise.
bool IsValid() const; bool IsValid() const { return fValid; }
/// Validates channel configuration /// Validates channel configuration
/// @return true if channel settings are valid, false otherwise. /// @return true if channel settings are valid, false otherwise.
@ -242,8 +242,8 @@ class FairMQChannel
bool BindEndpoint(std::string& endpoint); bool BindEndpoint(std::string& endpoint);
/// Resets the channel (requires validation to be used again). /// invalidates the channel (requires validation to be used again).
void ResetChannel(); void Invalidate() { fValid = false; }
/// Sends a message to the socket queue. /// Sends a message to the socket queue.
/// @param msg Constant reference of unique_ptr to a FairMQMessage /// @param msg Constant reference of unique_ptr to a FairMQMessage
@ -369,7 +369,7 @@ class FairMQChannel
int fPortRangeMax; int fPortRangeMax;
bool fAutoBind; bool fAutoBind;
bool fIsValid; bool fValid;
bool fMultipart; bool fMultipart;