LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

The Variant class is now meant to be used on the stack instead of allocated on the heap. As a result (and because of related changes), performance of Channels has roughly doubled when pushing and popping most types.

Browse Source
This commit is contained in:
Alex Szpakowski
2016-02-14 16:39:32 -04:00
parent 7995e6ba85
commit 23fcaec89f
13 changed files with 287 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/wrap_Channel.cpp
+13 -35
View File
@@ -25,20 +25,6 @@ namespace love
namespace thread
{
void retainVariant(Channel *c, Variant *v)
{
c->lockMutex();
v->retain();
c->unlockMutex();
}
void releaseVariant(Channel *c, Variant *v)
{
c->lockMutex();
v->release();
c->unlockMutex();
}
Channel *luax_checkchannel(lua_State *L, int idx)
{
return luax_checktype<Channel>(L, idx, THREAD_CHANNEL_ID);
@@ -47,34 +33,29 @@ Channel *luax_checkchannel(lua_State *L, int idx)
int w_Channel_push(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant *var = lua_isnoneornil(L, 2) ? 0 : Variant::fromLua(L, 2);
if (!var)
Variant var;
if (!Variant::fromLua(L, 2, &var))
return luaL_argerror(L, 2, "boolean, number, string, love type, or flat table expected");
c->push(var);
releaseVariant(c, var);
return 0;
}
int w_Channel_supply(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant *var = lua_isnoneornil(L, 2) ? 0 : Variant::fromLua(L, 2);
if (!var)
Variant var;
if (!Variant::fromLua(L, 2, &var))
return luaL_argerror(L, 2, "boolean, number, string, love type, or flat table expected");
c->supply(var);
releaseVariant(c, var);
return 0;
}
int w_Channel_pop(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant *var = c->pop();
if (var)
{
var->toLua(L);
releaseVariant(c, var);
}
Variant var;
if (c->pop(&var))
var.toLua(L);
else
lua_pushnil(L);
return 1;
@@ -83,21 +64,18 @@ int w_Channel_pop(lua_State *L)
int w_Channel_demand(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant *var = c->demand();
var->toLua(L);
releaseVariant(c, var);
Variant var;
c->demand(&var);
var.toLua(L);
return 1;
}
int w_Channel_peek(lua_State *L)
{
Channel *c = luax_checkchannel(L, 1);
Variant *var = c->peek();
if (var)
{
var->toLua(L);
releaseVariant(c, var);
}
Variant var;
if (c->peek(&var))
var.toLua(L);
else
lua_pushnil(L);
return 1;