From ee10c7ce70a425834849e337635bf61d579e87f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20L=C3=BCke?= Date: Fri, 27 Dec 2024 14:08:13 +0100 Subject: [PATCH] rename mana_plugin_t -> mana_sink_plugin_t --- src/internal/mana_c_api.h | 8 ++++---- src/internal/mana_lib.hpp | 6 +++--- src/mana_plugin_c_test.c | 4 ++-- src/mana_plugin_python.cc | 2 +- src/mana_plugin_root_histogram.cc | 4 ++-- src/tools/mana_auto_replay.cc | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/internal/mana_c_api.h b/src/internal/mana_c_api.h index 4c37d43..d24932a 100644 --- a/src/internal/mana_c_api.h +++ b/src/internal/mana_c_api.h @@ -63,11 +63,11 @@ extern "C" mana_end_run_t *end_run; mana_process_event_t *process_event; mana_process_system_event_t *process_system_event; - } mana_plugin_t; + } mana_sink_plugin_t; -// plugins need to define this function with the name 'mana_get_plugin' -#define MANA_DEFINE_GET_PLUGIN(name) mana_plugin_t name() - typedef MANA_DEFINE_GET_PLUGIN(mana_get_plugin_t); +// plugins need to define this function with the name 'mana_get_sink_plugin' +#define MANA_DEFINE_GET_PLUGIN(name) mana_sink_plugin_t name() + typedef MANA_DEFINE_GET_PLUGIN(mana_get_sink_plugin_t); #ifdef __cplusplus } diff --git a/src/internal/mana_lib.hpp b/src/internal/mana_lib.hpp index 6e1f166..602ba1f 100644 --- a/src/internal/mana_lib.hpp +++ b/src/internal/mana_lib.hpp @@ -148,13 +148,13 @@ class IManaSink IManaSink &operator=(const IManaSink &) = delete; }; -// wraps a mana_api.h mana_plugin_t instance +// wraps a mana_api.h mana_sink_plugin_t instance struct ManaCSink: public IManaSink { - mana_plugin_t plugin_; + mana_sink_plugin_t plugin_; void *context_ = nullptr; - explicit ManaCSink(mana_plugin_t plugin) + explicit ManaCSink(mana_sink_plugin_t plugin) : plugin_(plugin) { } diff --git a/src/mana_plugin_c_test.c b/src/mana_plugin_c_test.c index bb2d86f..d3c555f 100644 --- a/src/mana_plugin_c_test.c +++ b/src/mana_plugin_c_test.c @@ -44,9 +44,9 @@ MANA_DEFINE_PLUGIN_SYSTEM_EVENT(process_system_event) log_debug("system_event: ctx=%p, size=%zu", context, size); } -MANA_DEFINE_GET_PLUGIN(mana_get_plugin) +MANA_DEFINE_GET_PLUGIN(mana_get_sink_plugin) { - mana_plugin_t plugin; + mana_sink_plugin_t plugin; plugin.init = init; plugin.shutdown = shutdown; plugin.begin_run = begin_run; diff --git a/src/mana_plugin_python.cc b/src/mana_plugin_python.cc index 7d3ef94..7b3530b 100644 --- a/src/mana_plugin_python.cc +++ b/src/mana_plugin_python.cc @@ -97,7 +97,7 @@ MANA_DEFINE_PLUGIN_SYSTEM_EVENT(process_system_event) extern "C" MANA_DEFINE_GET_PLUGIN(mana_get_plugin) { - mana_plugin_t plugin; + mana_sink_plugin_t plugin; plugin.init = init; plugin.shutdown = shutdown; plugin.begin_run = begin_run; diff --git a/src/mana_plugin_root_histogram.cc b/src/mana_plugin_root_histogram.cc index a87bc27..7669cdb 100644 --- a/src/mana_plugin_root_histogram.cc +++ b/src/mana_plugin_root_histogram.cc @@ -215,9 +215,9 @@ MANA_DEFINE_PLUGIN_SYSTEM_EVENT(process_system_event) log_trace("system_event: ctx=%p, size=%zu", context, size); } -extern "C" MANA_DEFINE_GET_PLUGIN(mana_get_plugin) +extern "C" MANA_DEFINE_GET_PLUGIN(mana_get_sink_plugin) { - mana_plugin_t plugin; + mana_sink_plugin_t plugin; plugin.init = init; plugin.shutdown = shutdown; plugin.begin_run = begin_run; diff --git a/src/tools/mana_auto_replay.cc b/src/tools/mana_auto_replay.cc index 98da21b..abc3cb3 100644 --- a/src/tools/mana_auto_replay.cc +++ b/src/tools/mana_auto_replay.cc @@ -423,7 +423,7 @@ int main(int argc, char *argv[]) { pluginHandle = boost::dll::shared_library(pluginFile); manaPlugin = std::make_unique( - pluginHandle.get("mana_get_plugin")()); + pluginHandle.get("mana_get_sink_plugin")()); } catch (const std::exception &e) {