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

fixed an overall deficiency where libraries did not include extensions. extensions can now mark themselves as libraries, and they thus become fully optional just as plugins do. additionally, a bug was fixed where plugins could be accidentally marked as required instead of optional. these changes resulted in a bcompat API bump to the extension/sharesys interface.

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401578
This commit is contained in:
David Anderson
2007-10-15 04:06:57 +00:00
parent 8eaf03c441
commit c803eb8328
13 changed files with 147 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/systems/ExtensionSys.cpp
+29 -3
View File
@@ -340,6 +340,11 @@ bool CExtension::IsRunning(char *error, size_t maxlength)
return m_pAPI->QueryRunning(error, maxlength);
}
void CExtension::AddLibrary(const char *library)
{
m_Libraries.push_back(library);
}
/*********************
* EXTENSION MANAGER *
*********************/
@@ -628,7 +633,9 @@ void CExtensionManager::BindAllNativesToPlugin(IPlugin *pPlugin)
{
WeakNative wkn = WeakNative((CPlugin *)pPlugin, i);
x_native->owner->m_WeakNatives.push_back(wkn);
} else if (exts.find(x_native->owner) == exts.end()) {
}
else if (exts.find(x_native->owner) == exts.end())
{
exts.push_back(x_native->owner);
}
}
@@ -677,6 +684,14 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
p_iter = pExt->m_Plugins.erase(p_iter);
}
List<String>::iterator s_iter;
for (s_iter = pExt->m_Libraries.begin();
s_iter != pExt->m_Libraries.end();
s_iter++)
{
g_PluginSys.OnLibraryAction((*s_iter).c_str(), false, true);
}
/* Unbound weak natives */
List<WeakNative>::iterator wkn_iter;
for (wkn_iter=pExt->m_WeakNatives.begin(); wkn_iter!=pExt->m_WeakNatives.end(); wkn_iter++)
@@ -718,7 +733,9 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
}
pAPI->NotifyInterfaceDrop((*i_iter).iface);
i_iter = pDep->m_Deps.erase(i_iter);
} else {
}
else
{
i_iter++;
}
}
@@ -729,7 +746,9 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
if ((*i_iter).owner == pExt)
{
i_iter = pDep->m_ChildDeps.erase(i_iter);
} else {
}
else
{
i_iter++;
}
}
@@ -1092,3 +1111,10 @@ CExtensionManager::CExtensionManager()
CExtensionManager::~CExtensionManager()
{
}
void CExtensionManager::AddLibrary(IExtension *pSource, const char *library)
{
CExtension *pExt = (CExtension *)pSource;
pExt->AddLibrary(library);
g_PluginSys.OnLibraryAction(library, false, false);
}
core/systems/ExtensionSys.h
+3
View File
@@ -78,6 +78,7 @@ public:
void AddPlugin(IPlugin *pPlugin);
void RemovePlugin(IPlugin *pPlugin);
void MarkAllLoaded();
void AddLibrary(const char *library);
private:
bool Load(char *error, size_t maxlength);
private:
@@ -93,6 +94,7 @@ private:
List<IPlugin *> m_Plugins;
List<const sp_nativeinfo_t *> m_Natives;
List<WeakNative> m_WeakNatives;
List<String> m_Libraries;
PluginId m_PlId;
unsigned int unload_code;
bool m_FullyLoaded;
@@ -132,6 +134,7 @@ public:
void MarkAllLoaded();
void AddDependency(IExtension *pSource, const char *file, bool required, bool autoload);
void TryAutoload();
void AddLibrary(IExtension *pSource, const char *library);
public:
CExtension *GetExtensionFromIdent(IdentityToken_t *ptr);
void Shutdown();
core/systems/PluginSys.cpp
+77 -23
View File
@@ -466,7 +466,7 @@ void CPlugin::LibraryActions(bool dropping)
iter != m_Libraries.end();
iter++)
{
g_PluginSys.OnLibraryAction((*iter).c_str(), dropping);
g_PluginSys.OnLibraryAction((*iter).c_str(), true, dropping);
}
}
@@ -988,7 +988,9 @@ LoadRes CPluginManager::_LoadPlugin(CPlugin **_plugin, const char *path, bool de
{
/* Autoload any modules */
LoadOrRequireExtensions(pPlugin, 1, error, maxlength);
} else {
}
else
{
pPlugin->SetErrorState(Plugin_Failed, "%s", error);
}
}
@@ -1156,12 +1158,16 @@ bool CPluginManager::FindOrRequirePluginDeps(CPlugin *pPlugin, char *error, size
return false;
}
}
} else {
}
else
{
/* Check that we aren't registering the same library twice */
if (pPlugin->m_RequiredLibs.find(name) == pPlugin->m_RequiredLibs.end())
{
pPlugin->m_RequiredLibs.push_back(name);
} else {
}
else
{
continue;
}
List<CPlugin *>::iterator iter;
@@ -1237,7 +1243,9 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
g_LibSys.PathFormat(path, PLATFORM_MAX_PATH, "%s", file);
g_Extensions.LoadAutoExtension(path);
}
} else if (pass == 2) {
}
else if (pass == 2)
{
/* Is this required? */
if (ext->required)
{
@@ -1256,10 +1264,32 @@ bool CPluginManager::LoadOrRequireExtensions(CPlugin *pPlugin, unsigned int pass
snprintf(error, maxlength, "Required extension \"%s\" file(\"%s\") not running", name, file);
}
return false;
} else {
}
else
{
g_Extensions.BindChildPlugin(pExt, pPlugin);
}
}
else
{
IPluginFunction *pFunc;
char buffer[64];
UTIL_Format(buffer, sizeof(buffer), "__ext_%s_SetNTVOptional", &pubvar->name[6]);
if ((pFunc = pBase->GetFunctionByName(buffer)) != NULL)
{
cell_t res;
pFunc->Execute(&res);
if (pPlugin->GetContext()->n_err != SP_ERROR_NONE)
{
if (error)
{
UTIL_Format(error, maxlength, "Fatal error during plugin initialization (ext req)");
}
return false;
}
}
}
}
}
}
@@ -1277,13 +1307,14 @@ bool CPluginManager::RunSecondPass(CPlugin *pPlugin, char *error, size_t maxleng
/* Bind all extra natives */
g_Extensions.BindAllNativesToPlugin(pPlugin);
AddFakeNativesToPlugin(pPlugin);
if (!FindOrRequirePluginDeps(pPlugin, error, maxlength))
{
return false;
}
AddFakeNativesToPlugin(pPlugin);
/* Find any unbound natives
* Right now, these are not allowed
*/
@@ -1345,7 +1376,7 @@ bool CPluginManager::RunSecondPass(CPlugin *pPlugin, char *error, size_t maxleng
s_iter != pPlugin->m_Libraries.end();
s_iter++)
{
OnLibraryAction((*s_iter).c_str(), false);
OnLibraryAction((*s_iter).c_str(), true, false);
}
return true;
@@ -1505,7 +1536,7 @@ bool CPluginManager::UnloadPlugin(IPlugin *plugin)
s_iter != pPlugin->m_Libraries.end();
s_iter++)
{
OnLibraryAction((*s_iter).c_str(), true);
OnLibraryAction((*s_iter).c_str(), true, true);
}
/* Go through all dependent plugins and tell them this plugin is now gone */
@@ -2409,7 +2440,7 @@ CPlugin *CPluginManager::GetPluginFromIdentity(IdentityToken_t *pToken)
return (CPlugin *)(pToken->ptr);
}
void CPluginManager::OnLibraryAction(const char *lib, bool drop)
void CPluginManager::OnLibraryAction(const char *lib, bool is_a_plugin, bool drop)
{
List<CPlugin *>::iterator iter;
@@ -2420,6 +2451,14 @@ void CPluginManager::OnLibraryAction(const char *lib, bool drop)
cell_t required;
} *plc;
struct _ext
{
cell_t name;
cell_t file;
cell_t autoload;
cell_t required;
} *ext;
const char *name = drop ? "OnLibraryRemoved" : "OnLibraryAdded";
for (iter=m_plugins.begin();
@@ -2445,23 +2484,38 @@ void CPluginManager::OnLibraryAction(const char *lib, bool drop)
{
continue;
}
if (strncmp(pubvar->name, "__pl_", 5) != 0)
if (is_a_plugin && strncmp(pubvar->name, "__pl_", 5) == 0)
{
continue;
plc = (_pl *)pubvar->offs;
if (plc->required)
{
continue;
}
char *str;
pContext->LocalToString(plc->name, &str);
if (strcmp(str, lib) != 0)
{
continue;
}
pf->PushString(lib);
pf->Execute(NULL);
}
plc = (_pl *)pubvar->offs;
if (plc->required)
else if (!is_a_plugin && strncmp(pubvar->name, "__ext_", 6) == 0)
{
continue;
ext = (_ext *)pubvar->offs;
if (ext->required)
{
continue;
}
char *str;
pContext->LocalToString(ext->name, &str);
if (strcmp(str, lib) != 0)
{
continue;
}
pf->PushString(lib);
pf->Execute(NULL);
}
char *str;
pContext->LocalToString(plc->name, &str);
if (strcmp(str, lib) != 0)
{
continue;
}
pf->PushString(lib);
pf->Execute(NULL);
}
}
}
core/systems/PluginSys.h
+1 -1
View File
@@ -431,7 +431,7 @@ public:
void Shutdown();
void OnLibraryAction(const char *lib, bool drop);
void OnLibraryAction(const char *lib, bool is_a_plugin, bool drop);
bool LibraryExists(const char *lib);
core/systems/ShareSys.cpp
+4
View File
@@ -239,3 +239,7 @@ void ShareSystem::AddDependency(IExtension *myself, const char *filename, bool r
g_Extensions.AddDependency(myself, filename, require, autoload);
}
void ShareSystem::RegisterLibrary(IExtension *myself, const char *name)
{
g_Extensions.AddLibrary(myself, name);
}
core/systems/ShareSys.h
+1
View File
@@ -80,6 +80,7 @@ public: //IShareSys
void DestroyIdentType(IdentityType_t type);
void DestroyIdentity(IdentityToken_t *identity);
void AddDependency(IExtension *myself, const char *filename, bool require, bool autoload);
void RegisterLibrary(IExtension *myself, const char *name);
public: //SMGlobalClass
/* Pre-empt in case anything tries to register idents early */
void OnSourceModStartup(bool late);