petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.

Browse Source
This commit is contained in:
Darkvater
2005-09-02 16:05:59 +00:00
parent ae356b641d
commit a181446829
8 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
openttd.c
View File

@@ -542,6 +542,38 @@ int ttd_main(int argc, char* argv[])
return 0;
}
/** Mutex so that only one thread can communicate with the main program
* at any given time */
static ThreadMsg _message = 0;
static inline void OTTD_ReleaseMutex(void) {_message = 0;}
static inline ThreadMsg OTTD_PollThreadEvent(void) {return _message;}
/** Called by running thread to execute some action in the main game.
* It will stall as long as the mutex is not freed (handled) by the game */
void OTTD_SendThreadMessage(ThreadMsg msg)
{
while (_message != 0) CSleep(10);
_message = msg;
}
/** Handle the user-messages sent to us
* @param message message sent
*/
void ProcessSentMessage(ThreadMsg message)
{
switch (message) {
case MSG_OTTD_SAVETHREAD_START: SaveFileStart(); break;
case MSG_OTTD_SAVETHREAD_DONE: SaveFileDone(); break;
case MSG_OTTD_SAVETHREAD_ERROR: SaveFileError(); break;
default: NOT_REACHED();
}
OTTD_ReleaseMutex(); // release mutex so that other threads, messages can be handled
}
static void ShowScreenshotResult(bool b)
{
if (b) {
@@ -914,6 +946,10 @@ static void HandleKeyScrolling(void)
void GameLoop(void)
{
int m;
ThreadMsg message;
if ((message = OTTD_PollThreadEvent()) != 0) ProcessSentMessage(message);
// autosave game?
if (_do_autosave) {