love-experiments: src/modules/thread/wrap

annotate src/modules/thread/wrap_ThreadModule.cpp @ 1304:ee1448bb9680 minor

Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Also, this is a giant commit because of the official Code Style (tm) was applied.

author	Bart van Strien <bart.bes+projects@gmail.com>
date	Wed, 30 Jan 2013 17:15:12 +0100
parents	a74672ba1320
children

rev	line source
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	1 /**
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	2 * Copyright (c) 2006-2010 LOVE Development Team
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	3 *
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	4 * This software is provided 'as-is', without any express or implied
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	5 * warranty. In no event will the authors be held liable for any damages
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	6 * arising from the use of this software.
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	7 *
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	8 * Permission is granted to anyone to use this software for any purpose,
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	9 * including commercial applications, and to alter it and redistribute it
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	10 * freely, subject to the following restrictions:
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	11 *
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	12 * 1. The origin of this software must not be misrepresented; you must not
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	13 * claim that you wrote the original software. If you use this software
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	14 * in a product, an acknowledgment in the product documentation would be
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	15 * appreciated but is not required.
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	16 * 2. Altered source versions must be plainly marked as such, and must not be
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	17 * misrepresented as being the original software.
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	18 * 3. This notice may not be removed or altered from any source distribution.
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	19 **/
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	20
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	21 #include "wrap_ThreadModule.h"
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	22 #include "wrap_LuaThread.h"
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	23 #include "wrap_Channel.h"
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	24 #include <filesystem/File.h>
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	25 #include <filesystem/FileData.h>
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	26
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	27 namespace love
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	28 {
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	29 namespace thread
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	30 {
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	31 static ThreadModule *instance = 0;
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	32
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	33 int w_newThread(lua_State *L)
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	34 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	35 std::string name = "Thread code";
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	36 love::Data *data;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	37 if (lua_isstring(L, 1))
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	38 luax_convobj(L, 1, "filesystem", "newFile");
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	39 if (luax_istype(L, 1, FILESYSTEM_FILE_T))
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	40 {
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	41 try
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	42 {
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	43 love::filesystem::File * file = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	44 name = std::string("@") + file->getFilename();
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	45 data = file->read();
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	46 }
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	47 catch (love::Exception & e)
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	48 {
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	49 return luaL_error(L, "%s", e.what());
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	50 }
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	51 }
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	52 else if (luax_istype(L, 1, FILESYSTEM_FILE_DATA_T))
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	53 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	54 love::filesystem::FileData * fdata = luax_checktype<love::filesystem::FileData>(L, 1, "FileData", FILESYSTEM_FILE_DATA_T);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	55 name = std::string("@") + fdata->getFilename();
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	56 data = fdata;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	57 data->retain();
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	58 }
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	59 else
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	60 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	61 data = luax_checktype<love::Data>(L, 1, "Data", DATA_T);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	62 data->retain();
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	63 }
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	64 LuaThread *t = instance->newThread(name, data);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	65 // do not worry, file->read() returns retained data
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	66 data->release();
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	67 luax_newtype(L, "Thread", THREAD_THREAD_T, (void *)t);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	68 return 1;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	69 }
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	70
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	71 int w_newChannel(lua_State *L)
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	72 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	73 Channel *c = instance->newChannel();
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	74 luax_newtype(L, "Channel", THREAD_CHANNEL_T, (void *)c);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	75 return 1;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	76 }
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	77
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	78 int w_getChannel(lua_State *L)
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	79 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	80 std::string name = luax_checkstring(L, 1);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	81 Channel *c = instance->getChannel(name);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	82 luax_newtype(L, "Channel", THREAD_CHANNEL_T, (void *)c);
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	83 return 1;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	84 }
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	85
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	86 // List of functions to wrap.
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	87 static const luaL_Reg module_functions[] = {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	88 { "newThread", w_newThread },
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	89 { "newChannel", w_newChannel },
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	90 { "getChannel", w_getChannel },
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	91 { 0, 0 }
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	92 };
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	93
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	94 static const lua_CFunction types[] = {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	95 luaopen_thread,
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	96 luaopen_channel,
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	97 0
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	98 };
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	99
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	100 extern "C" int luaopen_love_thread(lua_State *L)
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	101 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	102 if (instance == 0)
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	103 {
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	104 try
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	105 {
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	106 instance = new ThreadModule();
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	107 }
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	108 catch (Exception & e)
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	109 {
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	110 return luaL_error(L, "%s", e.what());
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	111 }
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	112 }
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	113 else
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	114 instance->retain();
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	115
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	116 WrappedModule w;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	117 w.module = instance;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	118 w.name = "thread";
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	119 w.flags = MODULE_T;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	120 w.functions = module_functions;
ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	121 w.types = types;
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	122
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	123 return luax_register_module(L, w);
1098 a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	124 }
a74672ba1320 Merge in channels from love-experiments Bart van Strien <bart.bes+projects@gmail.com> parents: diff changeset	125 }
1304 ee1448bb9680 Fix race conditions and deadlocks in Channels (hopefully) (issue #554) Bart van Strien <bart.bes+projects@gmail.com> parents: 1098 diff changeset	126 }

Mercurial > love-experiments

annotate src/modules/thread/wrap_ThreadModule.cpp @ 1304:ee1448bb9680 minor