From 4295af23a44579bc827722e02b61d163e03f4e49 Mon Sep 17 00:00:00 2001
From: Giovanna Lazzari Miotto <giovanna.lazzari.miotto@cern.ch>
Date: Mon, 8 Jan 2024 17:02:50 +0100
Subject: [PATCH] [lint] Remove commented lines and unused variables
---
src/DmaInputFilter.h | 2 --
src/FileDmaInputFilter.h | 3 ---
src/MicronDmaInputFilter.cc | 6 ++----
src/MicronDmaInputFilter.h | 2 --
src/TcpInputFilter.cc | 3 +--
src/TcpInputFilter.h | 2 --
src/WZDmaInputFilter.h | 2 --
src/pipeline.cc | 5 ++---
src/processor.cc | 7 ++-----
src/processor.h | 6 ++----
src/tools.cc | 4 +---
src/utility.h | 1 -
12 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/src/DmaInputFilter.h b/src/DmaInputFilter.h
index 618b6bfe..db41e2f5 100644
--- a/src/DmaInputFilter.h
+++ b/src/DmaInputFilter.h
@@ -30,6 +30,4 @@ class DmaInputFilter : public InputFilter {
} stats;
};
-typedef std::shared_ptr<DmaInputFilter> DmaInputFilterPtr;
-
#endif
diff --git a/src/FileDmaInputFilter.h b/src/FileDmaInputFilter.h
index 2bac9921..152de718 100644
--- a/src/FileDmaInputFilter.h
+++ b/src/FileDmaInputFilter.h
@@ -11,7 +11,6 @@
class FileDmaInputFilter : public InputFilter {
public:
- // FileDmaInputFilter( const std::string&, size_t, size_t);
FileDmaInputFilter(const std::string &fileName, size_t packetBufferSize, size_t nbPacketBuffers,
ctrl &control);
virtual ~FileDmaInputFilter();
@@ -31,6 +30,4 @@ class FileDmaInputFilter : public InputFilter {
} stats;
};
-typedef std::shared_ptr<FileDmaInputFilter> FileDmaInputFilterPtr;
-
#endif // FILE_DMA_INPUT_FILTER_H
diff --git a/src/MicronDmaInputFilter.cc b/src/MicronDmaInputFilter.cc
index 01d17a28..51341073 100644
--- a/src/MicronDmaInputFilter.cc
+++ b/src/MicronDmaInputFilter.cc
@@ -85,12 +85,10 @@ ssize_t MicronDmaInputFilter::runMicronDAQ(char **buffer) {
// of your application.
////////////////////////////////
- uint32_t *u32p;
uint32_t packetSize;
int err;
if (processorType_ == StreamProcessor::ProcessorType::BRIL) {
- u32p = (uint32_t *)((*buffer));
packetSize = 32 * 1791; // fixed bril 1-histo packet size
} else {
packetSize = 32 * (*((uint32_t *)((*buffer) + 8)) + 2);
@@ -111,9 +109,9 @@ ssize_t MicronDmaInputFilter::runMicronDAQ(char **buffer) {
}
// Read a packet from DMA
-ssize_t MicronDmaInputFilter::readInput(char **buffer, size_t bufferSize) {
+ssize_t MicronDmaInputFilter::readInput(char **buffer, size_t) {
return runMicronDAQ(buffer);
}
// Required for virtual function but currently unused
-void MicronDmaInputFilter::print(std::ostream &out) const {}
+void MicronDmaInputFilter::print(std::ostream &) const {}
diff --git a/src/MicronDmaInputFilter.h b/src/MicronDmaInputFilter.h
index e3fa6d1d..e3612245 100644
--- a/src/MicronDmaInputFilter.h
+++ b/src/MicronDmaInputFilter.h
@@ -11,7 +11,6 @@
class MicronDmaInputFilter : public InputFilter {
public:
- static bool firstRead;
MicronDmaInputFilter(size_t, size_t, ctrl &, config &);
virtual ~MicronDmaInputFilter();
@@ -24,6 +23,5 @@ class MicronDmaInputFilter : public InputFilter {
ssize_t runMicronDAQ(char **buffer);
StreamProcessor::ProcessorType processorType_;
};
-typedef std::shared_ptr<MicronDmaInputFilter> MicronDmaInputFilterPtr;
#endif // MICRONDMA_INPUT_FILER_H
diff --git a/src/TcpInputFilter.cc b/src/TcpInputFilter.cc
index 6d882b46..a4c5df53 100644
--- a/src/TcpInputFilter.cc
+++ b/src/TcpInputFilter.cc
@@ -16,7 +16,7 @@
#include "tools.h"
TcpInputFilter::TcpInputFilter(int destPort, size_t packetBufferSize, size_t nbPacketBuffers,
- const uint32_t nOrbitsPerPacket, ctrl &control, config &conf)
+ const uint32_t nOrbitsPerPacket, ctrl &control, config&)
: InputFilter(packetBufferSize, nbPacketBuffers, control),
nOrbitsPerPacket_{nOrbitsPerPacket},
destPort_{destPort} {
@@ -116,7 +116,6 @@ ssize_t TcpInputFilter::readPacketFromTcp(char **buffer, size_t bufferSize) {
ssize_t blockSize = 32;
ssize_t bytesRecvd = 0;
ssize_t rc;
- int skip = 0;
// header frame
packet_header *header;
diff --git a/src/TcpInputFilter.h b/src/TcpInputFilter.h
index b91afe83..b3e5ad31 100644
--- a/src/TcpInputFilter.h
+++ b/src/TcpInputFilter.h
@@ -50,6 +50,4 @@ class TcpInputFilter : public InputFilter {
bool connection_open_ = false;
};
-typedef std::shared_ptr<TcpInputFilter> TcpInputFilterPtr;
-
#endif
diff --git a/src/WZDmaInputFilter.h b/src/WZDmaInputFilter.h
index b5174bab..c9e0e49f 100644
--- a/src/WZDmaInputFilter.h
+++ b/src/WZDmaInputFilter.h
@@ -39,6 +39,4 @@ class WZDmaInputFilter : public InputFilter {
std::string sconeBoard_;
};
-typedef std::shared_ptr<WZDmaInputFilter> WZDmaInputFilterPtr;
-
#endif // WZDMA_INPUT_FILTER_H
diff --git a/src/pipeline.cc b/src/pipeline.cc
index 5a9d79c4..a2923610 100644
--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -3,9 +3,8 @@
Pipeline::Pipeline(config &conf, uint maxTokensPerThread)
: fMaxTokensPerThread(maxTokensPerThread),
fConf(conf),
- fStreamProcessor(conf.getDmaPacketBufferSize(), conf.getDoZS(), conf.getProcessorType(),
- conf.getNOrbitsPerPacket(), conf.getCMSSWHeaders(),
- static_cast<uint16_t>(conf.getSourceID()), control) {
+ fStreamProcessor(conf.getDoZS(), conf.getProcessorType(), conf.getNOrbitsPerPacket(),
+ conf.getCMSSWHeaders(), static_cast<uint16_t>(conf.getSourceID()), control) {
tools::log::set_filter_min_severity(fConf.getLogMinSeverity());
fConf.print();
const config::InputType &input = fConf.getInput();
diff --git a/src/processor.cc b/src/processor.cc
index 76daa92a..b0cfaac2 100644
--- a/src/processor.cc
+++ b/src/processor.cc
@@ -13,11 +13,10 @@
// Definition of the static member stats
StreamProcessor::Statistics StreamProcessor::stats;
-StreamProcessor::StreamProcessor(size_t max_size_, const bool doZS_, ProcessorType processorType_,
+StreamProcessor::StreamProcessor(const bool doZS_, ProcessorType processorType_,
const uint32_t nOrbitsPerPacket_, const bool cmsswHeaders_,
const uint16_t sourceID_, ctrl &control_)
: tbb::filter(parallel),
- max_size(max_size_),
nbPackets(0),
doZS(doZS_),
processorType(processorType_),
@@ -368,7 +367,6 @@ void StreamProcessor::process(Slice &input, Slice &out) {
char *rd_end_ptr = input.end();
char *wr_end_ptr = out.begin() + out.avail();
uint32_t counts = 0;
- bool endofpacket = false;
uint32_t orbit_per_packet_count = 0;
bool firstOrbit = true;
StreamProcessor::fillOrbitMetadata meta{0, 0, 0};
@@ -388,7 +386,7 @@ void StreamProcessor::process(Slice &input, Slice &out) {
if (!CheckFrameMultBlock(input.size())) {
return;
}
- while (endofpacket == false) {
+ while (true) {
uint32_t orbitCount = 0;
char *trailer_ptr = rd_ptr;
bool trailerFound = GetTrailer(input, trailer_ptr);
@@ -452,7 +450,6 @@ void StreamProcessor::process(Slice &input, Slice &out) {
if (rd_ptr < input.end()) {
uint32_t *dma_trailer_word = (uint32_t *)(rd_ptr);
if (*dma_trailer_word == constants::deadbeef) {
- endofpacket = true;
out.set_end(wr_ptr);
out.set_counts(counts);
return;
diff --git a/src/processor.h b/src/processor.h
index 69462dcc..57422808 100644
--- a/src/processor.h
+++ b/src/processor.h
@@ -26,9 +26,8 @@ class StreamProcessor : public tbb::filter {
enum class ProcessorType { PASS_THROUGH, GMT, CALO, BRIL };
- StreamProcessor(size_t max_size_, bool doZS_, ProcessorType processorType_,
- const uint32_t nOrbitsPerPacket_, const bool cmsswHeaders_,
- const uint16_t sourceID, ctrl &control);
+ StreamProcessor(bool doZS_, ProcessorType processorType_, const uint32_t nOrbitsPerPacket_,
+ const bool cmsswHeaders_, const uint16_t sourceID, ctrl &control);
void *operator()(void *item) /*override*/;
~StreamProcessor();
@@ -47,7 +46,6 @@ class StreamProcessor : public tbb::filter {
fillOrbitMetadata FillOrbitCalo(orbit_trailer *trailer, char *rd_ptr, char *wr_ptr,
char *rd_end_ptr, char *wr_end_ptr);
uint32_t FillBril(char *rd_ptr, char *wr_ptr, char *end_ptr);
- size_t max_size;
uint64_t nbPackets;
const bool doZS;
const ProcessorType processorType;
diff --git a/src/tools.cc b/src/tools.cc
index 9c686fa4..029d9fcf 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -17,9 +17,7 @@ std::mutex log_lock;
/*
* This function is just used to silence libcurl (see below)
*/
-static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp) {
- return size * nmemb;
-}
+static size_t WriteCallback(void *, size_t size, size_t nmemb, void *) { return size * nmemb; }
/*
* Helper function to reset the board via SCONE
diff --git a/src/utility.h b/src/utility.h
index 113c941b..647bdce1 100644
--- a/src/utility.h
+++ b/src/utility.h
@@ -281,7 +281,6 @@ class cli_argument_pack {
}
// then try it as positional argument without name specified
else if (current_positional_index < positional_arg_names.size()) {
- std::stringstream str(argv[j]);
args_map_type::iterator found_positional_arg =
args_map.find(positional_arg_names.at(current_positional_index));
// TODO: probably use of smarter assert would help here
--
GitLab