HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r72:a0c89a70c83c

Updated meson build files and force plugin unload when closing app...

jeandet -

r72:a0c89a70c83c

parent child

Context file:

r72:a0c89a70c83c

include/PluginManager/PluginManager.h +1 0

             #ifndef SCIQLOP_PLUGINMANAGER_H
             #define SCIQLOP_PLUGINMANAGER_H
             #include "CoreGlobal.h"
             #include <Common/spimpl.h>
             #include <QLoggingCategory>
             class QDir;
             Q_DECLARE_LOGGING_CATEGORY(LOG_PluginManager)
             /**
              * @brief The PluginManager class aims to handle the plugins loaded dynamically into SciQLop.
              */
             class SCIQLOP_CORE_EXPORT PluginManager {
             public:
                 explicit PluginManager();
+                ~PluginManager();
                 /**
                  * Loads plugins into SciQlop. The loaded plugins are those located in the directory passed in
                  * parameter
                  * @param pluginDir the directory containing the plugins
                  */
                 void loadPlugins(const QDir &pluginDir);
                 /**
                  * Loads static plugins into SciQlop. SciQLOP supports statically linked plugins.
                  */
                 void loadStaticPlugins();
                 /// @returns the number of plugins loaded
                 int nbPluginsLoaded() const noexcept;
             private:
                 struct PluginManagerPrivate;
                 spimpl::unique_impl_ptr<PluginManagerPrivate> impl;
             };
             #endif // SCIQLOP_PLUGINMANAGER_H

meson.build +15 -33

             catalogicpp_dep = dependency('catalogicpp', required : true, fallback:['catalogicpp','catalogicpp_dep'])
             pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep'])
