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

Threads get/set instead of send/receive (issue #166)

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2011-01-15 22:26:16 +01:00
parent 675e91dbc8
commit 6acacffb66
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/sdl/Thread.cpp
+2 -2
View File
@@ -249,7 +249,7 @@ namespace sdl
return name; return name;
} }
ThreadVariant *Thread::receive(const std::string & name) ThreadVariant *Thread::get(const std::string & name)
{ {
lock(); lock();
ThreadVariant *v = comm->getValue(name); ThreadVariant *v = comm->getValue(name);
@@ -282,7 +282,7 @@ namespace sdl
unlock(); unlock();
} }
void Thread::send(const std::string & name, ThreadVariant *v) void Thread::set(const std::string & name, ThreadVariant *v)
{ {
lock(); lock();
comm->setValue(name, v); comm->setValue(name, v);
src/modules/thread/sdl/Thread.h
+2 -2
View File
@@ -115,10 +115,10 @@ namespace sdl
void kill(); void kill();
void wait(); void wait();
std::string getName(); std::string getName();
ThreadVariant *receive(const std::string & name); ThreadVariant *get(const std::string & name);
ThreadVariant *demand(const std::string & name); ThreadVariant *demand(const std::string & name);
void clear(const std::string & name); void clear(const std::string & name);
void send(const std::string & name, ThreadVariant *v); void set(const std::string & name, ThreadVariant *v);
void lock(); void lock();
void unlock(); void unlock();
}; // Thread }; // Thread
src/modules/thread/sdl/wrap_Thread.cpp
+7 -7
View File
@@ -72,11 +72,11 @@ namespace sdl
return 1; return 1;
} }
int w_Thread_receive(lua_State *L) int w_Thread_get(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luax_checklstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v = t->receive(name); ThreadVariant *v = t->get(name);
if (!v) if (!v)
{ {
lua_pushnil(L); lua_pushnil(L);
@@ -162,7 +162,7 @@ namespace sdl
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luax_checklstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v = t->receive(name); ThreadVariant *v = t->get(name);
if (!v) if (!v)
{ {
lua_pushnil(L); lua_pushnil(L);
@@ -216,7 +216,7 @@ namespace sdl
return t; return t;
} }
int w_Thread_send(lua_State *L) int w_Thread_set(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luax_checklstring(L, 2); std::string name = luax_checklstring(L, 2);
@@ -247,7 +247,7 @@ namespace sdl
{ {
return luaL_error(L, "Expected boolean, number, string or userdata"); return luaL_error(L, "Expected boolean, number, string or userdata");
} }
t->send(name, v); t->set(name, v);
v->release(); v->release();
return 0; return 0;
} }
@@ -257,10 +257,10 @@ namespace sdl
{ "kill", w_Thread_kill }, { "kill", w_Thread_kill },
{ "wait", w_Thread_wait }, { "wait", w_Thread_wait },
{ "getName", w_Thread_getName }, { "getName", w_Thread_getName },
{ "receive", w_Thread_receive }, { "get", w_Thread_get },
{ "demand", w_Thread_demand }, { "demand", w_Thread_demand },
{ "peek", w_Thread_peek }, { "peek", w_Thread_peek },
{ "send", w_Thread_send }, { "set", w_Thread_set },
{ 0, 0 } { 0, 0 }
}; };
src/modules/thread/sdl/wrap_Thread.h
+2 -2
View File
@@ -37,10 +37,10 @@ namespace sdl
int w_Thread_kill(lua_State *L); int w_Thread_kill(lua_State *L);
int w_Thread_wait(lua_State *L); int w_Thread_wait(lua_State *L);
int w_Thread_getName(lua_State *L); int w_Thread_getName(lua_State *L);
int w_Thread_receive(lua_State *L); int w_Thread_get(lua_State *L);
int w_Thread_demand(lua_State *L); int w_Thread_demand(lua_State *L);
int w_Thread_peek(lua_State *L); int w_Thread_peek(lua_State *L);
int w_Thread_send(lua_State *L); int w_Thread_set(lua_State *L);
int luaopen_thread(lua_State *L); int luaopen_thread(lua_State *L);