SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PIVariantSimple now has no error when assign to non-copyable typeName

Browse Source 
patch pip_cmg according to last PIByteArray changes
plugin system fix
This commit is contained in:
Пелипенко Иван
2020-10-03 13:32:43 +03:00
parent 7421f8c9a0
commit b7aef483b7
5 changed files with 86 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
libs/main/system/piplugin.cpp
View File

@@ -27,6 +27,36 @@
#define STR(s) STR_WF(s)
PIPluginInfo::PIPluginInfo() {
in_plugin = false;
}
void PIPluginInfo::setUserVersion(const PIString & v) {
user_version[in_plugin ? 1 : 0] = v;
}
void PIPluginInfo::setStaticSection(int type, void * ptr) {
static_sections[in_plugin ? 1 : 0][type] = ptr;
}
PIString PIPluginInfo::userVersion(bool plugin) const {
return user_version[plugin ? 1 : 0];
}
PIMap<int, void *> PIPluginInfo::staticSections(bool plugin) const {
return static_sections[plugin ? 1 : 0];
}
void PIPluginInfo::enterPlugin() {
in_plugin = true;
}
PIPluginInfo * PIPluginInfo::instance() {
static PIPluginInfo ret;
return &ret;
@@ -78,8 +108,8 @@ bool PIPluginLoader::load(const PIString & name) {
unload();
return false;
}
if (PIPluginInfo::instance()->user_version.size_s() > 1) {
PIString pversion = plugin_info->user_version, lversion = PIPluginInfo::instance()->user_version;
if (PIPluginInfo::instance()->userVersion(false).size_s() > 1) {
PIString pversion = plugin_info->userVersion(true), lversion = PIPluginInfo::instance()->userVersion(false);
if (pversion != lversion) {
piCout << "Load plugin \"" << name << "\" error: invalid user version: plugin" << pversion << "!=" << lversion;
unload();
@@ -88,12 +118,16 @@ bool PIPluginLoader::load(const PIString & name) {
}
func_static_merge = (FunctionStaticMerge)lib.resolve(STR(__PIP_PLUGIN_STATIC_MERGE_FUNC__));
if (func_static_merge) {
piCout << PIPluginInfo::instance()->static_sections.keys() << plugin_info->static_sections.keys();
auto it = PIPluginInfo::instance()->static_sections.makeIterator();
auto pss = plugin_info->staticSections(true), lss = PIPluginInfo::instance()->staticSections(false);
piCout << lss.keys() << pss.keys();
auto it = lss.makeIterator();
while (it.next()) {
if (!plugin_info->static_sections.contains(it.key()))
if (!pss.contains(it.key()))
continue;
func_static_merge(it.key(), plugin_info->static_sections.value(it.key()), it.value());
void * from = pss.value(it.key()), * to = it.value();
if (from != to)
func_static_merge(it.key(), from, to);
}
}
loaded = true;
@@ -121,11 +155,14 @@ void * PIPluginLoader::resolve(const char * name) {
void PIPluginLoader::mergeStatic() {
if (!loaded || !func_static_merge || !plugin_info) return;
auto it = PIPluginInfo::instance()->static_sections.makeIterator();
auto pss = plugin_info->staticSections(true), lss = PIPluginInfo::instance()->staticSections(false);
auto it = lss.makeIterator();
while (it.next()) {
if (!plugin_info->static_sections.contains(it.key()))
if (!pss.contains(it.key()))
continue;
func_static_merge(it.key(), it.value(), plugin_info->static_sections.value(it.key()));
void * from = it.value(), * to = pss.value(it.key());
if (from != to)
func_static_merge(it.key(), from, to);
}
}