[Refactoring] Code cleanup and remove duplicate methods

[platform/core/dotnet/launcher.git] / NativeLauncher / util / plugin_manager.cc

diff --git a/NativeLauncher/util/plugin_manager.cc b/NativeLauncher/util/plugin_manager.cc
index f8f008b..472415d 100644 (file)
--- a/NativeLauncher/util/plugin_manager.cc
+++ b/NativeLauncher/util/plugin_manager.cc
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <dlfcn.h>
 
 #include "plugin_manager.h"
@@ -21,40 +22,59 @@
 
 static PluginFunc* __pluginFunc = NULL;
 static void* __pluginLib;
+static bool initializedPluginManager = false;
 
-int initializePluginManager(const char* mode)
+int initializePluginManager(const char* appType)
 {
-       if (isFileExist(PLUGIN_PATH)) {
+       if (initializedPluginManager) {
+               _INFO("Plugin manager already initialized");
+               return 0;
+       }
+
+       if (isFile(PLUGIN_PATH)) {
                __pluginLib = dlopen(PLUGIN_PATH, RTLD_NOW | RTLD_LOCAL | RTLD_NODELETE);
-               if (__pluginLib) {
-                       __pluginFunc = (PluginFunc*)calloc(sizeof(PluginFunc), 1);
-                       if (!__pluginFunc) {
-                               _ERR("fail to allocate memory for plugin function structure");
-                               return -1;
-                       }
-                       __pluginFunc->initialize = (plugin_initialize_ptr)dlsym(__pluginLib, "plugin_initialize");
-                       __pluginFunc->preload = (plugin_preload_ptr)dlsym(__pluginLib, "plugin_preload");
-                       __pluginFunc->has_log_control = (plugin_has_log_control_ptr)dlsym(__pluginLib, "plugin_has_log_control");
-                       __pluginFunc->set_app_info = (plugin_set_app_info_ptr)dlsym(__pluginLib, "plugin_set_app_info");
-                       __pluginFunc->set_coreclr_info = (plugin_set_coreclr_info_ptr)dlsym(__pluginLib, "plugin_set_coreclr_info");
-                       __pluginFunc->get_dll_path = (plugin_get_dll_path_ptr)dlsym(__pluginLib, "plugin_get_dll_path");
-                       __pluginFunc->get_tpa = (plugin_get_tpa_ptr)dlsym(__pluginLib, "plugin_get_tpa");
-                       __pluginFunc->before_execute = (plugin_before_execute_ptr)dlsym(__pluginLib, "plugin_before_execute");
-                       __pluginFunc->finalize  = (plugin_finalize_ptr)dlsym(__pluginLib, "plugin_finalize");
+               if (!__pluginLib) {
+                       _ERR("fail to dlopen plugin library");
+                       return -1;
                }
 
-               if (__pluginFunc->initialize)
-                       __pluginFunc->initialize(mode);
+               __pluginFunc = (PluginFunc*)calloc(sizeof(PluginFunc), 1);
+               if (!__pluginFunc) {
+                       _ERR("fail to allocate memory for plugin function structure");
+                       dlclose(__pluginLib);
+                       __pluginLib = NULL;
+                       return -1;
+               }
+               __pluginFunc->initialize = (plugin_initialize_ptr)dlsym(__pluginLib, "plugin_initialize");
+               __pluginFunc->preload = (plugin_preload_ptr)dlsym(__pluginLib, "plugin_preload");
+               __pluginFunc->has_log_control = (plugin_has_log_control_ptr)dlsym(__pluginLib, "plugin_has_log_control");
+               __pluginFunc->set_app_info = (plugin_set_app_info_ptr)dlsym(__pluginLib, "plugin_set_app_info");
+               __pluginFunc->set_coreclr_info = (plugin_set_coreclr_info_ptr)dlsym(__pluginLib, "plugin_set_coreclr_info");
+               __pluginFunc->get_dll_path = (plugin_get_dll_path_ptr)dlsym(__pluginLib, "plugin_get_dll_path");
+               __pluginFunc->get_extra_dll_path = (plugin_get_extra_dll_path_ptr)dlsym(__pluginLib, "plugin_get_extra_dll_path");
+               __pluginFunc->get_native_dll_searching_path = (plugin_get_native_dll_searching_path_ptr)dlsym(__pluginLib, "plugin_get_native_dll_searching_path");
+               __pluginFunc->get_tpa = (plugin_get_tpa_ptr)dlsym(__pluginLib, "plugin_get_tpa");
+               __pluginFunc->before_execute = (plugin_before_execute_ptr)dlsym(__pluginLib, "plugin_before_execute");
+               __pluginFunc->finalize  = (plugin_finalize_ptr)dlsym(__pluginLib, "plugin_finalize");
        }
 
-       _INFO("Plugin manager initialize success");
+       if (__pluginFunc && __pluginFunc->initialize)
+               __pluginFunc->initialize(appType);
+
+       initializedPluginManager = true;
+
+       _INFO("Plugin manager initialize success : appType(%s)", appType);
 
        return 0;
 }
 
 void finalizePluginManager()
 {
+       if (!initializedPluginManager)
+               return;
+
        _INFO("Plugin manager finalize called");
+
        if (__pluginFunc) {
                free(__pluginFunc);
                __pluginFunc = NULL;
@@ -64,6 +84,8 @@ void finalizePluginManager()
                dlclose(__pluginLib);
                __pluginLib = NULL;
        }
+
+       initializedPluginManager = false;
 }
 
 void pluginPreload()
@@ -105,6 +127,24 @@ char* pluginGetDllPath()
        }
 }
 
+char* pluginGetExtraDllPath()
+{
+       if (__pluginFunc && __pluginFunc->get_extra_dll_path) {
+               return __pluginFunc->get_extra_dll_path();
+       } else {
+               return NULL;
+       }
+}
+
+char* pluginGetNativeDllSearchingPath()
+{
+       if (__pluginFunc && __pluginFunc->get_native_dll_searching_path) {
+               return __pluginFunc->get_native_dll_searching_path();
+       } else {
+               return NULL;
+       }
+}
+
 char* pluginGetTPA()
 {
        if (__pluginFunc && __pluginFunc->get_tpa) {
@@ -127,4 +167,3 @@ void pluginFinalize()
                __pluginFunc->finalize();
        }
 }
-