UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify required libs handling and make sure they create dependency links.

Browse Source
This commit is contained in:
David Anderson 2015-08-14 19:16:28 -07:00
parent 0aaa659e29
commit 3430962cbe
1 changed files with 32 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
core/logic/PluginSys.cpp
View File

@ -629,15 +629,11 @@ void CPlugin::DependencyDropped(CPlugin *pOwner)
if (!m_pRuntime) if (!m_pRuntime)
return; return;
List<String>::iterator reqlib_iter; for (auto lib_iter=pOwner->m_Libraries.begin(); lib_iter!=pOwner->m_Libraries.end(); lib_iter++) {
List<String>::iterator lib_iter; if (m_RequiredLibs.find(*lib_iter) != m_RequiredLibs.end()) {
for (lib_iter=pOwner->m_Libraries.begin(); lib_iter!=pOwner->m_Libraries.end(); lib_iter++) m_LibraryMissing = true;
{ break;
for (reqlib_iter=m_RequiredLibs.begin(); reqlib_iter!=m_RequiredLibs.end(); reqlib_iter++) }
{
if ((*reqlib_iter) == (*lib_iter))
m_LibraryMissing = true;
}
} }
unsigned int unbound = 0; unsigned int unbound = 0;
@ -1146,35 +1142,23 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
char *name, *file; char *name, *file;
char pathfile[PLATFORM_MAX_PATH]; char pathfile[PLATFORM_MAX_PATH];
for (uint32_t i=0; i<num; i++) for (uint32_t i=0; i<num; i++) {
{
if (pBase->GetPubvarByIndex(i, &pubvar) != SP_ERROR_NONE) if (pBase->GetPubvarByIndex(i, &pubvar) != SP_ERROR_NONE)
{
continue; continue;
} if (strncmp(pubvar->name, "__pl_", 5) == 0) {
if (strncmp(pubvar->name, "__pl_", 5) == 0)
{
pl = (_pl *)pubvar->offs; pl = (_pl *)pubvar->offs;
if (pBase->LocalToString(pl->file, &file) != SP_ERROR_NONE) if (pBase->LocalToString(pl->file, &file) != SP_ERROR_NONE)
{
continue; continue;
}
if (pBase->LocalToString(pl->name, &name) != SP_ERROR_NONE) if (pBase->LocalToString(pl->name, &name) != SP_ERROR_NONE)
{
continue; continue;
}
libsys->GetFileFromPath(pathfile, sizeof(pathfile), pPlugin->GetFilename()); libsys->GetFileFromPath(pathfile, sizeof(pathfile), pPlugin->GetFilename());
if (strcmp(pathfile, file) == 0) if (strcmp(pathfile, file) == 0)
{
continue; continue;
} if (pl->required == false) {
if (pl->required == false)
{
IPluginFunction *pFunc; IPluginFunction *pFunc;
char buffer[64]; char buffer[64];
ke::SafeSprintf(buffer, sizeof(buffer), "__pl_%s_SetNTVOptional", &pubvar->name[5]); ke::SafeSprintf(buffer, sizeof(buffer), "__pl_%s_SetNTVOptional", &pubvar->name[5]);
if ((pFunc=pBase->GetFunctionByName(buffer))) if ((pFunc=pBase->GetFunctionByName(buffer))) {
{
cell_t res; cell_t res;
if (pFunc->Execute(&res) != SP_ERROR_NONE) { if (pFunc->Execute(&res) != SP_ERROR_NONE) {
if (error) if (error)
@ -1182,38 +1166,28 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
return false; return false;
} }
} }
} } else {
else
{
/* Check that we aren't registering the same library twice */ /* Check that we aren't registering the same library twice */
if (pPlugin->m_RequiredLibs.find(name) == pPlugin->m_RequiredLibs.end()) if (pPlugin->m_RequiredLibs.find(name) != pPlugin->m_RequiredLibs.end())
{
pPlugin->m_RequiredLibs.push_back(name);
}
else
{
continue; continue;
}
List<CPlugin *>::iterator iter; pPlugin->m_RequiredLibs.push_back(name);
CPlugin *pl;
bool found = false; CPlugin *found;
for (iter=m_plugins.begin(); iter!=m_plugins.end(); iter++) for (auto iter=m_plugins.begin(); iter!=m_plugins.end(); iter++) {
{ CPlugin *pl = (*iter);
pl = (*iter); if (pl->m_Libraries.find(name) != pl->m_Libraries.end()) {
if (pl->m_Libraries.find(name) != pl->m_Libraries.end()) found = pl;
{
found = true;
break; break;
} }
} }
if (!found) if (!found) {
{
if (error) if (error)
{
ke::SafeSprintf(error, maxlength, "Could not find required plugin \"%s\"", name); ke::SafeSprintf(error, maxlength, "Could not find required plugin \"%s\"", name);
}
return false; return false;
} }
found->AddDependent(pPlugin);
} }
} }
} }
@ -1423,29 +1397,21 @@ void CPluginManager::TryRefreshDependencies(CPlugin *pPlugin)
g_ShareSys.BindNativesToPlugin(pPlugin, false); g_ShareSys.BindNativesToPlugin(pPlugin, false);
List<String>::iterator lib_iter; for (auto req_iter=pPlugin->m_RequiredLibs.begin(); req_iter!=pPlugin->m_RequiredLibs.end(); req_iter++) {
List<String>::iterator req_iter; CPlugin *found = nullptr;
List<CPlugin *>::iterator pl_iter; for (auto pl_iter=m_plugins.begin(); pl_iter!=m_plugins.end(); pl_iter++) {
CPlugin *pl; CPlugin *search = (*pl_iter);
for (req_iter=pPlugin->m_RequiredLibs.begin(); req_iter!=pPlugin->m_RequiredLibs.end(); req_iter++) if (search->m_Libraries.find(*req_iter) != search->m_Libraries.end()) {
{ found = search;
bool found = false; break;
for (pl_iter=m_plugins.begin(); pl_iter!=m_plugins.end(); pl_iter++)
{
pl = (*pl_iter);
for (lib_iter=pl->m_Libraries.begin(); lib_iter!=pl->m_Libraries.end(); lib_iter++)
{
if ((*req_iter) == (*lib_iter))
{
found = true;
}
} }
} }
if (!found) if (!found) {
{
pPlugin->SetErrorState(Plugin_Error, "Library not found: %s", (*req_iter).c_str()); pPlugin->SetErrorState(Plugin_Error, "Library not found: %s", (*req_iter).c_str());
return; return;
} }
found->AddDependent(pPlugin);
} }
/* Find any unbound natives /* Find any unbound natives