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

Replace CLibrary with a wrapper around ke::SharedLib.

Browse Source
This commit is contained in:
David Anderson 2015-08-27 13:50:45 -04:00
parent e78fe93e92
commit 5ecd906905
2 changed files with 13 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
core/LibrarySys.cpp
View File

@ -1,5 +1,5 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@ -39,22 +39,9 @@
LibrarySystem g_LibSys; LibrarySystem g_LibSys;
CLibrary::~CLibrary() CLibrary::CLibrary(ke::Ref<ke::SharedLib> lib)
: lib_(lib)
{ {
if (m_lib)
{
#if defined PLATFORM_WINDOWS
FreeLibrary(m_lib);
#elif defined PLATFORM_POSIX
dlclose(m_lib);
#endif
m_lib = NULL;
}
}
CLibrary::CLibrary(LibraryHandle me)
{
m_lib = me;
} }
void CLibrary::CloseLibrary() void CLibrary::CloseLibrary()
@ -64,11 +51,7 @@ void CLibrary::CloseLibrary()
void *CLibrary::GetSymbolAddress(const char *symname) void *CLibrary::GetSymbolAddress(const char *symname)
{ {
#if defined PLATFORM_WINDOWS return lib_->lookup(symname);
return GetProcAddress(m_lib, symname);
#elif defined PLATFORM_POSIX
return dlsym(m_lib, symname);
#endif
} }
@ -307,18 +290,6 @@ void LibrarySystem::GetPlatformErrorEx(int code, char *error, size_t maxlength)
} }
} }
void LibrarySystem::GetLoaderError(char *buffer, size_t maxlength)
{
#if defined PLATFORM_WINDOWS
GetPlatformError(buffer, maxlength);
#elif defined PLATFORM_POSIX
if (buffer != NULL && maxlength)
{
strncopy(buffer, dlerror(), maxlength);
}
#endif
}
void LibrarySystem::CloseDirectory(IDirectory *dir) void LibrarySystem::CloseDirectory(IDirectory *dir)
{ {
delete dir; delete dir;
@ -326,19 +297,9 @@ void LibrarySystem::CloseDirectory(IDirectory *dir)
ILibrary *LibrarySystem::OpenLibrary(const char *path, char *error, size_t maxlength) ILibrary *LibrarySystem::OpenLibrary(const char *path, char *error, size_t maxlength)
{ {
LibraryHandle lib; ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(path, error, maxlength);
#if defined PLATFORM_WINDOWS if (!lib)
lib = LoadLibraryA(path); return nullptr;
#elif defined PLATFORM_POSIX
lib = dlopen(path, RTLD_NOW);
#endif
if (lib == NULL)
{
GetLoaderError(error, maxlength);
return NULL;
}
return new CLibrary(lib); return new CLibrary(lib);
} }

19
core/LibrarySys.h
View File

@ -1,5 +1,5 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved.
@ -33,16 +33,11 @@
#define _INCLUDE_SOURCEMOD_SYSTEM_LIBRARY_H_ #define _INCLUDE_SOURCEMOD_SYSTEM_LIBRARY_H_
#include <ILibrarySys.h> #include <ILibrarySys.h>
#include <amtl/os/am-shared-library.h>
#include "sm_platform.h" #include "sm_platform.h"
using namespace SourceMod; using namespace SourceMod;
#if defined PLATFORM_WINDOWS
typedef HMODULE LibraryHandle;
#elif defined PLATFORM_POSIX
typedef void * LibraryHandle;
#endif
class CDirectory : public IDirectory class CDirectory : public IDirectory
{ {
public: public:
@ -71,13 +66,12 @@ private:
class CLibrary : public ILibrary class CLibrary : public ILibrary
{ {
public: public:
CLibrary(LibraryHandle me); CLibrary(ke::Ref<ke::SharedLib> lib);
~CLibrary();
public: public:
void CloseLibrary(); void CloseLibrary() override;
void *GetSymbolAddress(const char *symname); void *GetSymbolAddress(const char *symname) override;
private: private:
LibraryHandle m_lib; ke::Ref<ke::SharedLib> lib_;
}; };
class LibrarySystem : public ILibrarySys class LibrarySystem : public ILibrarySys
@ -96,7 +90,6 @@ public:
bool CreateFolder(const char *path); bool CreateFolder(const char *path);
size_t GetFileFromPath(char *buffer, size_t maxlength, const char *path); size_t GetFileFromPath(char *buffer, size_t maxlength, const char *path);
bool FileTime(const char *path, FileTimeType type, time_t *pTime); bool FileTime(const char *path, FileTimeType type, time_t *pTime);
void GetLoaderError(char *buffer, size_t maxlength);
}; };
extern LibrarySystem g_LibSys; extern LibrarySystem g_LibSys;