libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing evil deadlock

Browse Source 
svn-id: r6544
This commit is contained in:
Ruediger Hanke 2003-01-25 21:17:00 +00:00
parent f33b08ae66
commit 5956e5ee18
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
backends/morphos/morphos_timer.cpp
View File

@ -33,26 +33,18 @@
#include "morphos.h" #include "morphos.h"
#include "timer.h" #include "timer.h"
static TagItem TimerServiceTags[] = { { NP_Entry, 0 },
{ NP_Name, (ULONG)"ScummVM Timer Service" },
{ NP_Priority, 20 },
{ TAG_DONE, 0 }
};
Timer::Timer(Engine * engine) Timer::Timer(Engine * engine)
{ {
static EmulFunc ThreadEmulFunc;
InitSemaphore(&TimerServiceSemaphore); InitSemaphore(&TimerServiceSemaphore);
ThreadEmulFunc.Trap = TRAP_FUNC; TimerServiceThread = CreateNewProcTags(NP_Entry, (ULONG) TimerService,
ThreadEmulFunc.Address = (ULONG) &TimerService; NP_CodeType, CODETYPE_PPC,
ThreadEmulFunc.StackSize = 16000; NP_Name, (ULONG) "ScummVM Timer Service",
ThreadEmulFunc.Extension = 0; NP_Priority, 50,
ThreadEmulFunc.Arg1 = (ULONG) this; NP_PPC_Arg1, (ULONG) this,
ThreadEmulFunc.Arg2 = (ULONG) engine; NP_PPC_Arg2, (ULONG) engine,
TimerServiceTags[0].ti_Data = (ULONG) &ThreadEmulFunc; TAG_DONE
TimerServiceThread = CreateNewProc(TimerServiceTags); );
} }
Timer::~Timer() Timer::~Timer()
@ -93,25 +85,13 @@ bool Timer::SendMsg(ULONG msg_id, TimerProc procedure, LONG interval)
if (tmsg == NULL) if (tmsg == NULL)
return false; return false;
MsgPort *reply_port = CreateMsgPort();
if (reply_port == NULL)
{
FreeVec(tmsg);
return false;
}
tmsg->tsm_Message.mn_Node.ln_Type = NT_MESSAGE; tmsg->tsm_Message.mn_Node.ln_Type = NT_MESSAGE;
tmsg->tsm_Message.mn_ReplyPort = reply_port; tmsg->tsm_Message.mn_ReplyPort = NULL;
tmsg->tsm_Message.mn_Length = sizeof (TimerServiceMessage); tmsg->tsm_Message.mn_Length = sizeof (TimerServiceMessage);
tmsg->tsm_MsgID = msg_id; tmsg->tsm_MsgID = msg_id;
tmsg->tsm_Callback = procedure; tmsg->tsm_Callback = procedure;
tmsg->tsm_Interval = interval; tmsg->tsm_Interval = interval;
PutMsg(&TimerServiceThread->pr_MsgPort, (Message*) tmsg); PutMsg(&TimerServiceThread->pr_MsgPort, (Message*) tmsg);
WaitPort(reply_port);
GetMsg(reply_port);
FreeVec(tmsg);
DeleteMsgPort(reply_port);
return true; return true;
} }
@ -151,7 +131,7 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine)
{ {
ULONG unit = UNIT_MICROHZ; ULONG unit = UNIT_MICROHZ;
if (tmsg->tsm_Interval > 1000) if (tmsg->tsm_Interval >= 1000000)
unit = UNIT_VBLANK; unit = UNIT_VBLANK;
if (OSystem_MorphOS::OpenATimer(&timer_slots[timers].ts_Port, (IORequest **) &timer_slots[timers].ts_IORequest, unit)) if (OSystem_MorphOS::OpenATimer(&timer_slots[timers].ts_Port, (IORequest **) &timer_slots[timers].ts_IORequest, unit))
{ {
@ -165,8 +145,8 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine)
timerequest *req = timer_slots[timers].ts_IORequest; timerequest *req = timer_slots[timers].ts_IORequest;
interval = timer_slots[timers].ts_Interval; interval = timer_slots[timers].ts_Interval;
req->tr_node.io_Command = TR_ADDREQUEST; req->tr_node.io_Command = TR_ADDREQUEST;
req->tr_time.tv_secs = interval/1000; req->tr_time.tv_secs = interval/1000000;
req->tr_time.tv_micro = (interval%1000)*1000; req->tr_time.tv_micro = interval%1000000;
SendIO((IORequest*) req); SendIO((IORequest*) req);
timers++; timers++;
@ -201,7 +181,10 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine)
} }
} }
ReplyMsg((Message *) tmsg); if (tmsg->tsm_Message.mn_ReplyPort)
ReplyMsg((Message *) tmsg);
else
FreeVec((Message *) tmsg);
} }
} }
@ -220,11 +203,13 @@ void Timer::TimerService(Timer *this_ptr, Engine *engine)
(*timer_slots[t].ts_Callback)(engine); (*timer_slots[t].ts_Callback)(engine);
GetSysTime(&end_callback); GetSysTime(&end_callback);
SubTime(&end_callback, &start_callback); SubTime(&end_callback, &start_callback);
interval -= end_callback.tv_sec*1000+end_callback.tv_micro/1000+40; interval -= end_callback.tv_sec*1000000+end_callback.tv_micro/1000000+40000;
if (interval < 0)
interval = 0;
req->tr_node.io_Command = TR_ADDREQUEST; req->tr_node.io_Command = TR_ADDREQUEST;
req->tr_time.tv_secs = interval/1000; req->tr_time.tv_secs = interval/1000000;
req->tr_time.tv_micro = (interval%1000)*1000; req->tr_time.tv_micro = interval%1000000;
SendIO((IORequest*) req); SendIO((IORequest*) req);
} }
} }