Skip to content
Snippets Groups Projects
Commit 4bfdbfbc authored by Giovanna Lazzari Miotto's avatar Giovanna Lazzari Miotto :mushroom:
Browse files

tidy: Address code quality warnings

parent 48a0c10b
No related branches found
No related tags found
1 merge request!109Introduce pipeline synchronization, output template and parallel sink
......@@ -45,7 +45,7 @@ struct LumisectionMetadata {
uint32_t num_files{};
uint32_t max_index;
LumisectionMetadata(uint32_t max_index_per_ls) : max_index(max_index_per_ls) {}
explicit LumisectionMetadata(uint32_t max_index_per_ls) : max_index(max_index_per_ls) {}
bool IsLastIndex(int index) const;
void Reset() { file_size = num_orbits = num_files = 0; }
......@@ -98,7 +98,7 @@ class OutputFile {
fseek(file_ptr_, md_.size, SEEK_SET);
}
int Write(char* buffer, size_t size_bytes, uint32_t size_orbits) {
int Write(const char*& buffer, size_t size_bytes, uint32_t size_orbits) {
auto ret = fwrite(buffer, 1, size_bytes, file_ptr_);
assert(ret == size_bytes);
md_.AddOrbits(size_orbits, size_bytes);
......@@ -142,7 +142,7 @@ class OutputFile {
std::optional<HeaderType> header_;
Detail::FileMetadata md_;
public:
Detail::RunMetadata* run_metrics_;
Detail::RunMetadata* run_metrics_{nullptr};
private:
std::string working_path_;
std::string destination_path_;
......
......@@ -40,7 +40,7 @@ void OutputFileHandler::CommitFile(uint32_t run, uint32_t index) {
UpdateRunInfo(run, index);
}
int OutputFileHandler::StageSlice(char *buffer, size_t size_bytes, uint32_t size_orbits,
int OutputFileHandler::StageSlice(const char *buffer, size_t size_bytes, uint32_t size_orbits,
uint32_t run_number, uint32_t file_index) {
bool is_new_run = (run_.number != static_cast<int>(run_number));
bool is_new_index = (current_index_ != static_cast<int>(file_index));
......
......@@ -38,7 +38,7 @@ class OutputFileHandler {
~OutputFileHandler() { CommitFile(run_.number, current_index_); }
void UpdateRunInfo(uint32_t run, uint32_t index);
int StageSlice(char *buffer, size_t size_bytes, uint32_t size_orbits, uint32_t run_number,
int StageSlice(const char *buffer, size_t size_bytes, uint32_t size_orbits, uint32_t run_number,
uint32_t file_index);
auto HasFile() const { return outputFile_.IsOpen(); }
......
......@@ -51,7 +51,7 @@ void FileSink::ProcessQueue() {
<< ", queue size=" << commit_queue_.size();
}
void FileSink::CommitFileHeader(OutputFile &file) {
void FileSink::CommitFileHeader(const OutputFile &file) {
auto header = file.GetHeader();
if (header.has_value()) {
auto file_ptr = file.GetFilePointer();
......
......@@ -16,7 +16,7 @@
class FileSink {
public:
FileSink(const std::string &rp) : root_path_(rp + "/") {
explicit FileSink(const std::string &rp) : root_path_(rp + "/") {
commit_thread_ = std::thread(&FileSink::ProcessQueue, this);
}
......@@ -30,7 +30,7 @@ class FileSink {
void Submit(OutputFile &&file);
void BlockingWrite(std::string &&loc, std::string &&content);
void CommitFileHeader(OutputFile &file);
void CommitFileHeader(const OutputFile &file);
void WriteLumisectionFooter(uint32_t run_number, uint32_t ls_id, std::string &&footer);
void WriteRunFooter(uint32_t run_number, std::string &&footer);
std::string GetRootPath() const { return root_path_; }
......
......@@ -15,8 +15,8 @@ class Slice {
uint32_t counts;
bool output;
static tbb::concurrent_bounded_queue<Slice *> free_slices;
uint32_t firstOrbitN_;
uint32_t run_number_;
uint32_t first_orbit_{-UINT32_MAX};
uint32_t run_number_{-UINT32_MAX};
bool initialized_{false};
public:
......@@ -43,8 +43,8 @@ class Slice {
logical_end = begin();
counts = 0;
output = false;
firstOrbitN_ = UINT_MAX;
run_number_ = UINT_MAX;
first_orbit_ = UINT32_MAX;
run_number_ = UINT32_MAX;
initialized_ = false;
}
......@@ -63,13 +63,13 @@ class Slice {
void set_output(bool o) { output = o; }
void set_counts(uint32_t c) { counts = c; }
uint32_t get_counts() const { return counts; }
uint32_t get_firstOrbitN() const { return firstOrbitN_; }
void set_firstOrbitN(uint32_t firstOrbitN) {
firstOrbitN_ = firstOrbitN;
uint32_t get_firstOrbitN() const { return first_orbit_; }
void set_firstOrbitN(uint32_t first_orbit_number) {
first_orbit_ = first_orbit_number;
initialized_ = true;
}
void SetRunNumber(uint32_t run_no) { run_number_ = run_no; }
uint32_t GetRunNumber() { return run_number_; }
bool isInitialized() { return initialized_; }
uint32_t GetRunNumber() const { return run_number_; }
bool isInitialized() const { return initialized_; }
};
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment