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

Make CollectionIDTable use a std::mutex #125

Merged
merged 1 commit into from
Sep 4, 2020
Merged

Make CollectionIDTable use a std::mutex #125

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
2 changes: 1 addition & 1 deletion include/podio/CollectionIDTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace podio {
private:
std::vector<int> m_collectionIDs;
std::vector<std::string> m_names;
mutable std::recursive_mutex m_mutex;
mutable std::mutex m_mutex;
};


Expand Down
24 changes: 12 additions & 12 deletions src/CollectionIDTable.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
namespace podio {

const std::string CollectionIDTable::name(int ID) const {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
auto result = std::find(begin(m_collectionIDs), end(m_collectionIDs), ID);
auto index = result - m_collectionIDs.begin();
std::lock_guard<std::mutex> lock(m_mutex);
const auto result = std::find(begin(m_collectionIDs), end(m_collectionIDs), ID);
const auto index = std::distance(m_collectionIDs.begin(), result);
return m_names[index];
}

int CollectionIDTable::collectionID(const std::string& name) const {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
auto result = std::find(begin(m_names), end(m_names), name);
auto index = result - m_names.begin();
std::lock_guard<std::mutex> lock(m_mutex);
const auto result = std::find(begin(m_names), end(m_names), name);
const auto index = std::distance(m_names.begin(), result);
return m_collectionIDs[index];
}


void CollectionIDTable::print() const {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
std::lock_guard<std::mutex> lock(m_mutex);
std::cout<<"CollectionIDTable"<<std::endl;
for(unsigned i=0; i<m_names.size(); ++i ) {
std::cout<<"\t"
Expand All @@ -30,21 +30,21 @@ namespace podio {
}

bool CollectionIDTable::present(const std::string& name) const {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
auto result = std::find(begin(m_names), end(m_names), name);
std::lock_guard<std::mutex> lock(m_mutex);
const auto result = std::find(begin(m_names), end(m_names), name);
return result != end(m_names);
}

int CollectionIDTable::add(const std::string& name) {
std::lock_guard<std::recursive_mutex> lock(m_mutex);
auto result = std::find(begin(m_names), end(m_names), name);
std::lock_guard<std::mutex> lock(m_mutex);
const auto result = std::find(begin(m_names), end(m_names), name);
int ID = 0;
if (result == m_names.end()) {
m_names.emplace_back(name);
ID = m_names.size();
m_collectionIDs.emplace_back( ID );
} else {
auto index = result - m_names.begin();
const auto index = std::distance(m_names.begin(), result);
ID = m_collectionIDs[index];
}
return ID;
Expand Down