Windows part of mutex rewrite.

library/Console-windows.cpp

@@ -58,6 +58,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <deque>
 using namespace DFHack;
 
+#include "tinythread.h"
+using namespace tthread;
+
 // FIXME: maybe make configurable with an ini option?
 #define MAX_CONSOLE_LINES 999;
 
@@ -247,7 +250,7 @@ namespace DFHack
             SetConsoleCursorPosition(console_out, inf.dwCursorPosition);
         }
 
-        int prompt_loop(SDL::Mutex * lock)
+        int prompt_loop(mutex * lock)
         {
             raw_buffer.clear(); // make sure the buffer is empty!
             size_t plen = prompt.size();
@@ -269,9 +272,9 @@ namespace DFHack
             {
                 INPUT_RECORD rec;
                 DWORD count;
-                SDL_mutexV(lock);
+                lock->unlock();
                 ReadConsoleInputA(console_in, &rec, 1, &count);
-                SDL_mutexP(lock);
+                lock->lock();
                 if (rec.EventType != KEY_EVENT || !rec.Event.KeyEvent.bKeyDown)
                     continue;
                 switch (rec.Event.KeyEvent.wVirtualKeyCode)
@@ -356,7 +359,7 @@ namespace DFHack
                 }
             }
         }
-        int lineedit(const std::string & prompt, std::string & output, SDL::Mutex*lock)
+        int lineedit(const std::string & prompt, std::string & output, mutex * lock)
         {
             output.clear();
             int count;
@@ -382,7 +385,7 @@ namespace DFHack
         }
 
         FILE * dfout_C;
-        int rawmode; /* for atexit() function to check if restore is needed*/
+        int rawmode;
         std::deque <std::string> history;
 
         HANDLE console_in;
@@ -425,7 +428,7 @@ bool Console::init(void)
     // Allocate a console!
     AllocConsole();
     d->ConsoleWindow = GetConsoleWindow();
-    wlock = SDL_CreateMutex();
+    wlock = new mutex();
     HMENU  hm = GetSystemMenu(d->ConsoleWindow,false);
     DeleteMenu(hm, SC_CLOSE, MF_BYCOMMAND);
 
@@ -465,16 +468,15 @@ bool Console::init(void)
 // FIXME: looks awfully empty, doesn't it?
 bool Console::shutdown(void)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     FreeConsole();
     inited = false;
-    SDL_mutexV(wlock);
     return true;
 }
 int Console::print( const char* format, ... )
 {
     va_list args;
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     int ret;
     if(!inited) ret = -1;
     else
@@ -483,14 +485,13 @@ int Console::print( const char* format, ... )
         ret = d->vprint(format, args);
         va_end(args);
     }
-    SDL_mutexV(wlock);
     return ret;
 }
 
 int Console::printerr( const char* format, ... )
 {
     va_list args;
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     int ret;
     if(!inited) ret = -1;
     else
@@ -499,86 +500,77 @@ int Console::printerr( const char* format, ... )
         ret = d->vprinterr(format, args);
         va_end(args);
     }
-    SDL_mutexV(wlock);
     return ret;
 }
 
 int Console::get_columns(void)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     int ret = -1;
     if(inited)
         ret = d->get_columns();
-    SDL_mutexV(wlock);
     return ret;
 }
 
 int Console::get_rows(void)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     int ret = -1;
     if(inited)
         ret = d->get_rows();
-    SDL_mutexV(wlock);
     return ret;
 }
 
 void Console::clear()
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     if(inited)
         d->clear();
-    SDL_mutexV(wlock);
 }
 
 void Console::gotoxy(int x, int y)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     if(inited)
         d->gotoxy(x,y);
-    SDL_mutexV(wlock);
 }
 
 void Console::color(color_value index)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     if(inited)
         d->color(index);
-    SDL_mutexV(wlock);
 }
 
 void Console::reset_color( void )
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     if(inited)
         d->reset_color();
-    SDL_mutexV(wlock);
 }
 
 void Console::cursor(bool enable)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     if(inited)
         d->cursor(enable);
-    SDL_mutexV(wlock);
 }
 
 // push to front, remove from back if we are above maximum. ignore immediate duplicates
 void Console::history_add(const std::string & command)
 {
-    SDL_mutexP(wlock);
+    lock_guard <mutex> g(*wlock);
     if(inited)
         d->history_add(command);
-    SDL_mutexV(wlock);
 }
 
 int Console::lineedit(const std::string & prompt, std::string & output)
 {
-    SDL_mutexP(wlock);
+    wlock->lock();
     int ret = -2;
     if(inited)
         ret = d->lineedit(prompt,output,wlock);
-    SDL_mutexV(wlock);
+    wlock->unlock();
     return ret;
 }
 

library/Core.cpp

