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

Apply clang-tidy suggestions [performance-faster-string-find]

Browse Source
This commit is contained in:
Alexey Rybalchenko 2018-10-25 13:40:02 +02:00 committed by Dennis Klein
parent 4951433330
commit c40bd7d6a9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fairmq/FairMQChannel.cxx
View File

@ -143,15 +143,15 @@ string FairMQChannel::GetChannelName() const
string FairMQChannel::GetChannelPrefix() const string FairMQChannel::GetChannelPrefix() const
{ {
string prefix = fName; string prefix = fName;
prefix = prefix.erase(fName.rfind("[")); prefix = prefix.erase(fName.rfind('['));
return prefix; return prefix;
} }
string FairMQChannel::GetChannelIndex() const string FairMQChannel::GetChannelIndex() const
{ {
string indexStr = fName; string indexStr = fName;
indexStr.erase(indexStr.rfind("]")); indexStr.erase(indexStr.rfind(']'));
indexStr.erase(0, indexStr.rfind("[") + 1); indexStr.erase(0, indexStr.rfind('[') + 1);
return indexStr; return indexStr;
} }
@ -564,7 +564,7 @@ bool FairMQChannel::ValidateChannel()
{ {
// check if TCP address contains port delimiter // check if TCP address contains port delimiter
string addressString = address.substr(6); string addressString = address.substr(6);
if (addressString.find(":") == string::npos) if (addressString.find(':') == string::npos)
{ {
ss << "INVALID"; ss << "INVALID";
LOG(debug) << ss.str(); LOG(debug) << ss.str();

10
fairmq/FairMQDevice.cxx
View File

@ -171,7 +171,7 @@ void FairMQDevice::InitWrapper()
// If necessary this could be handled in the same way as the connecting channels // If necessary this could be handled in the same way as the connecting channels
AttachChannels(uninitializedBindingChannels); AttachChannels(uninitializedBindingChannels);
if (uninitializedBindingChannels.size() > 0) if (!uninitializedBindingChannels.empty())
{ {
LOG(error) << uninitializedBindingChannels.size() << " of the binding channels could not initialize. Initial configuration incomplete."; LOG(error) << uninitializedBindingChannels.size() << " of the binding channels could not initialize. Initial configuration incomplete.";
ChangeState(ERROR_FOUND); ChangeState(ERROR_FOUND);
@ -200,7 +200,7 @@ void FairMQDevice::InitWrapper()
{ {
this_thread::sleep_for(chrono::milliseconds(sleepTimeInMS)); this_thread::sleep_for(chrono::milliseconds(sleepTimeInMS));
if (fConfig) if (fConfig != nullptr)
{ {
for (auto& chan : uninitializedConnectingChannels) for (auto& chan : uninitializedConnectingChannels)
{ {
@ -334,7 +334,7 @@ bool FairMQDevice::AttachChannel(FairMQChannel& ch)
if (address.compare(0, 6, "tcp://") == 0) if (address.compare(0, 6, "tcp://") == 0)
{ {
string addressString = address.substr(6); string addressString = address.substr(6);
auto pos = addressString.find(":"); auto pos = addressString.find(':');
string hostPart = addressString.substr(0, pos); string hostPart = addressString.substr(0, pos);
if (!(bind && hostPart == "*")) if (!(bind && hostPart == "*"))
{ {
@ -421,7 +421,7 @@ bool FairMQDevice::BindEndpoint(FairMQSocket& socket, string& endpoint)
return false; return false;
} }
size_t pos = endpoint.rfind(":"); size_t pos = endpoint.rfind(':');
endpoint = endpoint.substr(0, pos + 1) + fair::mq::tools::ToString(static_cast<int>(randomPort(generator))); endpoint = endpoint.substr(0, pos + 1) + fair::mq::tools::ToString(static_cast<int>(randomPort(generator)));
} }
@ -664,7 +664,7 @@ void FairMQDevice::HandleMultipleTransportInput()
for (const auto& i : fMultitransportInputs) for (const auto& i : fMultitransportInputs)
{ {
threads.push_back(thread(&FairMQDevice::PollForTransport, this, fTransports.at(i.first).get(), i.second)); threads.emplace_back(thread(&FairMQDevice::PollForTransport, this, fTransports.at(i.first).get(), i.second));
} }
for (thread& t : threads) for (thread& t : threads)