empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(struct loc_Thread, empth_sem_wait, empth_sem_signal) [WIN32]:

Browse source 
Remove the semaphore mutex and replace with hThreadMutex instead
This commit is contained in:
Ron Koenderink 2007-01-18 14:28:23 +00:00
parent 68662df96a
commit 71b46e770b
1 changed files with 6 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/empthread/ntthread.c
View file

@ -97,13 +97,12 @@ struct loc_Thread {
*/ */
struct loc_Sem { struct loc_Sem {
/* The semaphore name, passed in at create time. */
char szName[17]; char szName[17];
/* An exclusion semaphore for this sem. */
HANDLE hMutex;
/* An Event that the thread(s) will sleep on. */ /* An Event that the thread(s) will sleep on. */
HANDLE hEvent; HANDLE hEvent;
/* The count variable */ /* The count variable */
int count; int count;
}; };
@ -664,7 +663,6 @@ empth_sem_create(char *name, int cnt)
memset(pSem, 0, sizeof(pSem)); memset(pSem, 0, sizeof(pSem));
strncpy(pSem->szName, name, sizeof(pSem->szName) - 1); strncpy(pSem->szName, name, sizeof(pSem->szName) - 1);
pSem->hMutex = CreateMutex(NULL, FALSE, NULL);
pSem->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); pSem->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
pSem->count = cnt; pSem->count = cnt;
@ -681,14 +679,9 @@ empth_sem_signal(empth_sem_t *pSem)
{ {
loc_debug("signal on semaphore %s:%d", pSem->szName, pSem->count); loc_debug("signal on semaphore %s:%d", pSem->szName, pSem->count);
/* Wait for the Semaphore */
WaitForSingleObject(pSem->hMutex, INFINITE);
if (pSem->count++ < 0) { if (pSem->count++ < 0) {
SetEvent(pSem->hEvent); SetEvent(pSem->hEvent);
} }
ReleaseMutex(pSem->hMutex);
} }
/************************ /************************
@ -702,23 +695,13 @@ empth_sem_wait(empth_sem_t *pSem)
empth_t *pThread = TlsGetValue(dwTLSIndex); empth_t *pThread = TlsGetValue(dwTLSIndex);
loc_debug("wait on semaphore %s:%d", pSem->szName, pSem->count); loc_debug("wait on semaphore %s:%d", pSem->szName, pSem->count);
if (--pSem->count < 0) {
/* Remove the thread from the running state. */ /* Remove the thread from the running state. */
loc_BlockThisThread(); loc_BlockThisThread();
/* Wait for the Semaphore */
WaitForSingleObject(pSem->hMutex, INFINITE);
if (--pSem->count < 0) {
loc_debug("blocking"); loc_debug("blocking");
ReleaseMutex(pSem->hMutex); loc_RunThisThread(pSem->hEvent);
WaitForSingleObject(pSem->hEvent, INFINITE);
loc_debug("waking up"); loc_debug("waking up");
} else }
ReleaseMutex(pSem->hMutex);
loc_RunThisThread(NULL);
} }
empth_rwlock_t * empth_rwlock_t *