@@ -385,6 +385,8 @@ Core::Core()
 
 bool Core::Init()
 {
+    if(started)
+        return true;
     // init the console. This must be always the first step!
     con.init();
     // find out what we are...

library/FakeSDL-windows.cpp

@@ -32,6 +32,8 @@ distribution.
 #include "dfhack/FakeSDL.h"
 #include <stdio.h>
 
+#include "tinythread.h"
+
 /*
  * Plugin loading functions
  */
@@ -57,7 +59,6 @@ namespace DFHack
 // just catch the first one and init all our function pointers at that time
 bool FirstCall(void);
 bool inited = false;
-bool started_joysticks = false;
 
 /// wrappers for SDL 1.2 functions used in 40d16
 /***** Condition variables
@@ -71,26 +72,26 @@ SDL_CondWait
 SDL_DestroyCond
     void SDLCALL SDL_DestroyCond(SDL_cond *cond);
 */
-static SDL::Cond * (*_SDL_CreateCond)() = 0;
+static vPtr (*_SDL_CreateCond)() = 0;
-DFhackCExport SDL::Cond * SDL_CreateCond()
+DFhackCExport vPtr SDL_CreateCond()
 {
     return _SDL_CreateCond();
 }
 
-static int (*_SDL_CondSignal)(SDL::Cond *) = 0;
+static int (*_SDL_CondSignal)( vPtr ) = 0;
-DFhackCExport int SDL_CondSignal(SDL::Cond * cond)
+DFhackCExport int SDL_CondSignal( vPtr cond )
 {
     return _SDL_CondSignal(cond);
 }
 
-static int (*_SDL_CondWait)(SDL::Cond *,SDL::Mutex *) = 0;
+static int (*_SDL_CondWait)( vPtr,vPtr ) = 0;
-DFhackCExport int SDL_CondWait(SDL::Cond * cond, SDL::Mutex * mutex)
+DFhackCExport int SDL_CondWait( vPtr cond, vPtr mutex )
 {
     return _SDL_CondWait(cond, mutex);
 }
 
-static void (*_SDL_DestroyCond)(SDL::Cond * ) = 0;
+static void (*_SDL_DestroyCond)( vPtr ) = 0;
-DFhackCExport void SDL_DestroyCond(SDL::Cond * cond)
+DFhackCExport void SDL_DestroyCond( vPtr cond )
 {
     _SDL_DestroyCond(cond);
 }
@@ -104,26 +105,26 @@ SDL_mutexP
 SDL_DestroyMutex
     void SDLCALL SDL_DestroyMutex(SDL_mutex *mutex);
 */
-static SDL::Mutex * (*_SDL_CreateMutex)(void) = 0;
+static vPtr (*_SDL_CreateMutex)(void) = 0;
-DFhackCExport SDL::Mutex * SDL_CreateMutex(void)
+DFhackCExport vPtr SDL_CreateMutex(void)
 {
     return _SDL_CreateMutex();
 }
 
-static int (*_SDL_mutexP)(SDL::Mutex * mutex) = 0;
+static int (*_SDL_mutexP)(vPtr mutex) = 0;
-DFhackCExport int SDL_mutexP(SDL::Mutex * mutex)
+DFhackCExport int SDL_mutexP(vPtr mutex)
 {
     return _SDL_mutexP(mutex);
 }
 
-static int (*_SDL_mutexV)(SDL::Mutex * mutex) = 0;
+static int (*_SDL_mutexV)(vPtr mutex) = 0;
-DFhackCExport int SDL_mutexV(SDL::Mutex * mutex)
+DFhackCExport int SDL_mutexV(vPtr mutex)
 {
     return _SDL_mutexV(mutex);
 }
 
-static void (*_SDL_DestroyMutex)(SDL::Mutex * mutex) = 0;
+static void (*_SDL_DestroyMutex)(vPtr mutex) = 0;
-DFhackCExport void SDL_DestroyMutex(SDL::Mutex * mutex)
+DFhackCExport void SDL_DestroyMutex(vPtr mutex)
 {
     _SDL_DestroyMutex(mutex);
 }
@@ -401,7 +402,7 @@ DFhackCExport int SDL_PollEvent(SDL::Event * event)
     // only send events to Core after we get first SDL_NumJoysticks call
     // DF event loop is possibly polling for SDL events before things get inited properly
     // SDL handles it. We don't, because we use some other parts of SDL too.
-    if(started_joysticks && event != 0)
+    if(event != 0)
     {
         DFHack::Core & c = DFHack::Core::getInstance();
         return c.SDL_Event(event, orig_return);
@@ -458,20 +459,20 @@ SDL_UnloadObject
     extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
 */
 
-static void * (*_SDL_LoadFunction)(SDL::Library *handle, const char *name) = 0;
+static void * (*_SDL_LoadFunction)(vPtr handle, const char *name) = 0;
-DFhackCExport void * SDL_LoadFunction(SDL::Library *handle, const char *name)
+DFhackCExport void * SDL_LoadFunction(vPtr handle, const char *name)
 {
     return _SDL_LoadFunction(handle, name);
 }
 
-extern "C" static SDL::Library * (*_SDL_LoadObject)(const char *sofile) = 0;
+extern "C" static vPtr (*_SDL_LoadObject)(const char *sofile) = 0;
-DFhackCExport SDL::Library * SDL_LoadObject(const char *sofile)
+DFhackCExport vPtr SDL_LoadObject(const char *sofile)
 {
     return _SDL_LoadObject(sofile);
 }
 
-static void (*_SDL_UnloadObject)(SDL::Library * handle) = 0;
+static void (*_SDL_UnloadObject)(vPtr handle) = 0;
-DFhackCExport void SDL_UnloadObject(SDL::Library * handle)
+DFhackCExport void SDL_UnloadObject(vPtr handle)
 {
     _SDL_UnloadObject(handle);
 }
@@ -538,10 +539,10 @@ DFhackCExport size_t SDL_strlcpy(char *dst, const char *src, size_t maxlen)
     if(!_SDL_strlcpy)
     {
         HMODULE realSDLlib =  LoadLibrary("SDLreal.dll");
-		if(!realSDLlib)
+        if(!realSDLlib)
-		{
+        {
-			exit(-111);
+            exit(-111);
-		}
+        }
         _SDL_strlcpy = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcpy");
     }
     return _SDL_strlcpy(dst,src,maxlen);
@@ -570,9 +571,7 @@ DFhackCExport void SDL_Quit(void)
 DFhackCExport int SDL_NumJoysticks(void)
 {
     DFHack::Core & c = DFHack::Core::getInstance();
-    int ret = c.Update();
+    return c.Update();
-    started_joysticks = true;
-    return ret;
 }
 
 static void (*_SDL_GL_SwapBuffers)(void) = 0;
@@ -597,6 +596,8 @@ DFhackCExport int SDL_Init(uint32_t flags)
 {
     if(!inited)
         FirstCall();
+	DFHack::Core & c = DFHack::Core::getInstance();
+	c.Init();
     return _SDL_Init(flags);
 }
 
@@ -611,8 +612,8 @@ DFhackCExport void *SDL_CreateSemaphore(uint32_t initial_value)
     return _SDL_CreateSemaphore(initial_value);
 }
 
-static SDL::Thread * (*_SDL_CreateThread)(int (*fn)(void *), void *data) = 0;
+static vPtr (*_SDL_CreateThread)(int (*fn)(void *), void *data) = 0;
-DFhackCExport  SDL::Thread *SDL_CreateThread(int (*fn)(void *), void *data)
+DFhackCExport  vPtr SDL_CreateThread(int (*fn)(void *), void *data)
 {
     if(!inited)
         FirstCall();
@@ -702,18 +703,18 @@ bool FirstCall()
         fprintf(stderr, "Can't load SDLreal.dll\n");
         return 0;
     }
-	fprintf(stderr, "FirstCall()\n");
+    fprintf(stderr, "FirstCall()\n");
     // stuff for DF
     _SDL_AddTimer = (void*(*)(uint32_t, void*, void*)) GetProcAddress(realSDLlib,"SDL_AddTimer");
-    _SDL_CondSignal = (int (*)(SDL::Cond*))GetProcAddress(realSDLlib,"SDL_CondSignal");
+    _SDL_CondSignal = (int (*)(vPtr))GetProcAddress(realSDLlib,"SDL_CondSignal");
-    _SDL_CondWait = (int (*)(SDL::Cond*, SDL::Mutex*))GetProcAddress(realSDLlib,"SDL_CondWait");
+    _SDL_CondWait = (int (*)(vPtr, vPtr))GetProcAddress(realSDLlib,"SDL_CondWait");
     _SDL_ConvertSurface = (void*(*)(void*, void*, uint32_t))GetProcAddress(realSDLlib,"SDL_ConvertSurface");
-    _SDL_CreateCond = (SDL::Cond*(*)())GetProcAddress(realSDLlib,"SDL_CreateCond");
+    _SDL_CreateCond = (vPtr(*)())GetProcAddress(realSDLlib,"SDL_CreateCond");
-    _SDL_CreateMutex = (SDL::Mutex*(*)())GetProcAddress(realSDLlib,"SDL_CreateMutex");
+    _SDL_CreateMutex = (vPtr(*)())GetProcAddress(realSDLlib,"SDL_CreateMutex");
     _SDL_CreateRGBSurface = (void*(*)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_CreateRGBSurface");
     _SDL_CreateRGBSurfaceFrom = (void*(*)(void*, int, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t))GetProcAddress(realSDLlib,"SDL_CreateRGBSurfaceFrom");
-    _SDL_DestroyCond = (void (*)(SDL::Cond*))GetProcAddress(realSDLlib,"SDL_DestroyCond");
+    _SDL_DestroyCond = (void (*)(vPtr))GetProcAddress(realSDLlib,"SDL_DestroyCond");
-    _SDL_DestroyMutex = (void (*)(SDL::Mutex*))GetProcAddress(realSDLlib,"SDL_DestroyMutex");
+    _SDL_DestroyMutex = (void (*)(vPtr))GetProcAddress(realSDLlib,"SDL_DestroyMutex");
     _SDL_EnableKeyRepeat = (int (*)(int, int))GetProcAddress(realSDLlib,"SDL_EnableKeyRepeat");
     _SDL_EnableUNICODE = (int (*)(int))GetProcAddress(realSDLlib,"SDL_EnableUNICODE");
     _SDL_GetVideoSurface = (void*(*)())GetProcAddress(realSDLlib,"SDL_GetVideoSurface");
@@ -746,25 +747,25 @@ bool FirstCall()
     _SDL_UpperBlit = (int (*)(void*, void*, void*, void*))GetProcAddress(realSDLlib,"SDL_UpperBlit");
     _SDL_WM_SetCaption = (void (*)(const char*, const char*))GetProcAddress(realSDLlib,"SDL_WM_SetCaption");
     _SDL_WM_SetIcon = (void (*)(void*, uint8_t*))GetProcAddress(realSDLlib,"SDL_WM_SetIcon");
-    _SDL_mutexP = (int (*)(SDL::Mutex*))GetProcAddress(realSDLlib,"SDL_mutexP");
+    _SDL_mutexP = (int (*)(vPtr))GetProcAddress(realSDLlib,"SDL_mutexP");
-    _SDL_mutexV = (int (*)(SDL::Mutex*))GetProcAddress(realSDLlib,"SDL_mutexV");
+    _SDL_mutexV = (int (*)(vPtr))GetProcAddress(realSDLlib,"SDL_mutexV");
     _SDL_strlcpy = (size_t (*)(char*, const char*, size_t))GetProcAddress(realSDLlib,"SDL_strlcpy");
     
     // stuff for SDL_Image
     _SDL_ClearError = (void (*)())GetProcAddress(realSDLlib,"SDL_ClearError");
     _SDL_Error = (void (*)(int))GetProcAddress(realSDLlib,"SDL_Error");
-    _SDL_LoadFunction = (void*(*)(SDL::Library*, const char*))GetProcAddress(realSDLlib,"SDL_LoadFunction");
+    _SDL_LoadFunction = (void*(*)(vPtr, const char*))GetProcAddress(realSDLlib,"SDL_LoadFunction");
-    _SDL_LoadObject = (SDL::Library*(*)(const char*))GetProcAddress(realSDLlib,"SDL_LoadObject");
+    _SDL_LoadObject = (vPtr(*)(const char*))GetProcAddress(realSDLlib,"SDL_LoadObject");
     _SDL_ReadBE32 = (uint32_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadBE32");
     _SDL_ReadLE16 = (uint16_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadLE16");
     _SDL_ReadLE32 = (uint32_t (*)(void*))GetProcAddress(realSDLlib,"SDL_ReadLE32");
     _SDL_SetError = (void (*)(const char*, ...))GetProcAddress(realSDLlib,"SDL_SetError");
-    _SDL_UnloadObject = (void (*)(SDL::Library*))GetProcAddress(realSDLlib,"SDL_UnloadObject");
+    _SDL_UnloadObject = (void (*)(vPtr))GetProcAddress(realSDLlib,"SDL_UnloadObject");
     _SDL_FillRect = (int (*)(void*,void*,uint32_t))GetProcAddress(realSDLlib,"SDL_FillRect");
     
     // new in DF 0.31.04
     _SDL_CreateSemaphore = (void* (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_CreateSemaphore");
-    _SDL_CreateThread = (SDL::Thread* (*)(int (*fn)(void *), void *data))GetProcAddress(realSDLlib,"SDL_CreateThread");
+    _SDL_CreateThread = (vPtr (*)(int (*fn)(void *), void *data))GetProcAddress(realSDLlib,"SDL_CreateThread");
     _SDL_Delay = (void (*)(uint32_t))GetProcAddress(realSDLlib,"SDL_Delay");
     _SDL_DestroySemaphore = (void (*)(void *))GetProcAddress(realSDLlib,"SDL_DestroySemaphore");
     _SDL_GetAppState = (uint8_t (*)(void))GetProcAddress(realSDLlib,"SDL_GetAppState");