fdsdump: use iemgr singleton

Author: sedmicha

src/tools/fdsdump/src/aggregator/mode.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 
 #include <common/flowProvider.hpp>
+#include <common/ieMgr.hpp>
 
 #include <aggregator/aggregator.hpp>
 #include <aggregator/mode.hpp>
@@ -13,19 +14,19 @@ namespace fdsdump {
 namespace aggregator {
 
 void
-mode_aggregate(const shared_iemgr &iemgr, const Options &opts)
+mode_aggregate(const Options &opts)
 {
     ViewDefinition view_def = make_view_def(
             opts.get_aggregation_keys(),
             opts.get_aggregation_values(),
-            iemgr.get());
+            IEMgr::instance().ptr());
     std::vector<SortField> sort_fields = make_sort_def(
             view_def,
             opts.get_order_by());
     std::unique_ptr<Printer> printer = printer_factory(
             view_def,
             opts.get_output_specifier());
-    FlowProvider flows {iemgr};
+    FlowProvider flows;
     Aggregator aggr(view_def);
 
     const size_t rec_limit = opts.get_output_limit();

src/tools/fdsdump/src/aggregator/mode.hpp

@@ -7,7 +7,7 @@ namespace fdsdump {
 namespace aggregator {
 
 void
-mode_aggregate(const shared_iemgr &iemgr, const Options &opts);
+mode_aggregate(const Options &opts);
 
 } // aggregator
 } // fdsdump

src/tools/fdsdump/src/common/field.cpp

@@ -3,22 +3,25 @@
 #include <stdexcept>
 
 #include <common/field.hpp>
+#include <common/ieMgr.hpp>
 
 namespace fdsdump {
 
-Field::Field(std::string name, const shared_iemgr &iemgr)
-    : m_name(name), m_iemgr(iemgr)
+Field::Field(std::string name)
+    : m_name(name)
 {
     string_trim(m_name);
 
-    m_alias = fds_iemgr_alias_find(m_iemgr.get(), m_name.c_str());
+    auto *iemgr = IEMgr::instance().ptr();
+
+    m_alias = fds_iemgr_alias_find(iemgr, m_name.c_str());
     if (m_alias) {
         // Success
         m_type = get_type_of_alias(m_alias);
         return;
     }
 
-    m_elem = fds_iemgr_elem_find_name(m_iemgr.get(), m_name.c_str());
+    m_elem = fds_iemgr_elem_find_name(iemgr, m_name.c_str());
     if (m_elem) {
         // Success
         m_type = get_type_of_element(m_elem);

src/tools/fdsdump/src/common/field.hpp

@@ -39,10 +39,9 @@ struct Field {
      * @brief Create a new getter for an alias or an IPFIX Field.
      *
      * @param name  Name of alias or an IPFIX Element to lookup
-     * @param iemgr IE manager where to look for the field
      * @throw std::invalid_argument If the alias or element cannot be found.
      */
-    Field(std::string name, const shared_iemgr &iemgr);
+    Field(std::string name);
     ~Field() = default;
 
     /**
@@ -93,8 +92,6 @@ struct Field {
 private:
     // Name of the field (trimmed)
     std::string m_name;
-    // Reference to the IE manager
-    shared_iemgr m_iemgr;
     // Data type of the the field
     FieldType m_type;
     // Alias definition (might be nullptr)

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

@@ -5,11 +5,11 @@
 
 #include <common/fieldView.hpp>
 #include <common/flowProvider.hpp>
+#include <common/ieMgr.hpp>
 
 namespace fdsdump {
 
-FlowProvider::FlowProvider(const shared_iemgr &iemgr)
-    : m_iemgr(iemgr)
+FlowProvider::FlowProvider()
 {
     int ret;
 
@@ -18,7 +18,7 @@ FlowProvider::FlowProvider(const shared_iemgr &iemgr)
         throw std::runtime_error("fds_file_init() has failed");
     }
 
-    ret = fds_file_set_iemgr(m_file.get(), m_iemgr.get());
+    ret = fds_file_set_iemgr(m_file.get(), IEMgr::instance().ptr());
     if (ret != FDS_OK) {
         throw std::runtime_error("fds_file_set_iemgr() has failed: " + std::to_string(ret));
     }
@@ -36,7 +36,7 @@ FlowProvider::set_filter(const std::string &expr)
     fds_ipfix_filter_t *filter;
     int ret;
 
-    ret = fds_ipfix_filter_create(&filter, m_iemgr.get(), expr.c_str());
+    ret = fds_ipfix_filter_create(&filter, IEMgr::instance().ptr(), expr.c_str());
     m_filter.reset(filter);
 
     if (ret != FDS_OK) {

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

@@ -14,7 +14,7 @@ namespace fdsdump {
 
 class FlowProvider {
 public:
-    FlowProvider(const shared_iemgr &iemgr);
+    FlowProvider();
     ~FlowProvider() = default;
 
     FlowProvider(const FlowProvider &) = delete;
@@ -65,7 +65,6 @@ class FlowProvider {
 
     std::list<std::string> m_remains;
 
-    shared_iemgr m_iemgr;
     unique_filter m_filter {nullptr, &fds_ipfix_filter_destroy};
     unique_file m_file {nullptr, &fds_file_close};
     bool m_file_ready = false;

src/tools/fdsdump/src/lister/csvPrinter.cpp

@@ -11,7 +11,7 @@
 namespace fdsdump {
 namespace lister {
 
-CsvPrinter::CsvPrinter(const shared_iemgr &iemgr, const std::string &args)
+CsvPrinter::CsvPrinter(const std::string &args)
 {
     std::string args_fields;
     std::string args_opts;
@@ -23,7 +23,7 @@ CsvPrinter::CsvPrinter(const shared_iemgr &iemgr, const std::string &args)
         ? args.substr(delim_pos + 1, std::string::npos)
         : "";
 
-    parse_fields(args_fields, iemgr);
+    parse_fields(args_fields);
     parse_opts(args_opts);
 
     m_buffer.reserve(1024);
@@ -34,7 +34,7 @@ CsvPrinter::~CsvPrinter()
 }
 
 void
-CsvPrinter::parse_fields(const std::string &str, const shared_iemgr &iemgr)
+CsvPrinter::parse_fields(const std::string &str)
 {
     std::vector<std::string> field_names;
 
@@ -45,7 +45,7 @@ CsvPrinter::parse_fields(const std::string &str, const shared_iemgr &iemgr)
     field_names = string_split(str, ",");
 
     for (const std::string &name : field_names) {
-        m_fields.emplace_back(Field {name, iemgr}, name);
+        m_fields.emplace_back(Field {name}, name);
     }
 }
 

src/tools/fdsdump/src/lister/csvPrinter.hpp

@@ -11,7 +11,7 @@ namespace lister {
 
 class CsvPrinter : public Printer {
 public:
-    CsvPrinter(const shared_iemgr &iemgr, const std::string &args);
+    CsvPrinter(const std::string &args);
 
     virtual
     ~CsvPrinter();
@@ -34,7 +34,7 @@ class CsvPrinter : public Printer {
             : m_field(field), m_name(name) {}
     };
 
-    void parse_fields(const std::string &str, const shared_iemgr &iemgr);
+    void parse_fields(const std::string &str);
     void parse_opts(const std::string &str);
 
     void print_record(struct fds_drec *rec, bool reverse);

src/tools/fdsdump/src/lister/jsonPrinter.cpp

@@ -5,13 +5,14 @@
 #include <string>
 
 #include <common/common.hpp>
+#include <common/ieMgr.hpp>
 
 #include <lister/jsonPrinter.hpp>
 
 namespace fdsdump {
 namespace lister {
 
-JsonPrinter::JsonPrinter(const shared_iemgr &iemgr, const std::string &args)
+JsonPrinter::JsonPrinter(const std::string &args)
 {
     std::string args_fields;
     std::string args_opts;
@@ -23,7 +24,7 @@ JsonPrinter::JsonPrinter(const shared_iemgr &iemgr, const std::string &args)
         ? args.substr(delim_pos + 1, std::string::npos)
         : "";
 
-    parse_fields(args_fields, iemgr);
+    parse_fields(args_fields);
     parse_opts(args_opts);
 
     m_buffer.reserve(1024);
@@ -34,7 +35,7 @@ JsonPrinter::~JsonPrinter()
 }
 
 void
-JsonPrinter::parse_fields(const std::string &str, const shared_iemgr &iemgr)
+JsonPrinter::parse_fields(const std::string &str)
 {
     std::vector<std::string> field_names;
 
@@ -45,7 +46,7 @@ JsonPrinter::parse_fields(const std::string &str, const shared_iemgr &iemgr)
     field_names = string_split(str, ",");
 
     for (const std::string &name : field_names) {
-        m_fields.emplace_back(name, iemgr);
+        m_fields.emplace_back(name);
     }
 }
 

src/tools/fdsdump/src/lister/jsonPrinter.hpp

@@ -12,7 +12,7 @@ namespace lister {
 
 class JsonPrinter : public Printer {
 public:
-    JsonPrinter(const shared_iemgr &iemgr, const std::string &args);
+    JsonPrinter(const std::string &args);
 
     virtual
     ~JsonPrinter();
@@ -27,7 +27,7 @@ class JsonPrinter : public Printer {
     print_epilogue() override;
 
 private:
-    void parse_fields(const std::string &str, const shared_iemgr &iemgr);
+    void parse_fields(const std::string &str);
     void parse_opts(const std::string &str);
 
     void print_record(struct fds_drec *rec, bool reverse);