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

Jump to bottom

Reduce boost dependency in FWCore/MessageService #30565

Merged
merged 1 commit into from
Jul 7, 2020
Merged

Reduce boost dependency in FWCore/MessageService #30565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion FWCore/MessageService/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Utilities"/>
<use name="boost"/>
<use name="tbb"/>
<export>
<lib name="1"/>
Expand Down
5 changes: 2 additions & 3 deletions FWCore/MessageService/interface/MessageServicePresence.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
#include "FWCore/Utilities/interface/Presence.h"
#include "FWCore/Utilities/interface/get_underlying_safe.h"

#include "boost/thread/thread.hpp"

#include <memory>
#include <thread>

namespace edm {
namespace service {
Expand All @@ -29,7 +28,7 @@ namespace edm {

// --- data:
edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;
boost::thread m_scribeThread;
std::thread m_scribeThread;
Copy link
Contributor

Choose a reason for hiding this comment

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

@Dr15Jones This change is fine, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not certain we actually use this code.

Copy link
Contributor

Choose a reason for hiding this comment

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

Do you mean the entire Presence system (a quick look supports such claim)?

It is probably easiest to let this change go in, and think of cleaning up what we don't use in the mean time (i.e. opening an issue)


}; // MessageServicePresence

Expand Down
2 changes: 1 addition & 1 deletion FWCore/MessageService/src/MessageServicePresence.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace edm {
// start a new thread, run rMLS(m_queue)
// ChangeLog 2
))
// Note that m_scribeThread, which is a boost::thread, has a single-argument ctor -
// Note that m_scribeThread, which is a std::thread, has a single-argument ctor -
// just the function to be run. But we need to do something first, namely,
// ensure that the MessageLoggerQ is in a valid state - and that requires
// a statement. So we bundle that statement in parenthesis, separated by
Expand Down