Skip to content

Commit 6aed27a

Browse files
committed
fdsdump: fix formatting issues (tabs/spaces)
1 parent b71e916 commit 6aed27a

File tree

2 files changed

+63
-63
lines changed

2 files changed

+63
-63
lines changed

src/tools/fdsdump/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ add_executable(fdsdump
1010
main.cpp
1111
options.cpp
1212
$<TARGET_OBJECTS:common_obj>
13-
$<TARGET_OBJECTS:lister_obj>
13+
$<TARGET_OBJECTS:lister_obj>
1414
$<TARGET_OBJECTS:aggregator_obj>
1515
$<TARGET_OBJECTS:statistics_obj>
1616
)

src/tools/fdsdump/src/aggregator/threadedAggregator.hpp

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,31 @@ const char *aggregator_state_to_str(AggregatorState aggregator_state);
4343
class ThreadedAggregator {
4444
DISABLE_COPY_AND_MOVE(ThreadedAggregator)
4545

46-
struct ThreadInfo {
47-
std::atomic<uint64_t> processed_files{0};
48-
std::atomic<uint64_t> processed_flows{0};
49-
std::atomic<AggregatorState> state{AggregatorState::none};
50-
std::exception_ptr exception = nullptr;
51-
std::atomic<bool> cancelled{false};
52-
};
46+
struct ThreadInfo {
47+
std::atomic<uint64_t> processed_files{0};
48+
std::atomic<uint64_t> processed_flows{0};
49+
std::atomic<AggregatorState> state{AggregatorState::none};
50+
std::exception_ptr exception = nullptr;
51+
std::atomic<bool> cancelled{false};
52+
};
5353

5454
public:
55-
/**
56-
* @brief Create a new threaded aggregator instance
57-
*
58-
* @param aggregation_keys The aggregation keys
59-
* @param aggregation_values The aggregation values
60-
* @param input_filter The input record filter
61-
* @param input_file_patterns The input file patterns (paths w/ glob support)
62-
* @param order_by The fields to order by
63-
* @param num_threads The number of threads
64-
* @param biflow_autoignore Whether the biflow autoignore option should be applied
65-
* @param merge_results Merge output results or not
66-
* @param merge_topk If merge results is enabled, how many top K values to obtain (0 = all
67-
* values, i.e. no top K is performed and everything is merged)
68-
* @param notify_channel The channel to send state notifications through
69-
*/
70-
ThreadedAggregator(
55+
/**
56+
* @brief Create a new threaded aggregator instance
57+
*
58+
* @param aggregation_keys The aggregation keys
59+
* @param aggregation_values The aggregation values
60+
* @param input_filter The input record filter
61+
* @param input_file_patterns The input file patterns (paths w/ glob support)
62+
* @param order_by The fields to order by
63+
* @param num_threads The number of threads
64+
* @param biflow_autoignore Whether the biflow autoignore option should be applied
65+
* @param merge_results Merge output results or not
66+
* @param merge_topk If merge results is enabled, how many top K values to obtain (0 = all
67+
* values, i.e. no top K is performed and everything is merged)
68+
* @param notify_channel The channel to send state notifications through
69+
*/
70+
ThreadedAggregator(
7171
const std::string& aggregation_keys,
7272
const std::string& aggregation_values,
7373
const std::string& input_filter,
@@ -76,64 +76,64 @@ class ThreadedAggregator {
7676
unsigned int num_threads,
7777
bool biflow_autoignore,
7878
bool merge_results,
79-
unsigned int merge_topk,
79+
unsigned int merge_topk,
8080
Channel<ThreadedAggregator *> &notify_channel
8181
);
8282

83-
/**
84-
* @brief Start the aggregation. This is a non-blocking operation that starts the threads that
85-
* will perform the aggregation.
86-
*/
87-
void start();
83+
/**
84+
* @brief Start the aggregation. This is a non-blocking operation that starts the threads that
85+
* will perform the aggregation.
86+
*/
87+
void start();
8888

89-
/**
90-
* @brief Get the exception that occured if the aggregation state is _errored_
91-
*/
89+
/**
90+
* @brief Get the exception that occured if the aggregation state is _errored_
91+
*/
9292
std::exception_ptr get_exception() { return m_exception; }
9393

94-
/**
95-
* @brief Get the final results if merging was enabled
96-
*/
94+
/**
95+
* @brief Get the final results if merging was enabled
96+
*/
9797
std::vector<uint8_t *>& get_results();
9898

99-
/**
100-
* @brief Get the number of processed flows (for progress reporting)
101-
*/
99+
/**
100+
* @brief Get the number of processed flows (for progress reporting)
101+
*/
102102
uint64_t get_processed_flows() const;
103103

104-
/**
105-
* @brief Get the number of processed files (for progress reporting)
106-
*/
104+
/**
105+
* @brief Get the number of processed files (for progress reporting)
106+
*/
107107
uint64_t get_processed_files() const;
108108

109-
/**
110-
* @brief Get the total number of flows that will be processed (for progress reporting)
111-
*/
109+
/**
110+
* @brief Get the total number of flows that will be processed (for progress reporting)
111+
*/
112112
uint64_t get_total_flows() const;
113113

114-
/**
115-
* @brief Get the total number of files that will be processed (for progress reporting)
116-
*/
114+
/**
115+
* @brief Get the total number of files that will be processed (for progress reporting)
116+
*/
117117
uint64_t get_total_files() const;
118118

119-
/**
120-
* @brief Get the current aggregator state
121-
*/
119+
/**
120+
* @brief Get the current aggregator state
121+
*/
122122
AggregatorState get_aggregator_state() const;
123123

124-
/**
125-
* @brief Get the per-thread tables if merging was disabled
126-
*/
124+
/**
125+
* @brief Get the per-thread tables if merging was disabled
126+
*/
127127
std::vector<HashTable *> get_tables();
128128

129-
/**
130-
* @brief Cancel the aggregation
131-
*/
129+
/**
130+
* @brief Cancel the aggregation
131+
*/
132132
void cancel();
133133

134-
/**
135-
* @brief Block until the execution of all aggregator threads finishes
136-
*/
134+
/**
135+
* @brief Block until the execution of all aggregator threads finishes
136+
*/
137137
void join();
138138

139139
private:
@@ -144,7 +144,7 @@ class ThreadedAggregator {
144144
std::string m_order_by;
145145
bool m_biflow_autoignore;
146146
bool m_merge_results;
147-
unsigned int m_merge_topk;
147+
unsigned int m_merge_topk;
148148

149149
std::thread m_main_thread;
150150

@@ -167,15 +167,15 @@ class ThreadedAggregator {
167167

168168
std::exception_ptr m_exception = nullptr;
169169

170-
std::unique_ptr<ThresholdAlgorithm> m_threshold_algorithm;
170+
std::unique_ptr<ThresholdAlgorithm> m_threshold_algorithm;
171171

172172
void thread_worker(unsigned int thread_id);
173173

174174
void run();
175175

176176
void perform_all_merge();
177177

178-
void perform_topk_merge();
178+
void perform_topk_merge();
179179
};
180180

181181
} // aggregator

0 commit comments

Comments
 (0)