fix(libsinsp): disable thread pool on webassembly

Signed-off-by: Gianmatteo Palmieri <mail@gian.im>
falcosecurity · Aug 29, 2024 · f33a73f · f33a73f
1 parent 13ad718
commit f33a73f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/userspace/libsinsp/plugin.cpp b/userspace/libsinsp/plugin.cpp
@@ -824,6 +824,11 @@ std::vector<metrics_v2> sinsp_plugin::get_metrics() const
 
 thread_pool::routine_id_t sinsp_plugin::subscribe_routine(ss_plugin_routine_fn_t routine_fn, ss_plugin_routine_state_t* routine_state)
 {
+	if(!m_thread_pool)
+	{
+		return static_cast<thread_pool::routine_id_t>(nullptr);
+	}
+
 	auto f = [this, routine_fn, routine_state]() -> bool {
 		return static_cast<bool>(routine_fn(m_state, routine_state));
 	};
@@ -833,6 +838,11 @@ thread_pool::routine_id_t sinsp_plugin::subscribe_routine(ss_plugin_routine_fn_t
 
 void sinsp_plugin::unsubscribe_routine(thread_pool::routine_id_t routine_id)
 {
+	if(!m_thread_pool || !routine_id)
+	{
+		return;
+	}
+
 	m_thread_pool->unsubscribe(routine_id);
 }
 

diff --git a/userspace/libsinsp/sinsp.cpp b/userspace/libsinsp/sinsp.cpp
@@ -132,7 +132,9 @@ sinsp::sinsp(bool with_metrics) :
 	m_table_registry = std::make_shared<libsinsp::state::table_registry>();
 	m_table_registry->add_table(m_thread_manager.get());
 
+#if !defined(__EMSCRIPTEN__)
 	m_thread_pool = std::make_shared<bs_thread_pool>();
+#endif
 }
 
 sinsp::~sinsp()
@@ -806,7 +808,10 @@ void sinsp::close()
 	}
 
 	// purge pending routines and wait for the running ones
-	m_thread_pool->purge();
+	if(m_thread_pool)
+	{
+		m_thread_pool->purge();
+	}
 
 	m_mode = SINSP_MODE_NONE;
 }

diff --git a/userspace/libsinsp/test/plugins.ut.cpp b/userspace/libsinsp/test/plugins.ut.cpp
@@ -930,11 +930,15 @@ TEST_F(sinsp_with_test_input, plugin_metrics)
 
 #endif
 
+#if !defined(__EMSCRIPTEN__)
+
 TEST_F(sinsp_with_test_input, plugin_routines)
 {
 	auto p = register_plugin(&m_inspector, get_plugin_api_sample_routines);
 	open_inspector();
 
+	ASSERT_NE(m_inspector.m_thread_pool, nullptr);
+
 	// step #0: the plugins subscribes a routine on capture open
 	auto routines_num = m_inspector.m_thread_pool->routines_num();
 	ASSERT_EQ(routines_num, 1);
@@ -966,3 +970,5 @@ TEST_F(sinsp_with_test_input, plugin_routines)
 	routines_num = m_inspector.m_thread_pool->routines_num();
 	ASSERT_EQ(routines_num, 0);
 }
+
+#endif
diff --git a/userspace/libsinsp/test/thread_pool.ut.cpp b/userspace/libsinsp/test/thread_pool.ut.cpp
@@ -19,6 +19,7 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include <sinsp_with_test_input.h>
 
+#if !defined(__EMSCRIPTEN__)
 TEST_F(sinsp_with_test_input, thread_pool)
 {
     open_inspector();
@@ -69,4 +70,5 @@ TEST_F(sinsp_with_test_input, thread_pool)
     ASSERT_EQ(tp->routines_num(), 1);
     m_inspector.close();
     ASSERT_EQ(tp->routines_num(), 0);
-}
+}
+#endif
diff --git a/userspace/plugin/plugin_api.h b/userspace/plugin/plugin_api.h
@@ -416,7 +416,7 @@ typedef struct
 	// - f: the function executed by the routine on each iteration
 	// - i: the routine's state
 	//
-	// Return value: A routine handle that can be used to later unsubscribe the routine.
+	// Return value: A routine handle that can be used to later unsubscribe the routine. Returns null in case of failure.
 	ss_plugin_routine_t* (*subscribe)(ss_plugin_owner_t* o, ss_plugin_routine_fn_t f, ss_plugin_routine_state_t* i);
 
 	//