fdsdump: add extra statistics to flowProvider

Author: sedmicha

src/tools/fdsdump/src/common/flowProvider.cpp

@@ -28,6 +28,26 @@ void
 FlowProvider::add_file(const std::string &file)
 {
     m_remains.push_back(file);
+
+    unique_file file_obj(fds_file_init(), &fds_file_close);
+    if (!file_obj) {
+        throw std::runtime_error("fds_file_init() has failed");
+    }
+
+    int ret;
+    ret = fds_file_open(file_obj.get(), file.c_str(), FDS_FILE_READ);
+    if (ret != FDS_OK) {
+        const std::string err_msg = fds_file_error(file_obj.get());
+
+        std::cerr << "fds_file_open('" << file << "') failed: " << err_msg << std::endl;
+    }
+
+    const fds_file_stats *stats = fds_file_stats_get(file_obj.get());
+    if (stats) {
+        m_total_flow_count += stats->recs_total;
+    } else {
+        std::cerr << "WARNING: " << file << " has no stats" << std::endl;
+    }
 }
 
 void
@@ -88,6 +108,7 @@ FlowProvider::prepare_next_record()
     ret = fds_file_read_rec(m_file.get(), &m_flow.rec, NULL);
     switch (ret) {
     case FDS_OK:
+        m_processed_flow_count++;
         return true;
     case FDS_EOC:
         return false;
@@ -228,4 +249,11 @@ FlowProvider::next_record()
     }
 }
 
+void
+FlowProvider::reset_counters()
+{
+    m_processed_flow_count = 0;
+    m_total_flow_count = 0;
+}
+
 } // fdsdump

src/tools/fdsdump/src/common/flowProvider.hpp

@@ -54,6 +54,22 @@ class FlowProvider {
     Flow *
     next_record();
 
+    /**
+     * @brief Reset the read and loaded flow counters
+     */
+    void
+    reset_counters();
+
+    /**
+     * @brief Get the number of processed flows, i.e. the number of flows in files that we went through
+     */
+    uint64_t get_processed_flow_count() const { return m_processed_flow_count; }
+
+    /**
+     * @brief Get the total number of loaded flows, i.e. the number of flows in files that have been added
+     */
+    uint64_t get_total_flow_count() const { return m_total_flow_count; }
+
 private:
     bool prepare_next_file();
     bool prepare_next_record();
@@ -70,6 +86,9 @@ class FlowProvider {
     bool m_file_ready = false;
     bool m_biflow_autoignore = false;
 
+    uint64_t m_processed_flow_count = 0;
+    uint64_t m_total_flow_count = 0;
+
     Flow m_flow;
 };