Added first version of thread and enabled newFileData

src/modules/thread/sdl/Thread.cpp

@@ -0,0 +1,124 @@
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+**/
+
+#include "Thread.h"
+
+extern "C" int luaopen_love(lua_State * L);
+
+int threadfunc(const char *data)
+{
+	lua_State * L = lua_open();
+	luaL_openlibs(L);
+	love::luax_preload(L, luaopen_love, "love");
+	luaopen_love(L);
+	luaL_dostring(L, data);
+	lua_close(L);
+	return 0;
+}
+
+namespace love
+{
+namespace thread
+{
+namespace sdl
+{
+	Thread::Thread(ThreadModuleRegistrar *reg, std::string name, love::Data *data)
+		: reg(reg), name(name), handle(0)
+	{
+		unsigned int len = data->getSize();
+		this->data = new char[len];
+		memcpy(this->data, data->getData(), len);
+	}
+
+	Thread::~Thread()
+	{
+		delete[] data;
+		if (handle)
+			SDL_KillThread(handle);
+		reg->unregister(name);
+	}
+
+	void Thread::start()
+	{
+		if (!handle)
+			SDL_CreateThread((int (*)(void*)) threadfunc, (void*) data);
+	}
+
+	void Thread::kill()
+	{
+		if (handle)
+			SDL_KillThread(handle);
+	}
+
+	std::string Thread::getName()
+	{
+		return name;
+	}
+
+	ThreadModule::~ThreadModule()
+	{
+		for (threadlist_t::iterator i = threads.begin(); i != threads.end(); i++)
+		{
+			i->second->kill();
+		}
+	}
+
+	Thread *ThreadModule::newThread(std::string name, love::Data *data)
+	{
+		if (threads.count(name) != 0)
+			return 0;
+		Thread *t = new Thread(this, name, data);
+		threads[name] = t;
+		return t;
+	}
+
+	Thread *ThreadModule::getThread(std::string name)
+	{
+		if (threads.count(name) == 0)
+			return 0;
+		threadlist_t::iterator i = threads.find(name);
+		return i->second;
+	}
+
+	Thread **ThreadModule::getThreads()
+	{
+		Thread **list = new Thread*[threads.size()];
+		int c = 0;
+		for (threadlist_t::iterator i = threads.begin(); i != threads.end(); i++, c++)
+		{
+			list[c] = i->second;
+		}
+	}
+
+	void ThreadModule::unregister(std::string name)
+	{
+		if (threads.count(name) == 0)
+			return;
+		threadlist_t::iterator i = threads.find(name);
+		threads.erase(i);
+	}
+
+	const char *ThreadModule::getName() const
+	{
+		return "love.thread.sdl";
+	}
+} // sdl
+} // thread
+} // love

src/modules/thread/sdl/Thread.h

@@ -0,0 +1,83 @@
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+**/
+
+#ifndef LOVE_THREAD_THREAD_H
+#define LOVE_THREAD_THREAD_H
+
+// SDL
+#include <SDL_thread.h>
+
+// STL
+#include <map>
+#include <string>
+
+// LOVE
+#include <common/Module.h>
+#include <filesystem/File.h>
+#include <common/runtime.h>
+
+namespace love
+{
+namespace thread
+{
+namespace sdl
+{
+	class ThreadModuleRegistrar
+	{
+	public:
+		virtual void unregister(std::string name) = 0;
+	};
+
+	class Thread : public love::Object
+	{
+	private:
+		SDL_Thread *handle;
+		ThreadModuleRegistrar *reg;
+		std::string name;
+		char *data;
+
+	public:
+		Thread(ThreadModuleRegistrar *reg, std::string name, love::Data *data);
+		~Thread();
+		void start();
+		void kill();
+		std::string getName();
+	}; // Thread
+
+	typedef std::map<std::string, Thread*> threadlist_t;
+
+	class ThreadModule : public Module, ThreadModuleRegistrar
+	{
+	private:
+		threadlist_t threads;
+
+	public:
+		~ThreadModule();
+		Thread *newThread(std::string name, love::Data *data);
+		Thread **getThreads();
+		Thread *getThread(std::string name);
+		void unregister(std::string name);
+		const char *getName() const;
+	}; // ThreadModule
+} // sdl
+} // thread
+} // love
+
+#endif // LOVE_THREAD_THREAD_H

