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

sourcepawn: uplift FakeNative to DynamicNative. (#1338)

Browse Source 
This removes calls to CreateFakeNative.
This commit is contained in:
David Anderson 2020-10-02 16:42:31 -07:00 committed by GitHub
parent 589d6df75d
commit e0d9dfb68e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/logic/Native.h
View File

@ -46,16 +46,14 @@ struct FakeNative
FakeNative(const char *name, IPluginFunction *fun) FakeNative(const char *name, IPluginFunction *fun)
: name(name), : name(name),
ctx(fun->GetParentContext()), ctx(fun->GetParentContext()),
call(fun), call(fun)
gate(NULL)
{ {
} }
~FakeNative();
std::string name; std::string name;
IPluginContext *ctx; IPluginContext *ctx;
IPluginFunction *call; IPluginFunction *call;
SPVM_NATIVE_FUNC gate; ke::RefPtr<INativeCallback> wrapper;
}; };
struct Native : public ke::Refcounted<Native> struct Native : public ke::Refcounted<Native>
@ -66,10 +64,10 @@ struct Native : public ke::Refcounted<Native>
fake(nullptr) fake(nullptr)
{ {
} }
Native(CNativeOwner *owner, FakeNative *fake) Native(CNativeOwner *owner, std::unique_ptr<FakeNative>&& fake)
: owner(owner), : owner(owner),
native(nullptr), native(nullptr),
fake(fake) fake(std::move(fake))
{ {
} }
@ -77,12 +75,6 @@ struct Native : public ke::Refcounted<Native>
const sp_nativeinfo_t *native; const sp_nativeinfo_t *native;
std::unique_ptr<FakeNative> fake; std::unique_ptr<FakeNative> fake;
SPVM_NATIVE_FUNC func() const
{
if (native)
return native->func;
return fake->gate;
}
const char *name() const const char *name() const
{ {
if (native) if (native)

48
core/logic/ShareSys.cpp
View File

@ -364,11 +364,11 @@ void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *native
} }
} }
pPlugin->GetRuntime()->UpdateNativeBinding( auto rt = pPlugin->GetRuntime();
index, if (pEntry->fake)
pEntry->func(), rt->UpdateNativeBindingObject(index, pEntry->fake->wrapper, flags, nullptr);
flags, else
nullptr); rt->UpdateNativeBinding(index, pEntry->native->func, flags, nullptr);
} }
AlreadyRefed<Native> ShareSystem::AddNativeToCache(CNativeOwner *pOwner, const sp_nativeinfo_t *ntv) AlreadyRefed<Native> ShareSystem::AddNativeToCache(CNativeOwner *pOwner, const sp_nativeinfo_t *ntv)
@ -382,11 +382,6 @@ AlreadyRefed<Native> ShareSystem::AddNativeToCache(CNativeOwner *pOwner, const s
return entry.forget(); return entry.forget();
} }
FakeNative::~FakeNative()
{
g_pSourcePawn2->DestroyFakeNative(gate);
}
void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name) void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
{ {
NativeCache::Result r = m_NtvCache.find(name); NativeCache::Result r = m_NtvCache.find(name);
@ -403,6 +398,32 @@ void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
m_NtvCache.remove(r); m_NtvCache.remove(r);
} }
class DynamicNative final : public INativeCallback
{
public:
DynamicNative(SPVM_FAKENATIVE_FUNC callback, void* data)
: callback_(callback),
data_(data)
{}
void AddRef() override {
refcount_++;
}
void Release() override {
assert(refcount_ > 0);
if (--refcount_ == 0)
delete this;
}
int Invoke(IPluginContext* ctx, const cell_t* params) override {
return callback_(ctx, params, data_);
}
private:
size_t refcount_ = 0;
SPVM_FAKENATIVE_FUNC callback_;
void* data_;
};
AlreadyRefed<Native> ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func) AlreadyRefed<Native> ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func)
{ {
RefPtr<Native> entry(FindNative(name)); RefPtr<Native> entry(FindNative(name));
@ -410,14 +431,11 @@ AlreadyRefed<Native> ShareSystem::AddFakeNative(IPluginFunction *pFunc, const ch
return nullptr; return nullptr;
std::unique_ptr<FakeNative> fake(new FakeNative(name, pFunc)); std::unique_ptr<FakeNative> fake(new FakeNative(name, pFunc));
fake->wrapper = new DynamicNative(func, fake.get());
fake->gate = g_pSourcePawn2->CreateFakeNative(func, fake.get());
if (!fake->gate)
return nullptr;
CNativeOwner *owner = g_PluginSys.GetPluginByCtx(fake->ctx->GetContext()); CNativeOwner *owner = g_PluginSys.GetPluginByCtx(fake->ctx->GetContext());
entry = new Native(owner, fake.release()); entry = new Native(owner, std::move(fake));
m_NtvCache.insert(name, entry); m_NtvCache.insert(name, entry);
return entry.forget(); return entry.forget();

2
sourcepawn

@ -1 +1 @@
Subproject commit 3ec6182c993a7717d81cbc6ab5dfec553de7387f Subproject commit 3c76ed00a3908868825e04da7e588e7b4595c752