Add initSession step in PluginLogic.

 * This step supports to perform PluginLogic initialization and Plugin so file preloading.

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Add initSession step in PluginLogic.

Change-Id: I8363bda15f2313f0ccec4dfe3e51d67c98b7dcfd

diff --git a/src/plugin-loading/plugin_container_support.cpp b/src/plugin-loading/plugin_container_support.cpp
index 6bc1d31..4518b0f 100644 (file)
--- a/src/plugin-loading/plugin_container_support.cpp
+++ b/src/plugin-loading/plugin_container_support.cpp
@@ -54,6 +54,15 @@ PluginContainerSupport::~PluginContainerSupport()
     m_standardFeatureList.clear();
 }
 
+void PluginContainerSupport::Initialize(int widgetHandle)
+{
+    if (isInitialized() == false)
+    {
+        readAllowedPlugins(widgetHandle);
+        readRootPlugins(widgetHandle);
+    }
+}
+
 std::list<std::string> PluginContainerSupport::getAllowedFeatures(int widgetHandle) const
 {
     //TODO it has to return LIST NOT SET!!!
@@ -280,6 +289,21 @@ PluginContainerSupport::getStandardPlugins() const
     return plugins;
 }
 
+PluginContainerSupport::PluginsList
+PluginContainerSupport::getPluginsList() const
+{
+    LogDebug("");
+
+    PluginsList plugins;
+
+    FOREACH(it, m_pluginModels)
+    {
+        plugins.push_back(*it);
+    }
+
+    return plugins;
+}
+
 PluginModelPtr
 PluginContainerSupport::getPluginForFeature(const std::string& featureName)
 {

diff --git a/src/plugin-loading/plugin_container_support.h b/src/plugin-loading/plugin_container_support.h
index 9186e70..8bd361e 100644 (file)
--- a/src/plugin-loading/plugin_container_support.h
+++ b/src/plugin-loading/plugin_container_support.h
@@ -71,12 +71,14 @@ public:
     PluginContainerSupport();
 
     bool isInitialized() { return m_initialized; }
+    void Initialize(int widgetHandle);
     void registerPluginModel(WrtDB::DbPluginHandle handle);
     std::list<std::string> getAllowedFeatures(int widgetHandle) const;
     void readAllowedPlugins(int widgetHandle);
     void readRootPlugins(int widgetHandle);
     FeaturesList getStandardFeatures() const;
     PluginsList  getStandardPlugins() const;
+    PluginsList  getPluginsList() const;
 
     PluginModelPtr getPluginForFeature(const std::string& featureName);
 

diff --git a/src/plugin-loading/plugin_logic.cpp b/src/plugin-loading/plugin_logic.cpp
index dbb45b7..5fb5d70 100644 (file)
--- a/src/plugin-loading/plugin_logic.cpp
+++ b/src/plugin-loading/plugin_logic.cpp
@@ -83,6 +83,7 @@ class PluginLogic::Impl
     ~Impl();
 
     // Widget session
+    void initSession(int widgetHandle);
     void startSession(int widgetHandle,
                       JSGlobalContextRef context,
                       double scaleFactor,
@@ -151,6 +152,10 @@ PluginLogic::Impl::~Impl()
     LogDebug("Deinitializing plugin Logic...");
 }
 
+void PluginLogic::initSession(int widgetHandle)
+{
+    m_impl->initSession(widgetHandle);
+}
 
 void PluginLogic::startSession(int widgetHandle,
                                JSGlobalContextRef ctx,
@@ -230,6 +235,50 @@ PluginLogic::~PluginLogic()
 {
 }
 
+void PluginLogic::Impl::initSession(int widgetHandle)
+{
+    LogInfo("init pluginLogic...");
+
+    m_pluginsSupport->Initialize(widgetHandle);
+
+    //add standard objects
+    LogDebug("Preload plugins so file");
+
+    PluginContainerSupport::PluginsList pluginList =
+                                          m_pluginsSupport->getPluginsList();
+
+    FOREACH(it, pluginList)
+    {
+        PluginModelPtr& pluginModel = *it;
+        PluginPtr pluginLib = pluginModel->LibraryInstance.Get();
+
+        if (!pluginLib)
+        {
+            std::string path = pluginModel->LibraryPath.Get() +
+                               std::string(LIBRARY_PATH_SEPARATOR) +
+                               pluginModel->LibraryName.Get();
+
+            pluginLib = Plugin::LoadFromFile(path);
+
+            if (!pluginLib)
+            {
+                LogError("Loading library failed");
+            } else
+            {
+                pluginModel->LibraryInstance.Set(pluginLib);
+
+                LogDebug("pluginModel->LibraryInstance.Set() : " << pluginLib->GetFileName());
+            }
+        }
+        else
+        {
+            LogDebug("Already loaded");
+        }
+    }
+
+    LogDebug("Preload plugins so file_done");
+}
+
 void PluginLogic::Impl::startSession(int widgetHandle,
                                      JSGlobalContextRef context,
                                      double scaleFactor,
@@ -238,9 +287,9 @@ void PluginLogic::Impl::startSession(int widgetHandle,
 {
     LogInfo("Starting widget session...");
 
-    if (!m_pluginsSupport->isInitialized()) {
-        m_pluginsSupport->readRootPlugins(widgetHandle);
-        m_pluginsSupport->readAllowedPlugins(widgetHandle);
+    if (!m_pluginsSupport->isInitialized())
+    {
+        m_pluginsSupport->Initialize(widgetHandle);
     }
     auto sessionIt = m_sessions.find(context);
 

diff --git a/src/plugin-loading/plugin_logic.h b/src/plugin-loading/plugin_logic.h
index bccc865..e524ec0 100644 (file)
--- a/src/plugin-loading/plugin_logic.h
+++ b/src/plugin-loading/plugin_logic.h
@@ -43,6 +43,7 @@ class PluginLogic : DPL::Noncopyable
 {
   public:
     // Widget session
+    void initSession(int widgetHandle);
     void startSession(int widgetHandle,
                       JSGlobalContextRef view,
                       double scaleFactor,