src/modules/thread/sdl/wrap_Thread.cpp

@@ -0,0 +1,131 @@
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+**/
+
+#include "wrap_Thread.h"
+
+namespace love
+{
+namespace thread
+{
+namespace sdl
+{
+	Thread *luax_checkthread(lua_State *L, int idx)
+	{
+		return luax_checktype<Thread>(L, idx, "Thread", THREAD_THREAD_T);
+	}
+
+	int w_Thread_start(lua_State *L)
+	{
+		Thread *t = luax_checkthread(L, 1);
+		t->start();
+		return 0;
+	}
+
+	int w_Thread_kill(lua_State *L)
+	{
+		Thread *t = luax_checkthread(L, 1);
+		t->kill();
+		return 0;
+	}
+
+	int w_Thread_getName(lua_State *L)
+	{
+		Thread *t = luax_checkthread(L, 1);
+		lua_pushstring(L, t->getName().c_str());
+		return 1;
+	}
+
+	static const luaL_Reg type_functions[] = {
+		{ "start", w_Thread_start },
+		{ "kill", w_Thread_kill },
+		{ "getName", w_Thread_getName },
+		{ 0, 0 }
+	};
+
+	int luaopen_thread(lua_State *L)
+	{
+		return luax_register_type(L, "Thread", type_functions);
+	}
+
+	static ThreadModule *instance;
+
+	int w_newThread(lua_State *L)
+	{
+		std::string name = luaL_checkstring(L, 1);
+		if (lua_isstring(L, 2))
+			luax_convobj(L, 2, "filesystem", "read");
+		love::Data *data = luax_checktype<love::Data>(L, 2, "Data", DATA_T);
+		Thread *t = instance->newThread(name, data);
+		luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
+		return 1;
+	}
+
+	int w_getThreads(lua_State *L)
+	{
+	}
+
+	int w_getThread(lua_State *L)
+	{
+		std::string name = luaL_checkstring(L, 1);
+		Thread *t = instance->getThread(name);
+		luax_newtype(L, "Thread", THREAD_THREAD_T, (void*)t);
+		t->retain();
+		return 1;
+	}
+
+
+	// List of functions to wrap.
+	static const luaL_Reg module_functions[] = {
+		{ "newThread", w_newThread },
+		{ "getThread", w_getThread },
+		{ 0, 0 }
+	};
+
+	static const lua_CFunction types[] = {
+		luaopen_thread,
+		0
+	};
+
+	int luaopen_love_thread(lua_State *L)
+	{
+		if(instance == 0)
+		{
+			try
+			{
+				instance = new ThreadModule();
+			}
+			catch(Exception & e)
+			{
+				return luaL_error(L, e.what());
+			}
+		}
+
+		WrappedModule w;
+		w.module = instance;
+		w.name = "thread";
+		w.flags = MODULE_T;
+		w.functions = module_functions;
+		w.types = types;
+
+		return luax_register_module(L, w);
+	}
+}
+}
+}

src/modules/thread/sdl/wrap_Thread.h

@@ -0,0 +1,50 @@
+/**
+* Copyright (c) 2006-2010 LOVE Development Team
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+*
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+*
+* 1. The origin of this software must not be misrepresented; you must not
+*    claim that you wrote the original software. If you use this software
+*    in a product, an acknowledgment in the product documentation would be
+*    appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+*    misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+**/
+
+#ifndef LOVE_THREAD_SDL_WRAP_THREAD_H
+#define LOVE_THREAD_SDL_WRAP_THREAD_H
+
+// LOVE
+#include <common/config.h>
+#include "Thread.h"
+
+namespace love
+{
+namespace thread
+{
+namespace sdl
+{
+	Thread *luax_checkthread(lua_State *L, int idx);
+	int w_Thread_start(lua_State *L);
+	int w_Thread_kill(lua_State *L);
+	int w_thread_getName(lua_State *L);
+
+	int luaopen_thread(lua_State *L);
+
+	int w_newThread(lua_State *L);
+	int w_getThreads(lua_State *L);
+	int w_getThread(lua_State *L);
+
+	extern "C" LOVE_EXPORT int luaopen_love_thread(lua_State * L);
+} // sdl
+} // thread
+} // love
+
+#endif // LOVE_THREAD_SDL_WRAP_THREAD_H