1 files changed, 46 insertions, 20 deletions

diff --git a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc
index ad313c638f..9214a30513 100644
--- a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc
+++ b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc
@@ -1,6 +1,6 @@
-#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h"
 #include <dlfcn.h>
 
+#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h"
 #include "utils/file_system.h"
 
 namespace application_manager {
@@ -12,11 +12,13 @@ RPCPluginManagerImpl::RPCPluginManagerImpl(
     ApplicationManager& app_manager,
     rpc_service::RPCService& rpc_service,
     HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastStateWrapperPtr last_state)
     : app_manager_(app_manager)
     , rpc_service_(rpc_service)
     , hmi_capabilities_(hmi_capabilities)
-    , policy_handler_(policy_handler) {}
+    , policy_handler_(policy_handler)
+    , last_state_(last_state) {}
 
 bool IsLibraryFile(const std::string& file_path) {
   size_t pos = file_path.find_last_of(".");
@@ -29,10 +31,23 @@ bool IsLibraryFile(const std::string& file_path) {
   return true;
 }
 
-RPCPluginPtr LoadPlugin(const std::string& full_plugin_path) {
+template <typename T>
+T GetFuncFromLib(void* dl_handle, const std::string& function_name) {
+  T exported_func =
+      reinterpret_cast<T>(dlsym(dl_handle, function_name.c_str()));
+  char* error_string = dlerror();
+  if (nullptr != error_string) {
+    LOG4CXX_ERROR(logger_, "Failed to export symbols : " << error_string);
+    return nullptr;
+  }
+  return exported_func;
+}
+
+RPCPluginManagerImpl::RPCPluginPtr RPCPluginManagerImpl::LoadPlugin(
+    const std::string& full_plugin_path) const {
   if (!IsLibraryFile(full_plugin_path)) {
     LOG4CXX_DEBUG(logger_, "Skip loading " << full_plugin_path);
-    return RPCPluginPtr();
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
   }
 
   void* plugin_dll = dlopen(full_plugin_path.c_str(), RTLD_LAZY);
@@ -40,21 +55,33 @@ RPCPluginPtr LoadPlugin(const std::string& full_plugin_path) {
     LOG4CXX_ERROR(
         logger_,
         "Failed to open dll " << full_plugin_path << " : " << dlerror());
-    return RPCPluginPtr();
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
   }
 
   typedef RPCPlugin* (*Create)();
-  Create create_plugin = reinterpret_cast<Create>(dlsym(plugin_dll, "Create"));
-  char* error_string = dlerror();
-  if (nullptr != error_string) {
-    LOG4CXX_ERROR(logger_,
-                  "Failed to export dll's " << full_plugin_path
-                                            << " symbols : " << error_string);
+  Create create_plugin = GetFuncFromLib<Create>(plugin_dll, "Create");
+  if (!create_plugin) {
+    LOG4CXX_ERROR(logger_, "No Create function in " << full_plugin_path);
+    dlclose(plugin_dll);
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
+  }
+
+  typedef void (*Delete)(RPCPlugin*);
+  Delete delete_plugin = GetFuncFromLib<Delete>(plugin_dll, "Delete");
+  if (!delete_plugin) {
+    LOG4CXX_ERROR(logger_, "No Delete function in " << full_plugin_path);
     dlclose(plugin_dll);
-    return RPCPluginPtr();
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
   }
+
+  auto plugin_destroyer = [delete_plugin, plugin_dll](RPCPlugin* plugin) {
+    LOG4CXX_DEBUG(logger_, "Delete plugin " << plugin->PluginName());
+    delete_plugin(plugin);
+    dlclose(plugin_dll);
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
+  };
   RPCPlugin* plugin = create_plugin();
-  return RPCPluginPtr(plugin);
+  return RPCPluginPtr(plugin, plugin_destroyer);
 }
 
 uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) {
@@ -69,8 +96,11 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) {
     LOG4CXX_DEBUG(
         logger_,
         "Loaded " << plugin->PluginName() << " plugin from " << full_name);
-    if (plugin->Init(
-            app_manager_, rpc_service_, hmi_capabilities_, policy_handler_)) {
+    if (plugin->Init(app_manager_,
+                     rpc_service_,
+                     hmi_capabilities_,
+                     policy_handler_,
+                     last_state_)) {
       loaded_plugins_.push_back(std::move(plugin));
     } else {
       LOG4CXX_ERROR(logger_,
@@ -82,10 +112,6 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) {
   return loaded_plugins_.size();
 }
 
-std::vector<RPCPluginPtr>& RPCPluginManagerImpl::GetPlugins() {
-  return loaded_plugins_;
-}
-
 utils::Optional<RPCPlugin> RPCPluginManagerImpl::FindPluginToProcess(
     const int32_t function_id,
     const commands::Command::CommandSource message_source) {