sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-23 19:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

WriterManager const correctness

Browse Source
This commit is contained in:
babic_a
2018-01-31 14:28:20 +01:00
parent 8642d5b695
commit 787dddc7e9
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WriterManager.cpp
+11 -8
View File
@@ -37,7 +37,7 @@ string WriterManager::get_status()
{
if (running_flag) {
return "receiving";
} else if (n_received_frames > n_written_frames) {
} else if (n_received_frames.load() > n_written_frames) {
return "writing";
} else if (!are_all_parameters_set()) {
return "waiting for parameters";
@@ -55,11 +55,14 @@ map<string, uint64_t> WriterManager::get_statistics()
return result;
}
map<string, boost::any> WriterManager::get_parameters(){
map<string, boost::any> WriterManager::get_parameters()
{
lock_guard<mutex> lock(parameters_mutex);
return parameters;
}
void WriterManager::set_parameters(map<string, boost::any>& new_parameters)
void WriterManager::set_parameters(const map<string, boost::any>& new_parameters)
{
lock_guard<mutex> lock(parameters_mutex);
@@ -68,9 +71,9 @@ void WriterManager::set_parameters(map<string, boost::any>& new_parameters)
output_message << "[WriterManager::set_parameters] Setting parameters: ";
#endif
for (auto parameter : new_parameters) {
string parameter_name = parameter.first;
auto parameter_value = parameter.second;
for (const auto& parameter : new_parameters) {
auto& parameter_name = parameter.first;
auto& parameter_value = parameter.second;
parameters[parameter_name] = parameter_value;
@@ -116,8 +119,8 @@ void WriterManager::written_frame(size_t frame_index)
bool WriterManager::are_all_parameters_set() {
lock_guard<mutex> lock(parameters_mutex);
for (auto parameter : *parameters_type) {
auto parameter_name = parameter.first;
for (const auto& parameter : *parameters_type) {
const auto& parameter_name = parameter.first;
if (parameters.count(parameter_name) == 0) {
#ifdef DEBUG_OUTPUT
src/WriterManager.hpp
+1 -1
View File
@@ -34,7 +34,7 @@ class WriterManager
const std::map<std::string, DATA_TYPE>* get_parameters_type();
std::map<std::string, boost::any> get_parameters();
void set_parameters(std::map<std::string, boost::any>& new_parameters);
void set_parameters(const std::map<std::string, boost::any>& new_parameters);
std::map<std::string, uint64_t> get_statistics();
void received_frame(size_t frame_index);