From 09a7972b52e9ec75402b41372aa3eea43c46a6e7 Mon Sep 17 00:00:00 2001 From: Changgyu Choi Date: Thu, 10 Apr 2025 15:12:57 +0900 Subject: [PATCH] Modify UNITED_SERVICE_SHUTDOWN interface service_unregister() method needs name parameter. So, UNITED_SERVICE_SHUTDOWN interface should include a name paremeter. Signed-off-by: Changgyu Choi --- src/service_assembly.cc | 6 +++--- src/service_assembly.hh | 4 ++-- src/service_loader.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/service_assembly.cc b/src/service_assembly.cc index fce967b..4f3d60a 100644 --- a/src/service_assembly.cc +++ b/src/service_assembly.cc @@ -64,10 +64,10 @@ void ServiceAssembly::ModuleInit(const std::string& name) { } } -void ServiceAssembly::ModuleShutdown() { +void ServiceAssembly::ModuleShutdown(const std::string& name) { try { - auto shutdown_func = lib_opener_->Bind(kUnitedServiceShutdown); - shutdown_func(); + auto shutdown_func = lib_opener_->Bind(kUnitedServiceShutdown); + shutdown_func(name.c_str()); } catch (const std::exception& e) { _E("Error=%s", e.what()); THROW(SERVICE_ERROR_NO_SUCH_SERVICE); diff --git a/src/service_assembly.hh b/src/service_assembly.hh index 6424a59..2b4a474 100644 --- a/src/service_assembly.hh +++ b/src/service_assembly.hh @@ -34,7 +34,7 @@ class ServiceAssembly { void Unload(); void ModuleInit(const std::string& name); - void ModuleShutdown(); + void ModuleShutdown(const std::string& name); private: std::string assembly_path_; @@ -43,4 +43,4 @@ class ServiceAssembly { } // namespace tizen_base -#endif // SERVICE_ASSEMBLY_HH_ \ No newline at end of file +#endif // SERVICE_ASSEMBLY_HH_ diff --git a/src/service_loader.cc b/src/service_loader.cc index 0d6a2a8..a361766 100644 --- a/src/service_loader.cc +++ b/src/service_loader.cc @@ -241,7 +241,7 @@ void ServiceLoader::UnloadService(const std::string& name) { if (!assembly->IsLoaded()) THROW(SERVICE_ERROR_INVALID_CONTEXT); try { - assembly->ModuleShutdown(); + assembly->ModuleShutdown(name.c_str()); assembly->Unload(); } catch (const Exception& e) { _E("Error=%s", e.what()); -- 2.34.1