Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing Cached Monitors from plevent. They are about 5x slower than

Browse Source 
a lock and condvar according to the nspr documentation.  r=valeski

Also I fix a problem where we would wake up from a wait without checking
any data which could cause all sorts of problems.

b=50634
This commit is contained in:
dougt%netscape.com 2000-09-01 00:50:51 +00:00
parent 554c067f7a
commit 16835b5d5f
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
xpcom/threads/plevent.c
View File

@ -262,10 +262,6 @@ PL_PostEvent(PLEventQueue* self, PLEvent* event)
mon = self->monitor;
PR_EnterMonitor(mon);
#ifdef PL_POST_TIMINGS
event->postTime = PR_IntervalNow();
#endif
/* insert event into thread's event queue: */
if (event != NULL) {
PR_APPEND_LINK(&event->link, &self->queue);
@ -293,11 +289,7 @@ PL_PostSynchronousEvent(PLEventQueue* self, PLEvent* event)
return NULL;
PR_ASSERT(event != NULL);
PR_CEnterMonitor(event);
#ifdef PL_POST_TIMINGS
event->postTime = PR_IntervalNow();
#endif
PR_Lock(event->lock);
if (PR_CurrentThread() == self->handlerThread) {
/* Handle the case where the thread requesting the event handling
@ -317,7 +309,12 @@ PL_PostSynchronousEvent(PLEventQueue* self, PLEvent* event)
for (i = 0; i < entryCount; i++)
PR_ExitMonitor(self->monitor);
}
PR_CWait(event, PR_INTERVAL_NO_TIMEOUT); /* wait for event to be handled or destroyed */
event->handled = PR_FALSE;
while (!event->handled)
PR_WaitCondVar(event->condVar, PR_INTERVAL_NO_TIMEOUT); /* wait for event to be handled or destroyed */
if (entryCount) {
for (i = 0; i < entryCount; i++)
PR_EnterMonitor(self->monitor);
@ -326,7 +323,7 @@ PL_PostSynchronousEvent(PLEventQueue* self, PLEvent* event)
event->synchronousResult = NULL;
}
PR_CExitMonitor(event);
PR_Unlock(event->lock);
/* For synchronous events, they're destroyed here on the caller's
thread before the result is returned. See PL_HandleEvent. */
@ -406,10 +403,11 @@ _pl_DestroyEventForOwner(PLEvent* event, void* owner, PLEventQueue* queue)
("$$$ \tdestroying event %0x for owner %0x", event, owner));
PL_DequeueEvent(event, queue);
if (event->synchronousResult == (void*)PR_TRUE) {
PR_CEnterMonitor(event);
PR_Lock(event->lock);
event->synchronousResult = NULL;
PR_CNotify(event);
PR_CExitMonitor(event);
event->handled = PR_TRUE;
PR_NotifyCondVar(event->condVar);
PR_Unlock(event->lock);
}
else {
PL_DestroyEvent(event);
@ -556,11 +554,19 @@ PL_InitEvent(PLEvent* self, void* owner,
PLHandleEventProc handler,
PLDestroyEventProc destructor)
{
#ifdef PL_POST_TIMINGS
self->postTime = PR_IntervalNow();
#endif
PR_INIT_CLIST(&self->link);
self->handler = handler;
self->destructor = destructor;
self->owner = owner;
self->synchronousResult = NULL;
self->handled = PR_FALSE;
self->lock = PR_NewLock();
PR_ASSERT(self->lock);
self->condVar = PR_NewCondVar(self->lock);
PR_ASSERT(self->condVar);
}
PR_IMPLEMENT(void*)
@ -580,16 +586,13 @@ PL_HandleEvent(PLEvent* self)
/* This event better not be on an event queue anymore. */
PR_ASSERT(PR_CLIST_IS_EMPTY(&self->link));
#ifdef PL_POST_TIMINGS
printf("$$$ last (%d) \n", PR_IntervalToMilliseconds(PR_IntervalNow() - self->postTime));
#endif
result = (*self->handler)(self);
if (NULL != self->synchronousResult) {
PR_CEnterMonitor(self);
PR_Lock(self->lock);
self->synchronousResult = result;
PR_CNotify(self); /* wake up the guy waiting for the result */
PR_CExitMonitor(self);
self->handled = PR_TRUE;
PR_NotifyCondVar(self->condVar);
PR_Unlock(self->lock);
}
else {
/* For asynchronous events, they're destroyed by the event-handler
@ -597,6 +600,10 @@ PL_HandleEvent(PLEvent* self)
PL_DestroyEvent(self);
}
}
#ifdef PL_POST_TIMINGS
static long s_eventCount = 0;
static long s_totalTime = 0;
#endif
PR_IMPLEMENT(void)
PL_DestroyEvent(PLEvent* self)
@ -607,6 +614,15 @@ PL_DestroyEvent(PLEvent* self)
/* This event better not be on an event queue anymore. */
PR_ASSERT(PR_CLIST_IS_EMPTY(&self->link));
PR_DestroyCondVar(self->condVar);
PR_DestroyLock(self->lock);
#ifdef PL_POST_TIMINGS
s_totalTime += PR_IntervalNow() - self->postTime;
s_eventCount++;
printf("$$$ running avg (%d) \n", PR_IntervalToMilliseconds(s_totalTime/s_eventCount));
#endif
(*self->destructor)(self);
}

5
xpcom/threads/plevent.h
View File

@ -168,6 +168,8 @@ and to ensure that no more events will be delivered for that owner.
#include "prtypes.h"
#include "prclist.h"
#include "prthread.h"
#include "prlock.h"
#include "prcvar.h"
#include "prmon.h"
/* For HWND */
@ -465,6 +467,9 @@ struct PLEvent {
PLDestroyEventProc destructor;
void* owner;
void* synchronousResult;
PRLock* lock;
PRCondVar* condVar;
PRBool handled;
#ifdef PL_POST_TIMINGS
PRIntervalTime postTime;
#endif