chore(userspace/libsinsp): further minor improvements

Signed-off-by: Jason Dellaluce <[email protected]>
falcosecurity · Feb 21, 2024 · c7062ea · c7062ea
1 parent b0e6dda
commit c7062ea
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 9 deletions.
diff --git a/userspace/libsinsp/container_engine/container_engine_base.h b/userspace/libsinsp/container_engine/container_engine_base.h
@@ -18,6 +18,8 @@ limitations under the License.
 
 #pragma once
 
+#include <memory>
+
 #include <libsinsp/container_engine/container_cache_interface.h>
 
 class sinsp_threadinfo;

diff --git a/userspace/libsinsp/dns_manager.h b/userspace/libsinsp/dns_manager.h
@@ -28,6 +28,7 @@ limitations under the License.
 #include <chrono>
 #include <future>
 #include <mutex>
+#include <memory>
 #if !defined(__EMSCRIPTEN__)
 #include "tbb/concurrent_unordered_map.h"
 #endif

diff --git a/userspace/libsinsp/event.h b/userspace/libsinsp/event.h
@@ -21,6 +21,7 @@ limitations under the License.
 #include <optional>
 #include <unordered_map>
 #include <string_view>
+#include <memory>
 
 #include <json/json.h>
 

diff --git a/userspace/libsinsp/eventformatter.cpp b/userspace/libsinsp/eventformatter.cpp
@@ -96,10 +96,10 @@ void sinsp_evt_formatter::set_format(output_format of, const std::string& fmt)
 
 			if(last_nontoken_str_start != j)
 			{
-				rawstring_check* newtkn = new rawstring_check(lfmt.substr(last_nontoken_str_start, j - last_nontoken_str_start));
-				m_tokens.emplace_back(std::make_pair("", newtkn));
+				auto newtkn = std::make_unique<rawstring_check>(lfmt.substr(last_nontoken_str_start, j - last_nontoken_str_start));
+				m_tokens.emplace_back(std::make_pair("", newtkn.get()));
 				m_tokenlens.push_back(0);
-				m_chks_to_free.push_back(std::unique_ptr<sinsp_filter_check>(newtkn));
+				m_chks_to_free.push_back(std::move(newtkn));
 			}
 
 			if(j == lfmtlen - 1)
@@ -164,9 +164,9 @@ void sinsp_evt_formatter::set_format(output_format of, const std::string& fmt)
 
 	if(last_nontoken_str_start != j)
 	{
-		auto chk = new rawstring_check(lfmt.substr(last_nontoken_str_start, j - last_nontoken_str_start));
-		m_tokens.emplace_back(std::make_pair("", chk));
-		m_chks_to_free.emplace_back(chk);
+		auto chk = std::make_unique<rawstring_check>(lfmt.substr(last_nontoken_str_start, j - last_nontoken_str_start));
+		m_tokens.emplace_back(std::make_pair("", chk.get()));
+		m_chks_to_free.emplace_back(std::move(chk));
 		m_tokenlens.push_back(0);
 	}
 }

diff --git a/userspace/libsinsp/eventformatter.h b/userspace/libsinsp/eventformatter.h
@@ -20,6 +20,7 @@ limitations under the License.
 #include <map>
 #include <utility>
 #include <string>
+#include <memory>
 #include <json/json.h>
 
 #include <libsinsp/filter_check_list.h>

diff --git a/userspace/libsinsp/filter.h b/userspace/libsinsp/filter.h
@@ -25,6 +25,7 @@ limitations under the License.
 #include <set>
 #include <string>
 #include <vector>
+#include <memory>
 
 /** @defgroup filter Filtering events
  * Filtering infrastructure.

diff --git a/userspace/libsinsp/filter_check_list.h b/userspace/libsinsp/filter_check_list.h
@@ -20,6 +20,7 @@ limitations under the License.
 
 #include <string>
 #include <vector>
+#include <memory>
 
 class sinsp_filter_check;
 class filter_check_info;

diff --git a/userspace/libsinsp/state/table.h b/userspace/libsinsp/state/table.h
@@ -20,6 +20,7 @@ limitations under the License.
 
 #include <functional>
 #include <type_traits>
+#include <memory>
 
 namespace libsinsp {
 namespace state {

diff --git a/userspace/libsinsp/test/eventformatter.ut.cpp b/userspace/libsinsp/test/eventformatter.ut.cpp
@@ -30,10 +30,10 @@ using namespace std;
 
 TEST(eventformatter, get_field_names)
 {
-	auto inspector = std::make_unique<sinsp>();
+	sinsp inspector;
 	sinsp_filter_check_list filterlist;
 	string output = "this is a sample output %proc.name %fd.type %proc.pid";
-	sinsp_evt_formatter fmt(inspector.get(), output, filterlist);
+	sinsp_evt_formatter fmt(&inspector, output, filterlist);
 	vector<string> output_fields;
 	fmt.get_field_names(output_fields);
 	ASSERT_EQ(output_fields.size(), 3);

diff --git a/userspace/libsinsp/threadinfo.cpp b/userspace/libsinsp/threadinfo.cpp
@@ -2119,7 +2119,7 @@ threadinfo_map_t::ptr_t sinsp_thread_manager::get_thread_ref(int64_t tid, bool q
         // Done. Add the new thread to the list.
         //
         add_thread(std::move(newti), false);
-		sinsp_proc = find_thread(tid, lookup_only);
+        sinsp_proc = find_thread(tid, lookup_only);
     }
 
     return sinsp_proc;

diff --git a/userspace/libsinsp/user.h b/userspace/libsinsp/user.h
@@ -21,6 +21,7 @@ limitations under the License.
 
 #include <unordered_map>
 #include <string>
+#include <memory>
 #include <libsinsp/container_info.h>
 #include <libsinsp/procfs_utils.h>
 #include <libscap/scap.h>