PIPluginLoader patch for several plugins
This commit is contained in:
@@ -162,37 +162,70 @@
|
||||
|
||||
|
||||
PIPluginInfo::PIPluginInfo() {
|
||||
in_plugin = false;
|
||||
}
|
||||
|
||||
|
||||
void PIPluginInfo::setUserVersion(const PIString & v) {
|
||||
user_version[in_plugin ? 1 : 0] = v;
|
||||
user_version = v;
|
||||
}
|
||||
|
||||
|
||||
void PIPluginInfo::setStaticSection(int type, void * ptr) {
|
||||
static_sections[in_plugin ? 1 : 0][type] = ptr;
|
||||
static_sections[type] = ptr;
|
||||
}
|
||||
|
||||
|
||||
PIString PIPluginInfo::userVersion(bool plugin) const {
|
||||
return user_version[plugin ? 1 : 0];
|
||||
PIString PIPluginInfo::userVersion() const {
|
||||
return user_version;
|
||||
}
|
||||
|
||||
|
||||
PIMap<int, void *> PIPluginInfo::staticSections(bool plugin) const {
|
||||
return static_sections[plugin ? 1 : 0];
|
||||
PIMap<int, void *> PIPluginInfo::staticSections() const {
|
||||
return static_sections;
|
||||
}
|
||||
|
||||
|
||||
void PIPluginInfo::enterPlugin() {
|
||||
in_plugin = true;
|
||||
|
||||
|
||||
|
||||
PIPluginInfoStorage::PIPluginInfoStorage() {
|
||||
enterPlugin(0);
|
||||
}
|
||||
|
||||
|
||||
PIPluginInfo * PIPluginInfo::instance() {
|
||||
static PIPluginInfo ret;
|
||||
PIPluginInfo * PIPluginInfoStorage::currentInfo() {
|
||||
return info[current];
|
||||
}
|
||||
|
||||
|
||||
PIPluginInfo * PIPluginInfoStorage::pluginInfo(void * p) {
|
||||
return info.value(p, nullptr);
|
||||
}
|
||||
|
||||
|
||||
PIPluginInfo * PIPluginInfoStorage::applicationInfo() {
|
||||
return info[0];
|
||||
}
|
||||
|
||||
|
||||
PIPluginInfo * PIPluginInfoStorage::enterPlugin(void * p) {
|
||||
current = p;
|
||||
PIPluginInfo *& i(info[p]);
|
||||
if (!i) i = new PIPluginInfo();
|
||||
return i;
|
||||
}
|
||||
|
||||
|
||||
void PIPluginInfoStorage::unloadPlugin(void * p) {
|
||||
if (current == p) current = 0;
|
||||
PIPluginInfo *& i(info[p]);
|
||||
if (!i) delete i;
|
||||
info.remove(p);
|
||||
}
|
||||
|
||||
|
||||
PIPluginInfoStorage * PIPluginInfoStorage::instance() {
|
||||
static PIPluginInfoStorage ret;
|
||||
return &ret;
|
||||
}
|
||||
|
||||
@@ -201,61 +234,61 @@ PIPluginInfo * PIPluginInfo::instance() {
|
||||
|
||||
PIPluginLoader::PIPluginLoader(const PIString & name) {
|
||||
func_loader_version = nullptr;
|
||||
func_plugin_info = nullptr;
|
||||
func_static_merge = nullptr;
|
||||
plugin_info = nullptr;
|
||||
error = Unknown;
|
||||
loaded = false;
|
||||
messages = true;
|
||||
if (!name.isEmpty())
|
||||
load(name);
|
||||
}
|
||||
|
||||
|
||||
PIPluginLoader::~PIPluginLoader() {
|
||||
lib.unload();
|
||||
unload();
|
||||
}
|
||||
|
||||
|
||||
bool PIPluginLoader::load(const PIString & name) {
|
||||
unload();
|
||||
PIPluginInfo * ai = PIPluginInfoStorage::instance()->applicationInfo();
|
||||
PIPluginInfo * pi = PIPluginInfoStorage::instance()->enterPlugin(this);
|
||||
if (!lib.load(findLibrary(name))) {
|
||||
piCout << "Load plugin \"" << name << "\"load failed with error: " << lib.lastError().trimmed();
|
||||
unload();
|
||||
error = LibraryLoadError;
|
||||
error_str = "Load plugin \"" + name + "\" error: can`t load lib: " + lib.lastError();
|
||||
if (messages) piCout << error_str;
|
||||
return false;
|
||||
}
|
||||
//piCout << "loading" << lib.path() << "...";
|
||||
func_loader_version = (FunctionLoaderVersion)lib.resolve(STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__));
|
||||
if (!func_loader_version) {
|
||||
piCout << "Load plugin \"" << name << "\" error: can`t find" << STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__);
|
||||
unload();
|
||||
error = MissingSymbols;
|
||||
error_str = "Load plugin \"" + name + "\" error: can`t find " + STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__);
|
||||
if (messages) piCout << error_str;
|
||||
return false;
|
||||
}
|
||||
if (__PIP_PLUGIN_LOADER_VERSION__ != func_loader_version()) {
|
||||
piCout << "Load plugin \"" << name << "\" error: invalid loader version: plugin" << __PIP_PLUGIN_LOADER_VERSION__ << "!=" << func_loader_version();
|
||||
unload();
|
||||
error = InvalidLoaderVersion;
|
||||
error_str = "Load plugin \"" + name + "\" error: invalid loader version: application = " + PIString::fromNumber(func_loader_version())
|
||||
+ ", plugin = " + PIString::fromNumber(__PIP_PLUGIN_LOADER_VERSION__);
|
||||
if (messages) piCout << error_str;
|
||||
return false;
|
||||
}
|
||||
func_plugin_info = (FunctionPluginInfo)lib.resolve(STR(__PIP_PLUGIN_PLUGIN_INFO_FUNC__));
|
||||
if (!func_plugin_info) {
|
||||
piCout << "Load plugin \"" << name << "\" error: can`t find" << STR(__PIP_PLUGIN_PLUGIN_INFO_FUNC__);
|
||||
unload();
|
||||
return false;
|
||||
}
|
||||
plugin_info = func_plugin_info();
|
||||
if (!plugin_info) {
|
||||
piCout << "Load plugin \"" << name << "\" error: null PIPluginInfo";
|
||||
unload();
|
||||
return false;
|
||||
}
|
||||
if (PIPluginInfo::instance()->userVersion(false).size_s() > 1) {
|
||||
PIString pversion = plugin_info->userVersion(true), lversion = PIPluginInfo::instance()->userVersion(false);
|
||||
if (ai->userVersion().size_s() > 1) {
|
||||
PIString pversion = pi->userVersion(), lversion = ai->userVersion();
|
||||
if (pversion != lversion) {
|
||||
piCout << "Load plugin \"" << name << "\" error: invalid user version: plugin" << pversion << "!=" << lversion;
|
||||
unload();
|
||||
error = InvalidUserVersion;
|
||||
error_str = "Load plugin \"" + name + "\" error: invalid user version: application = " + lversion + ", plugin = " + pversion;
|
||||
if (messages) piCout << error_str;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
func_static_merge = (FunctionStaticMerge)lib.resolve(STR(__PIP_PLUGIN_STATIC_MERGE_FUNC__));
|
||||
if (func_static_merge) {
|
||||
auto pss = plugin_info->staticSections(true), lss = PIPluginInfo::instance()->staticSections(false);
|
||||
auto pss = pi->staticSections(), lss = ai->staticSections();
|
||||
//piCout << lss.keys() << pss.keys();
|
||||
auto it = lss.makeIterator();
|
||||
while (it.next()) {
|
||||
@@ -267,14 +300,17 @@ bool PIPluginLoader::load(const PIString & name) {
|
||||
}
|
||||
}
|
||||
loaded = true;
|
||||
error = NoError;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void PIPluginLoader::unload() {
|
||||
lib.unload();
|
||||
plugin_info = nullptr;
|
||||
loaded = false;
|
||||
error_str.clear();
|
||||
error = Unknown;
|
||||
PIPluginInfoStorage::instance()->unloadPlugin(this);
|
||||
}
|
||||
|
||||
|
||||
@@ -283,13 +319,28 @@ bool PIPluginLoader::isLoaded() const {
|
||||
}
|
||||
|
||||
|
||||
PIString PIPluginLoader::libPath() {
|
||||
return lib.path();
|
||||
PIPluginLoader::Error PIPluginLoader::lastError() const {
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
PIString PIPluginLoader::lastError() {
|
||||
return lib.lastError();
|
||||
PIString PIPluginLoader::lastErrorText() const {
|
||||
return error_str;
|
||||
}
|
||||
|
||||
|
||||
void PIPluginLoader::setMessages(bool yes) {
|
||||
messages = yes;
|
||||
}
|
||||
|
||||
|
||||
bool PIPluginLoader::isMessages() const {
|
||||
return messages;
|
||||
}
|
||||
|
||||
|
||||
PIString PIPluginLoader::libPath() {
|
||||
return lib.path();
|
||||
}
|
||||
|
||||
|
||||
@@ -300,8 +351,10 @@ void * PIPluginLoader::resolve(const char * name) {
|
||||
|
||||
|
||||
void PIPluginLoader::mergeStatic() {
|
||||
if (!loaded || !func_static_merge || !plugin_info) return;
|
||||
auto pss = plugin_info->staticSections(true), lss = PIPluginInfo::instance()->staticSections(false);
|
||||
if (!loaded || !func_static_merge) return;
|
||||
PIPluginInfo * ai = PIPluginInfoStorage::instance()->applicationInfo();
|
||||
PIPluginInfo * pi = PIPluginInfoStorage::instance()->pluginInfo(this);
|
||||
auto pss = pi->staticSections(), lss = ai->staticSections();
|
||||
auto it = lss.makeIterator();
|
||||
while (it.next()) {
|
||||
if (!pss.contains(it.key()))
|
||||
|
||||
Reference in New Issue
Block a user