LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 04:06:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Applied (and fixed) vrld's thread patch

Browse Source
This commit is contained in:
Bart van Strien
2010-12-27 14:34:43 +01:00
parent e840a8f96c
commit c4fe77694b
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/sdl/wrap_Thread.cpp
+23 -11
View File
@@ -20,6 +20,18 @@
#include "wrap_Thread.h" #include "wrap_Thread.h"
// anonymous namespace for getting an std::string from the stack
// that may contain embedded NULLs
namespace
{
std::string luax_checklstring(lua_State *L, int idx)
{
size_t len;
const char* str = luaL_checklstring(L, idx, &len);
return std::string(str, len);
}
}
namespace love namespace love
{ {
namespace thread namespace thread
@@ -55,14 +67,15 @@ namespace sdl
int w_Thread_getName(lua_State *L) int w_Thread_getName(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
lua_pushstring(L, t->getName().c_str()); // allow names containing \0
lua_pushlstring(L, t->getName().c_str(), t->getName().length());
return 1; return 1;
} }
int w_Thread_receive(lua_State *L) int w_Thread_receive(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luaL_checkstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v = t->receive(name); ThreadVariant *v = t->receive(name);
if (!v) if (!v)
{ {
@@ -104,7 +117,7 @@ namespace sdl
int w_Thread_demand(lua_State *L) int w_Thread_demand(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luaL_checkstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v = t->demand(name); ThreadVariant *v = t->demand(name);
if (!v) if (!v)
{ {
@@ -146,7 +159,7 @@ namespace sdl
int w_Thread_peek(lua_State *L) int w_Thread_peek(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luaL_checkstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v = t->receive(name); ThreadVariant *v = t->receive(name);
if (!v) if (!v)
{ {
@@ -203,7 +216,7 @@ namespace sdl
int w_Thread_send(lua_State *L) int w_Thread_send(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luaL_checkstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v; ThreadVariant *v;
if (lua_isboolean(L, 3)) if (lua_isboolean(L, 3))
{ {
@@ -257,10 +270,7 @@ namespace sdl
int w_newThread(lua_State *L) int w_newThread(lua_State *L)
{ {
luaL_checkstring(L, 1); std::string name = luax_checklstring(L, 1);
size_t len;
const char *name_str = lua_tolstring(L, 1, &len);
std::string name(name_str, len);
love::Data *data; love::Data *data;
if (lua_isstring(L, 2)) if (lua_isstring(L, 2))
luax_convobj(L, 2, "filesystem", "newFile"); luax_convobj(L, 2, "filesystem", "newFile");
@@ -287,7 +297,9 @@ namespace sdl
list[i]->lock(); list[i]->lock();
list[i]->retain(); list[i]->retain();
list[i]->unlock(); list[i]->unlock();
lua_setfield(L, -2, list[i]->getName().c_str()); // allow names containing \0
lua_pushlstring(L, list[i]->getName().c_str(), list[i]->getName().length());
lua_settable(L, -3);
} }
delete[] list; delete[] list;
return 1; return 1;
@@ -301,7 +313,7 @@ namespace sdl
lua_getfield(L, -1, "_curthread"); lua_getfield(L, -1, "_curthread");
return 1; return 1;
} }
std::string name = luaL_checkstring(L, 1); std::string name = luax_checklstring(L, 1);
Thread *t = instance->getThread(name); Thread *t = instance->getThread(name);
if (t) if (t)
{ {