fdsdump: get rid of unnecessary shared_ptr

Author: sedmicha

src/tools/fdsdump/src/aggregator/jsonPrinter.cpp

@@ -12,7 +12,7 @@
 namespace fdsdump {
 namespace aggregator {
 
-JSONPrinter::JSONPrinter(std::shared_ptr<View> view)
+JSONPrinter::JSONPrinter(const View &view)
     : m_view(view)
 {
     m_buffer.reserve(1024);
@@ -36,7 +36,7 @@ JSONPrinter::print_record(uint8_t *record)
 
     size_t field_cnt = 0;
 
-    for (const auto &pair : m_view->iter_fields(record)) {
+    for (const auto &pair : m_view.iter_fields(record)) {
         if (field_cnt++ > 0) {
             m_buffer.push_back(',');
         }

src/tools/fdsdump/src/aggregator/jsonPrinter.hpp

@@ -19,7 +19,7 @@ namespace aggregator {
 class JSONPrinter : public Printer
 {
 public:
-    JSONPrinter(std::shared_ptr<View> view);
+    JSONPrinter(const View &view);
 
     ~JSONPrinter() override;
 
@@ -39,7 +39,7 @@ class JSONPrinter : public Printer
     void append_octet_value(const Value *value);
     void append_varstring_value(const Value *value);
 
-    std::shared_ptr<View> m_view;
+    const View &m_view;
     std::string m_buffer;
     size_t m_rec_printed = 0;
 };

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

@@ -19,16 +19,16 @@ namespace aggregator {
 void
 mode_aggregate(const Options &opts)
 {
-    std::shared_ptr<View> view = ViewFactory::create_view(
-            opts.get_aggregation_keys(), 
-            opts.get_aggregation_values(), 
+    View view = ViewFactory::create_view(
+            opts.get_aggregation_keys(),
+            opts.get_aggregation_values(),
             opts.get_order_by());
 
     std::unique_ptr<Printer> printer = printer_factory(
             view,
             opts.get_output_specifier());
     FlowProvider flows;
-    Aggregator aggr(*view.get());
+    Aggregator aggr(view);
 
     const size_t rec_limit = opts.get_output_limit();
     size_t rec_printed = 0;

src/tools/fdsdump/src/aggregator/printer.cpp

@@ -13,20 +13,20 @@ namespace aggregator {
 
 struct PrinterFactory {
     const char *name;
-    std::function<Printer *(std::shared_ptr<View> view)> create_fn;
+    std::function<Printer *(const View &view)> create_fn;
 };
 
 static const std::vector<struct PrinterFactory> g_printers {
-    {"json", [](std::shared_ptr<View> view) {
+    {"json", [](const View &view) {
         return new JSONPrinter(view); }
     },
-    {"table", [](std::shared_ptr<View> view){
+    {"table", [](const View &view){
         return new TABLEPrinter(view); }
     },
 };
 
 std::unique_ptr<Printer>
-printer_factory(std::shared_ptr<View> view, const std::string &manual)
+printer_factory(const View &view, const std::string &manual)
 {
     std::string type = manual;
 

src/tools/fdsdump/src/aggregator/printer.hpp

@@ -35,7 +35,7 @@ class Printer
 };
 
 std::unique_ptr<Printer>
-printer_factory(std::shared_ptr<View> view, const std::string &manual);
+printer_factory(const View &view, const std::string &manual);
 
 } // aggregator
 } // fdsdump

src/tools/fdsdump/src/aggregator/tablePrinter.cpp

@@ -13,7 +13,7 @@
 namespace fdsdump {
 namespace aggregator {
 
-TABLEPrinter::TABLEPrinter(std::shared_ptr<View> view)
+TABLEPrinter::TABLEPrinter(const View &view)
     : m_view(view)
 {
     m_buffer.reserve(1024);
@@ -28,7 +28,7 @@ TABLEPrinter::print_prologue()
 {
     bool is_first = true;
 
-    for (const auto &field : m_view->fields()) {
+    for (const auto &field : m_view.fields()) {
         if (!is_first) {
             std::cout << ' ';
         }
@@ -40,7 +40,7 @@ TABLEPrinter::print_prologue()
     std::cout << "\n";
     is_first = true;
 
-    for (const auto &field : m_view->fields()) {
+    for (const auto &field : m_view.fields()) {
         if (!is_first) {
             std::cout << ' ';
         }
@@ -58,7 +58,7 @@ TABLEPrinter::print_record(uint8_t *record)
     std::string buffer;
     bool is_first = true;
 
-    for (const auto &pair : m_view->iter_fields(record)) {
+    for (const auto &pair : m_view.iter_fields(record)) {
         if (!is_first) {
             std::cout << ' ';
         }

src/tools/fdsdump/src/aggregator/tablePrinter.hpp

@@ -20,7 +20,7 @@ class TABLEPrinter : public Printer
 public:
     bool m_translate_ip_addrs = false;
 
-    TABLEPrinter(std::shared_ptr<View> view);
+    TABLEPrinter(const View &view);
 
     ~TABLEPrinter() override;
 
@@ -34,7 +34,7 @@ class TABLEPrinter : public Printer
     print_epilogue() override;
 
 private:
-    std::shared_ptr<View> m_view;
+    const View &m_view;
     std::string m_buffer;
 };
 

src/tools/fdsdump/src/aggregator/viewFactory.cpp

@@ -284,22 +284,22 @@ split_args(const std::string &str)
     return pieces;
 }
 
-std::shared_ptr<View> 
+View
 ViewFactory::create_view(
-    const std::string &key_def, 
-    const std::string &value_def, 
+    const std::string &key_def,
+    const std::string &value_def,
     const std::string &order_def)
 {
-    std::shared_ptr<View> view(new View);
-    create_view(*view.get(), key_def, value_def, order_def);
+    View view;
+    create_view(view, key_def, value_def, order_def);
     return view;
 }
 
-void 
+void
 ViewFactory::create_view(
-    View &view, 
-    const std::string &key_def, 
-    const std::string &value_def, 
+    View &view,
+    const std::string &key_def,
+    const std::string &value_def,
     const std::string &order_def)
 {
     for (auto def : split_args(key_def)) {

src/tools/fdsdump/src/aggregator/viewFactory.hpp

@@ -43,7 +43,7 @@ class ViewFactory {
      *
      * @return The view
      */
-    static std::shared_ptr<View> create_view(const std::string &key_def, const std::string &value_def, const std::string &order_def);
+    static View create_view(const std::string &key_def, const std::string &value_def, const std::string &order_def);
 
 private:
     static std::unique_ptr<Field> create_elem_or_alias(const std::string &def);