Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove boost lexical_cast dependency in EventFilter #35168

Merged
merged 2 commits into from
Sep 13, 2021
Merged

Remove boost lexical_cast dependency in EventFilter #35168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a451f8
Remove boost lexical_cast dependency
Purva-Chaudhari Sep 6, 2021
97ce6ad
added appropriate std catch
Purva-Chaudhari Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions EventFilter/L1TRawToDigi/src/MP7FileReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <boost/algorithm/string.hpp>
#include <boost/regex.hpp>
#include <boost/lexical_cast.hpp>

#include <iostream>
#include <string>
Expand Down Expand Up @@ -165,9 +164,9 @@ std::vector<uint32_t> MP7FileReader::searchLinks() {
boost::split(tokens, tmp, boost::is_any_of(" \t"), boost::token_compress_on);
// Convert it into uint32 s
std::vector<uint32_t> links;
std::transform(
tokens.begin(), tokens.end(), std::back_inserter(links), boost::lexical_cast<uint32_t, const std::string&>);
return links;
std::transform(tokens.begin(), tokens.end(), std::back_inserter(links), [](const std::string& str) {
return std::stoul(str);
});
} else {
throw std::logic_error("Unexpected line found!");
}
Expand Down Expand Up @@ -201,7 +200,7 @@ std::vector<std::vector<uint64_t> > MP7FileReader::readRows() {

if (boost::regex_match(line, what, reFrame_)) {
// check frame number
uint32_t n = boost::lexical_cast<uint32_t>(what[1].str());
uint32_t n = std::stoul(what[1].str());

if (n != data.size()) {
std::stringstream ss;
Expand Down
37 changes: 21 additions & 16 deletions EventFilter/Utilities/src/EvFDaqDirector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <sys/time.h>
#include <unistd.h>
#include <cstdio>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>

//using boost::asio::ip::tcp;
Expand Down Expand Up @@ -84,10 +83,10 @@ namespace evf {
char* fuLockPollIntervalPtr = std::getenv("FFF_LOCKPOLLINTERVAL");
if (fuLockPollIntervalPtr) {
try {
fuLockPollInterval_ = boost::lexical_cast<unsigned int>(std::string(fuLockPollIntervalPtr));
fuLockPollInterval_ = std::stoul(std::string(fuLockPollIntervalPtr));
edm::LogInfo("EvFDaqDirector") << "Setting fu lock poll interval by environment string: " << fuLockPollInterval_
<< " us";
} catch (boost::bad_lexical_cast const&) {
} catch (const std::exception&) {
edm::LogWarning("EvFDaqDirector") << "Bad lexical cast in parsing: " << std::string(fuLockPollIntervalPtr);
}
}
Expand All @@ -96,9 +95,9 @@ namespace evf {
char* fileBrokerParamPtr = std::getenv("FFF_USEFILEBROKER");
if (fileBrokerParamPtr) {
try {
useFileBroker_ = (boost::lexical_cast<unsigned int>(std::string(fileBrokerParamPtr))) > 0;
useFileBroker_ = (std::stoul(std::string(fileBrokerParamPtr))) > 0;
edm::LogInfo("EvFDaqDirector") << "Setting useFileBroker parameter by environment string: " << useFileBroker_;
} catch (boost::bad_lexical_cast const&) {
} catch (const std::exception&) {
edm::LogWarning("EvFDaqDirector") << "Bad lexical cast in parsing: " << std::string(fileBrokerParamPtr);
}
}
Expand Down Expand Up @@ -126,9 +125,9 @@ namespace evf {
char* startFromLSPtr = std::getenv("FFF_START_LUMISECTION");
if (startFromLSPtr) {
try {
startFromLS_ = boost::lexical_cast<unsigned int>(std::string(startFromLSPtr));
startFromLS_ = std::stoul(std::string(startFromLSPtr));
edm::LogInfo("EvFDaqDirector") << "Setting start from LS by environment string: " << startFromLS_;
} catch (boost::bad_lexical_cast const&) {
} catch (const std::exception&) {
edm::LogWarning("EvFDaqDirector") << "Bad lexical cast in parsing: " << std::string(startFromLSPtr);
}
}
Expand All @@ -137,10 +136,10 @@ namespace evf {
char* fileBrokerUseLockParamPtr = std::getenv("FFF_FILEBROKERUSELOCALLOCK");
if (fileBrokerUseLockParamPtr) {
try {
fileBrokerUseLocalLock_ = (boost::lexical_cast<unsigned int>(std::string(fileBrokerUseLockParamPtr))) > 0;
fileBrokerUseLocalLock_ = (std::stoul(std::string(fileBrokerUseLockParamPtr))) > 0;
edm::LogInfo("EvFDaqDirector") << "Setting fileBrokerUseLocalLock parameter by environment string: "
<< fileBrokerUseLocalLock_;
} catch (boost::bad_lexical_cast const&) {
} catch (const std::exception&) {
edm::LogWarning("EvFDaqDirector") << "Bad lexical cast in parsing: " << std::string(fileBrokerUseLockParamPtr);
}
}
Expand Down Expand Up @@ -773,7 +772,7 @@ namespace evf {
edm::LogError("EvFDaqDirector") << " error reading number of files from BU JSON -: " << BUEoLSFile;
return -1;
}
return boost::lexical_cast<int>(data);
return std::stoi(data);
}

bool EvFDaqDirector::bumpFile(unsigned int& ls,
Expand Down Expand Up @@ -1326,8 +1325,8 @@ namespace evf {
if (i < dp.getData().size()) {
std::string dataSize = dp.getData()[i];
try {
fileSizeFromJson = boost::lexical_cast<long>(dataSize);
} catch (boost::bad_lexical_cast const&) {
fileSizeFromJson = std::stol(dataSize);
} catch (const std::exception&) {
//non-fatal currently, processing can continue without this value
edm::LogWarning("EvFDaqDirector") << "grabNextJsonFile - error parsing number of Bytes from BU JSON. "
<< "Input value is -: " << dataSize;
Expand All @@ -1336,10 +1335,13 @@ namespace evf {
}
}
}
return boost::lexical_cast<int>(data);
} catch (boost::bad_lexical_cast const& e) {
return std::stoi(data);
} catch (const std::out_of_range& e) {
edm::LogError("EvFDaqDirector") << "grabNextJsonFile - error parsing number of events from BU JSON. "
<< "Input value is -: " << data;
} catch (const std::invalid_argument& e) {
edm::LogError("EvFDaqDirector") << "grabNextJsonFile - argument error parsing events from BU JSON. "
<< "Input value is -: " << data;
} catch (std::runtime_error const& e) {
//Can be thrown by Json parser
edm::LogError("EvFDaqDirector") << "grabNextJsonFile - std::runtime_error exception -: " << e.what();
Expand Down Expand Up @@ -1423,7 +1425,7 @@ namespace evf {
throw cms::Exception("EvFDaqDirector::grabNextJsonFileUnlock")
<< " error reading number of events from BU JSON -: No input value " << data;
}
return boost::lexical_cast<int>(data);
return std::stoi(data);
} catch (std::filesystem::filesystem_error const& ex) {
// Input dir gone?
unlockFULocal();
Expand All @@ -1432,9 +1434,12 @@ namespace evf {
// Another process grabbed the file and NFS did not register this
unlockFULocal();
edm::LogError("EvFDaqDirector") << "grabNextFile runtime Exception -: " << e.what();
} catch (boost::bad_lexical_cast const&) {
} catch (const std::out_of_range&) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::invalid_argument should also be also caught in addition to std::out_of_range to keep the same behavior.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, adding it

edm::LogError("EvFDaqDirector") << "grabNextFile error parsing number of events from BU JSON. "
<< "Input value is -: " << data;
} catch (const std::invalid_argument&) {
edm::LogError("EvFDaqDirector") << "grabNextFile argument error parsing events from BU JSON. "
<< "Input value is -: " << data;
} catch (std::exception const& e) {
// BU run directory disappeared?
unlockFULocal();
Expand Down
8 changes: 3 additions & 5 deletions EventFilter/Utilities/src/FedRawDataInputSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
//JSON file reader
#include "EventFilter/Utilities/interface/reader.h"

#include <boost/lexical_cast.hpp>

using namespace evf::FastMonState;

FedRawDataInputSource::FedRawDataInputSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc)
Expand Down Expand Up @@ -1556,10 +1554,10 @@ long FedRawDataInputSource::initFileList() {
std::string runStr = fileStem.substr(3, end - 3);
try {
//get long to support test run numbers < 2^32
long rval = boost::lexical_cast<long>(runStr);
long rval = std::stol(runStr);
edm::LogInfo("FedRawDataInputSource") << "Autodetected run number in fileListMode -: " << rval;
return rval;
} catch (boost::bad_lexical_cast const&) {
} catch (const std::exception&) {
edm::LogWarning("FedRawDataInputSource")
<< "Unable to autodetect run number in fileListMode from file -: " << fileName;
}
Expand All @@ -1586,7 +1584,7 @@ evf::EvFDaqDirector::FileStatus FedRawDataInputSource::getFile(unsigned int& ls,
fileStem = fileStem.substr(0, fileStem.find('_'));

if (!fileListLoopMode_)
ls = boost::lexical_cast<unsigned int>(fileStem);
ls = std::stoul(fileStem);
else //always starting from LS 1 in loop mode
ls = 1 + loopModeIterationInc_;

Expand Down