+            timeseries_dep = dependency('TimeSeries', required : true, fallback:['TimeSeries','time_series_dep'])
             core_moc_headers = [
              './include/Common/containers.h',
              './include/Common/StringUtils.h',
              './include/Common/Numeric.h',
              './include/Common/spimpl.h',
              './include/Common/DateUtils.h',
              './include/Common/MimeTypesDef.h',
              './include/Common/SignalWaiter.h',
              './include/Common/deprecate.h',
              './include/Common/debug.h',
              './include/Common/MetaTypes.h',
              './include/Common/cpp_utils.h',
              './include/Common/SortUtils.h',
-             './include/Data/DataSeries.h',
-             './include/Data/DataSeriesIterator.h',
              './include/Data/DateTimeRangeHelper.h',
-             './include/Data/SpectrogramSeries.h',
+             './include/Data/ScalarTimeSerie.h',
              './include/Data/DateTimeRange.h',
-             './include/Data/VectorSeries.h',
              './include/Data/DataProviderParameters.h',
-             './include/Data/ArrayData.h',
+             './include/Data/VectorTimeSerie.h',
-             './include/Data/Unit.h',
-             './include/Data/ScalarSeries.h',
              './include/Data/SqpIterator.h',
              './include/Data/IDataProvider.h',
-             './include/Data/DataSeriesUtils.h',
+             './include/Data/SpectrogramTimeSerie.h',
-             './include/Data/OptionalAxis.h',
-             './include/Data/IDataSeries.h',
              './include/Data/DataSeriesType.h',
-             './include/Data/ArrayDataIterator.h',
-             './include/Data/DataSeriesMergeHelper.h',
              './include/CoreGlobal.h',
              './include/Network/NetworkController.h',
              './include/Network/Response.h',
              './include/Network/Downloader.h',
              './include/Settings/SqpSettingsDefs.h',
              './include/Settings/ISqpSettingsBindable.h',
              './include/DataSource/DataSourceController.h',
              './include/DataSource/DataSourceItem.h',
              './include/DataSource/DataSourceItemAction.h',
              './include/DataSource/DataSourceItemMergeHelper.h',
              './include/Time/TimeController.h',
              './include/PluginManager/PluginManager.h',
              './include/Version.h',
              './include/Catalogue/CatalogueController.h',
              './include/Plugin/IPlugin.h',
              './include/Variable/VariableModel2.h',
-             './include/Variable/Variable.h',
-             './include/Variable/VariableCacheStrategy.h',
              './include/Variable/VariableController2.h',
-             './include/Variable/VariableCacheStrategyFactory.h',
+             './include/Variable/Variable2.h',
              './include/Variable/VariableSynchronizationGroup2.h',
-             './include/Variable/ProportionalCacheStrategy.h',
              './include/Variable/private/VCTransaction.h',
-             './include/Variable/SingleThresholdCacheStrategy.h',
+             './include/Visualization/VisualizationController.h']
-             './include/Visualization/VisualizationController.h'
             core_moc_sources = ['src/Network/Downloader.cpp']
             core_moc_files = qt5.preprocess(moc_headers : core_moc_headers, moc_sources: core_moc_sources)
             core_sources = [
              './src/Common/MimeTypesDef.cpp',
              './src/Common/SignalWaiter.cpp',
              './src/Common/DateUtils.cpp',
              './src/Common/StringUtils.cpp',
-             './src/Data/VectorSeries.cpp',
-             './src/Data/ScalarSeries.cpp',
-             './src/Data/OptionalAxis.cpp',
-             './src/Data/DataSeriesIterator.cpp',
-             './src/Data/SpectrogramSeries.cpp',
-             './src/Data/ArrayDataIterator.cpp',
-             './src/Data/DataSeriesUtils.cpp',
              './src/Network/Downloader.cpp',
              './src/Network/NetworkController.cpp',
              './src/Settings/SqpSettingsDefs.cpp',
              './src/DataSource/DataSourceItemAction.cpp',
              './src/DataSource/DataSourceItemMergeHelper.cpp',
              './src/DataSource/DataSourceItem.cpp',
              './src/DataSource/DataSourceController.cpp',
              './src/Time/TimeController.cpp',
              './src/PluginManager/PluginManager.cpp',
-             './src/pybind11_wrappers/CatalogWrappers.cpp',
-             #'./src/pybind11_wrappers/QtWrappers.cpp',
-             #'./src/pybind11_wrappers/CoreWrappers.cpp',
              './src/Version.cpp',
              './src/Catalogue/CatalogueController.cpp',
-             './src/Variable/Variable.cpp',
              './src/Variable/VariableSynchronizationGroup2.cpp',
+             './src/Variable/Variable2.cpp',
              './src/Variable/VariableController2.cpp',
              './src/Variable/VariableModel2.cpp',
              './src/Visualization/VisualizationController.cpp']
             core_inc = include_directories(['include', 'include/Plugin'])
             sciqlop_core_lib = library('sciqlopcore',
                                    core_sources,
                                    core_moc_files,
                                    cpp_args : '-DCORE_LIB',
                                    include_directories : core_inc,
-                                   dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep],
+                                   dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep, timeseries_dep],
                                    install : true
                                    )
             sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
                                             include_directories : core_inc,
-                                            dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep])
+                                            dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep, timeseries_dep])
+            [
+             './src/pybind11_wrappers/CatalogWrappers.cpp',
+             './src/pybind11_wrappers/QtWrappers.cpp',
+             './src/pybind11_wrappers/CoreWrappers.cpp'
+            ]
             subdir('tests')

