rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactored adding plugin only after loaded #4866 

Conflicts:
	src/lib/arch/unix/ArchPluginUnix.cpp
This commit is contained in:
Jerry (Xinyu Hou) 2015-07-16 12:09:55 -07:00
parent a99699df7a
commit 6602ebe435
5 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/arch/IArchPlugin.h
View File

@ -70,7 +70,8 @@ public:
*/
virtual void* invoke(const char* plugin,
const char* command,
void** args) = 0;
void** args,
void* library = NULL) = 0;
//@}

38
src/lib/arch/unix/ArchPluginUnix.cpp
View File

@ -83,21 +83,20 @@ ArchPluginUnix::load()
}
String filename = synergy::string::removeFileExt(*it);
m_pluginTable.insert(std::make_pair(filename, library));
size_t pos = filename.find("lib");
String pluginName = filename.substr(pos + 3);
char* version = (char*)invoke(filename.c_str(), "version", NULL);
char* version = (char*)invoke(filename.c_str(), "version", NULL, library);
String expectedVersion(pluginVersion(pluginName.c_str()));
if (version != NULL && expectedVersion.compare(version) == 0) {
LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(), version));
m_pluginTable.insert(std::make_pair(filename, library));
}
else {
LOG((CLOG_WARN "plugin version doesn't match"));
LOG((CLOG_DEBUG "expected plugin version: %s actual plugin version: %s",
expectedVersion.c_str(), version));
LOG((CLOG_WARN "skip plugin: %s", (*it).c_str()));
m_pluginTable.erase(filename);
dlclose(library);
}
}
@ -166,20 +165,16 @@ void*
ArchPluginUnix::invoke(
const char* plugin,
const char* command,
void** args)
void** args,
void* library)
{
void* lib = NULL;
if (library == NULL) {
PluginTable::iterator it;
it = m_pluginTable.find(plugin);
if (it != m_pluginTable.end()) {
invokeFunc invokePlugin = (invokeFunc)dlsym(it->second, "invoke");
void* result = NULL;
if (invokePlugin != NULL) {
result = invokePlugin(command, args);
}
else {
LOG((CLOG_DEBUG "no invoke function in %s", it->first.c_str()));
}
return result;
lib = it->second;
}
else {
LOG((CLOG_DEBUG "invoke command failed, plugin: %s command: %s",
@ -187,6 +182,21 @@ ArchPluginUnix::invoke(
return NULL;
}
}
else {
lib = library;
}
invokeFunc invokePlugin = (invokeFunc)dlsym(lib, "invoke");
void* result = NULL;
if (invokePlugin != NULL) {
result = invokePlugin(command, args);
}
else {
LOG((CLOG_DEBUG "no invoke function in %s", plugin));
}
return result;
}
String
ArchPluginUnix::getPluginsDir()

3
src/lib/arch/unix/ArchPluginUnix.h
View File

@ -38,7 +38,8 @@ public:
bool exists(const char* name);
virtual void* invoke(const char* pluginName,
const char* functionName,
void** args);
void** args,
void* library = NULL);
private:
String getPluginsDir();

40
src/lib/arch/win32/ArchPluginWindows.cpp
View File

@ -70,19 +70,18 @@ ArchPluginWindows::load()
void* lib = reinterpret_cast<void*>(library);
String pluginName = synergy::string::removeFileExt(*it);
m_pluginTable.insert(std::make_pair(pluginName, lib));
char* version = (char*)invoke(pluginName.c_str(), "version", NULL);
char* version = (char*)invoke(pluginName.c_str(), "version", NULL, lib);
String expectedVersion(pluginVersion(pluginName.c_str()));
if (version != NULL && expectedVersion.compare(version) == 0) {
LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(), version));
m_pluginTable.insert(std::make_pair(pluginName, lib));
}
else {
LOG((CLOG_WARN "plugin version doesn't match"));
LOG((CLOG_DEBUG "expected plugin version: %s actual plugin version: %s",
expectedVersion.c_str(), version));
LOG((CLOG_WARN "skip plugin: %s", (*it).c_str()));
m_pluginTable.erase(pluginName);
FreeLibrary(library);
}
}
@ -158,22 +157,16 @@ void*
ArchPluginWindows::invoke(
const char* plugin,
const char* command,
void** args)
void** args,
void* library)
{
HINSTANCE lib = NULL;
if (library == NULL) {
PluginTable::iterator it;
it = m_pluginTable.find(plugin);
if (it != m_pluginTable.end()) {
HINSTANCE lib = reinterpret_cast<HINSTANCE>(it->second);
invokeFunc invokePlugin = (invokeFunc)GetProcAddress(lib, "invoke");
void* result = NULL;
if (invokePlugin != NULL) {
result = invokePlugin(command, args);
}
else {
LOG((CLOG_DEBUG "no invoke function in %s", it->first.c_str()));
}
return result;
lib = reinterpret_cast<HINSTANCE>(it->second);
}
else {
LOG((CLOG_DEBUG "invoke command failed, plugin: %s command: %s",
@ -181,6 +174,21 @@ ArchPluginWindows::invoke(
return NULL;
}
}
else {
lib = reinterpret_cast<HINSTANCE>(library);
}
invokeFunc invokePlugin = (invokeFunc)GetProcAddress(lib, "invoke");
void* result = NULL;
if (invokePlugin != NULL) {
result = invokePlugin(command, args);
}
else {
LOG((CLOG_DEBUG "no invoke function in %s", plugin));
}
return result;
}
void
ArchPluginWindows::getFilenames(const String& pattern, std::vector<String>& filenames)

3
src/lib/arch/win32/ArchPluginWindows.h
View File

@ -41,7 +41,8 @@ public:
bool exists(const char* name);
void* invoke(const char* pluginName,
const char* functionName,
void** args);
void** args,
void* library = NULL);
private:
void getFilenames(const String& pattern, std::vector<String>& filenames);