This is an automated email from the ASF dual-hosted git repository. martinzink pushed a commit to branch c_api_dev in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 143154a6a65131041c9dfa6544ead94faa2bc485 Author: Martin Zink <[email protected]> AuthorDate: Wed Apr 29 11:15:12 2026 +0200 revert name changes and added comment about hardcoded CProcessor::isWorkAvailable --- .../cpp-extension-lib/include/api/core/Resource.h | 6 +++--- libminifi/include/utils/CProcessor.h | 9 +++++---- minifi-api/include/minifi-c/minifi-c.h | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/extension-framework/cpp-extension-lib/include/api/core/Resource.h b/extension-framework/cpp-extension-lib/include/api/core/Resource.h index 6cefe82f9..ef934af95 100644 --- a/extension-framework/cpp-extension-lib/include/api/core/Resource.h +++ b/extension-framework/cpp-extension-lib/include/api/core/Resource.h @@ -106,7 +106,7 @@ void useProcessorClassDescription(Fn&& fn) { .getTriggerWhenEmpty = [] (void* self) -> MinifiBool { return static_cast<Class*>(self)->getTriggerWhenEmpty(); }, - .trigger = [] (void* self, MinifiProcessContext* context, MinifiProcessSession* session) -> MinifiStatus { + .onTrigger = [] (void* self, MinifiProcessContext* context, MinifiProcessSession* session) -> MinifiStatus { ProcessContext context_wrapper(context); ProcessSession session_wrapper(session); try { @@ -115,7 +115,7 @@ void useProcessorClassDescription(Fn&& fn) { return MINIFI_STATUS_UNKNOWN_ERROR; } }, - .schedule = [] (void* self, MinifiProcessContext* context) -> MinifiStatus { + .onSchedule = [] (void* self, MinifiProcessContext* context) -> MinifiStatus { ProcessContext context_wrapper(context); try { return static_cast<Class*>(self)->onSchedule(context_wrapper); @@ -123,7 +123,7 @@ void useProcessorClassDescription(Fn&& fn) { return MINIFI_STATUS_UNKNOWN_ERROR; } }, - .unSchedule = [] (void* self) -> void { + .onUnSchedule = [] (void* self) -> void { static_cast<Class*>(self)->onUnSchedule(); }, .calculateMetrics = [] (void* self) -> MINIFI_OWNED MinifiPublishedMetrics* { diff --git a/libminifi/include/utils/CProcessor.h b/libminifi/include/utils/CProcessor.h index 7dca958af..cfa3ea2d6 100644 --- a/libminifi/include/utils/CProcessor.h +++ b/libminifi/include/utils/CProcessor.h @@ -81,6 +81,7 @@ class CProcessor : public minifi::core::ProcessorApi { class_description_.callbacks.destroy(impl_); } + // C API doesnt yet expose isWorkAvailable bool isWorkAvailable() override { return false; } @@ -119,7 +120,7 @@ class CProcessor : public minifi::core::ProcessorApi { void onTrigger(minifi::core::ProcessContext& process_context, minifi::core::ProcessSession& process_session) override { std::optional<std::string> error; - auto status = class_description_.callbacks.trigger(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context), reinterpret_cast<MinifiProcessSession*>(&process_session)); + auto status = class_description_.callbacks.onTrigger(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context), reinterpret_cast<MinifiProcessSession*>(&process_session)); if (status == MINIFI_STATUS_PROCESSOR_YIELD) { process_context.yield(); return; @@ -131,18 +132,18 @@ class CProcessor : public minifi::core::ProcessorApi { void onSchedule(minifi::core::ProcessContext& process_context, minifi::core::ProcessSessionFactory& /*process_session_factory*/) override { std::optional<std::string> error; - auto status = class_description_.callbacks.schedule(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context)); + auto status = class_description_.callbacks.onSchedule(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context)); if (status != MINIFI_STATUS_SUCCESS) { throw minifi::Exception(minifi::ExceptionType::PROCESS_SCHEDULE_EXCEPTION, "Error while scheduling processor"); } } void onUnSchedule() override { - class_description_.callbacks.unSchedule(impl_); + class_description_.callbacks.onUnSchedule(impl_); } void notifyStop() override { - class_description_.callbacks.unSchedule(impl_); + class_description_.callbacks.onUnSchedule(impl_); } minifi::core::annotation::Input getInputRequirement() const override { diff --git a/minifi-api/include/minifi-c/minifi-c.h b/minifi-api/include/minifi-c/minifi-c.h index e5e98e5bc..97c969ab4 100644 --- a/minifi-api/include/minifi-c/minifi-c.h +++ b/minifi-api/include/minifi-c/minifi-c.h @@ -166,9 +166,9 @@ typedef struct MinifiProcessorCallbacks { MINIFI_OWNED void*(*create)(MinifiProcessorMetadata); void(*destroy)(MINIFI_OWNED void*); MinifiBool(*getTriggerWhenEmpty)(void*); - MinifiStatus(*trigger)(void*, MinifiProcessContext*, MinifiProcessSession*); - MinifiStatus(*schedule)(void*, MinifiProcessContext*); - void(*unSchedule)(void*); + MinifiStatus(*onTrigger)(void*, MinifiProcessContext*, MinifiProcessSession*); + MinifiStatus(*onSchedule)(void*, MinifiProcessContext*); + void(*onUnSchedule)(void*); MINIFI_OWNED MinifiPublishedMetrics*(*calculateMetrics)(void*); } MinifiProcessorCallbacks;