src/PluginManager/PluginManager.cpp +19 -2

             #include <PluginManager/PluginManager.h>
             #include <Plugin/IPlugin.h>
             #include <QDir>
             #include <QLibrary>
             #include <QPluginLoader>
             Q_LOGGING_CATEGORY(LOG_PluginManager, "PluginManager")
             namespace {
             /// Key for retrieving metadata of the plugin
             const auto PLUGIN_METADATA_KEY = QStringLiteral("MetaData");
             /// Key for retrieving the name of the plugin in its metadata
             const auto PLUGIN_NAME_KEY = QStringLiteral("name");
             /// Helper to state the plugin loading operation
             struct LoadPluginState {
                 explicit LoadPluginState(const QString &pluginPath)
                         : m_PluginPath{pluginPath}, m_Valid{true}, m_ErrorMessage{}
                 {
                 }
                 void log() const
                 {
                     if (m_Valid) {
                         qCDebug(LOG_PluginManager())
                             << QObject::tr("File '%1' has been loaded as a plugin").arg(m_PluginPath);
                     }
                     else {
                         qCWarning(LOG_PluginManager())
                             << QObject::tr("File '%1' can't be loaded as a plugin: %2")
                                    .arg(m_PluginPath)
                                    .arg(m_ErrorMessage);
                     }
                 }
                 void setError(const QString &errorMessage)
                 {
                     m_Valid = false;
                     m_ErrorMessage = errorMessage;
                 }
                 QString m_PluginPath;
                 bool m_Valid;
                 QString m_ErrorMessage;
             };
             } // namespace
             struct PluginManager::PluginManagerPrivate {
                 /**
                  * Loads a single plugin into SciQlop. The method has no effect if the plugin is malformed (e.g.
                  * wrong library type, missing metadata, etc.)
                  * @param pluginPath the path to the plugin library.
                  */
                 void loadPlugin(const QString &pluginPath)
                 {
                     qCDebug(LOG_PluginManager())
                         << QObject::tr("Attempting to load file '%1' as a plugin").arg(pluginPath);
                     LoadPluginState loadState{pluginPath};
                     if (QLibrary::isLibrary(pluginPath)) {
                         QPluginLoader pluginLoader{pluginPath};
                         // Retrieving the plugin name to check if it can be loaded (i.e. no plugin with the same
                         // name has been registered yet)
                         auto metadata = pluginLoader.metaData().value(PLUGIN_METADATA_KEY).toObject();
                         auto pluginName = metadata.value(PLUGIN_NAME_KEY).toString();
                         if (pluginName.isEmpty()) {
                             loadState.setError(QObject::tr("empty file name"));
                         }
                         else if (m_RegisteredPlugins.contains(pluginName)) {
                             loadState.setError(QObject::tr("name '%1' already registered").arg(pluginName));
                         }
                         else {
-                            if (auto pluginInstance = qobject_cast<IPlugin *>(pluginLoader.instance())) {
+                            if (auto plugin = pluginLoader.instance()) {
-                                pluginInstance->initialize();
+                                qobject_cast<IPlugin *>(plugin)->initialize();
                                 m_RegisteredPlugins.insert(pluginName, pluginPath);
+                                m_LoadedPlugins.insert(pluginName, plugin);
                             }
                             else {
                                 loadState.setError(QObject::tr("the file is not a Sciqlop plugin"));
                             }
                         }
                     }
                     else {
                         loadState.setError(QObject::tr("the file is not a library"));
                     }
                     // Log loading result
                     loadState.log();
                 }
                 void loadStaticPlugins()
                 {
                     for (QObject *plugin : QPluginLoader::staticInstances()) {
                         qobject_cast<IPlugin *>(plugin)->initialize();
                         m_RegisteredPlugins.insert(plugin->metaObject()->className(), "StaticPlugin");
+                        m_LoadedPlugins.insert(plugin->metaObject()->className(), plugin);
                     }
                 }
+                void clearAllPlugins()
+                {
+                  for(auto plugin:m_LoadedPlugins)
+                  {
+                    delete plugin;
+                  }
+                  m_LoadedPlugins.clear();
+                  m_RegisteredPlugins.clear();
+                }
                 /// Registered plugins (key: plugin name, value: plugin path)
                 QHash<QString, QString> m_RegisteredPlugins;
+                QHash<QString,QObject*> m_LoadedPlugins;
             };
             PluginManager::PluginManager() : impl{spimpl::make_unique_impl<PluginManagerPrivate>()}
             {
             }
+            PluginManager::~PluginManager()
+            {
+              impl->clearAllPlugins();
+            }
             void PluginManager::loadPlugins(const QDir &pluginDir)
             {
                 // Load plugins
                 auto pluginInfoList
                     = pluginDir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
                 for (auto entryInfo : qAsConst(pluginInfoList)) {
                     if (entryInfo.isDir()) {
                         this->loadPlugins(QDir{entryInfo.absoluteFilePath()});
                     }
                     else if (QLibrary::isLibrary(entryInfo.absoluteFilePath())) {
                         impl->loadPlugin(entryInfo.absoluteFilePath());
                     }
                 }
             }
             void PluginManager::loadStaticPlugins()
             {
                 impl->loadStaticPlugins();
             }
             int PluginManager::nbPluginsLoaded() const noexcept
             {
                 return impl->m_RegisteredPlugins.size();
             }

tests/meson.build 0 -52

             TestUtils = library('TestUtils', 'TestUtils/TestProviders.h', 'TestUtils/TestProviders.cpp',
                                    dependencies : [sciqlop_core, qt5test]
                                    )
             TestUtils_dep = declare_dependency(link_with : TestUtils,
                                             dependencies : [sciqlop_core, qt5test])
-            DataSeriesTestsUtils = library('DataSeriesTestsUtils', 'Data/DataSeriesBuilders.h', 'Data/DataSeriesBuilders.cpp',
-                                'Data/DataSeriesTestsUtils.h',
-                                'Data/DataSeriesTestsUtils.cpp',
-                                   dependencies : [sciqlop_core, qt5test]
-            DataSeriesTestsUtils_dep = declare_dependency(link_with : DataSeriesTestsUtils,
-                                            dependencies : [sciqlop_core, qt5test])
             tests = [
                 {
                     'name':'TestStringUtils',
                     'sources': ['Common/TestStringUtils.cpp'],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
                     'name':'TestContainers',
                     'sources': ['Common/TestContainers.cpp'],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
                     'name':'TestSyncGroup',
                     'sources': ['Variable/TestSyncGroup.cpp'],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
                     'name':'TestDateTimeRange',
                     'sources': ['Data/TestDateTimeRange.cpp'],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
-                    'name':'TestDataSeriesUtils',
-                    'sources': ['Data/TestDataSeriesUtils.cpp'],
-                    'deps': [sciqlop_core, qt5test]
-                },
-                    'name':'TestOptionalAxis',
-                    'sources': ['Data/TestOptionalAxis.cpp'],
-                    'deps': [sciqlop_core, qt5test]
-                },
-                    'name':'TestSpectrogramSeries',
-                    'sources': [
-                                'Data/TestSpectrogramSeries.cpp',
-                                ],
-                    'deps': [sciqlop_core, qt5test, DataSeriesTestsUtils_dep]
-                },
-                    'name':'TestOneDimArrayData',
-                    'sources': ['Data/TestOneDimArrayData.cpp'],
-                    'deps': [sciqlop_core, qt5test]
-                },
-                    'name':'TestScalarSeries',
-                    'sources': [
-                                'Data/TestScalarSeries.cpp',
-                               ],
-                    'deps': [sciqlop_core, qt5test, DataSeriesTestsUtils_dep]
-                },
-                    'name':'TestTwoDimArrayData',
-                    'sources': ['Data/TestTwoDimArrayData.cpp'],
-                    'deps': [sciqlop_core, qt5test]
-                },
-                    'name':'TestVectorSeries',
-                    'sources': [
-                                'Data/TestVectorSeries.cpp',
-                               ],
-                    'deps': [sciqlop_core, qt5test, DataSeriesTestsUtils_dep]
-                },
                     'name':'TestDataSourceController',
                     'sources': [
                                 'DataSource/TestDataSourceController.cpp',
                                 'DataSource/DataSourceItemBuilder.cpp'
                                ],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
                     'name':'TestDataSourceItem',
                     'sources': [
                                 'DataSource/TestDataSourceItem.cpp',
                                 'DataSource/DataSourceItemBuilder.cpp'
                                ],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
                     'name':'TestVariable',
                     'sources': ['Variable/TestVariable.cpp'],
                     'deps': [sciqlop_core, qt5test]
                 },
                 {
                     'name':'TestDownloader',
                     'sources': ['Network/TestDownloader.cpp'],
                     'deps': [sciqlop_core, qt5test, qt5Concurrent]
                 },
                 {
                     'name':'TestVariableController2',
                     'sources': ['Variable/TestVariableController2.cpp'],
                     'deps': [sciqlop_core, qt5test, qt5Concurrent, TestUtils_dep]
                 },
                 {
                     'name':'TestVariableController2Async',
                     'sources': ['Variable/TestVariableController2Async.cpp'],
                     'deps': [sciqlop_core, qt5test, qt5Concurrent, TestUtils_dep]
                 },
                 {
                     'name':'TestVariableController2WithSync',
                     'sources': ['Variable/TestVariableController2WithSync.cpp'],
                     'deps': [sciqlop_core, qt5test, qt5Concurrent, TestUtils_dep]
                 }
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test['sources'])
               test_exe = executable(unit_test['name'],unit_test['sources'] , test_moc_files,
                                       dependencies : unit_test['deps'],
             						  cpp_args : ['-DCORE_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/../tests-resources"']
             						  )
               test('Test-' + unit_test['name'], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test['name'])])
             endforeach

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages