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

Allow any length RW lock names for WIN32

Browse source 
Dynamically allocate the string space for RW
lock names for WIN32 (ntthread.c).  This
makes the WIN32 more consistent with the other
environments.
This commit is contained in:
Ron Koenderink 2008-09-13 16:39:45 -06:00
parent 838a1010c2
commit 74b655f9fa
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ struct loc_Thread {
* *
*/ */
struct loc_RWLock { struct loc_RWLock {
char name[17]; /* The thread name, passed in at create time. */ char *name; /* The lock name, passed in at create time. */
HANDLE can_read; /* Manual event -- allows read locks */ HANDLE can_read; /* Manual event -- allows read locks */
HANDLE can_write; /* Auto-reset event -- allows write locks */ HANDLE can_write; /* Auto-reset event -- allows write locks */
int nread; /* number of active readers */ int nread; /* number of active readers */
@ -666,11 +666,12 @@ empth_rwlock_create(char *name)
return NULL; return NULL;
memset(rwlock, 0, sizeof(*rwlock)); memset(rwlock, 0, sizeof(*rwlock));
strncpy(rwlock->name, name, sizeof(rwlock->name) - 1); rwlock->name = strdup(name);
if ((rwlock->can_read = CreateEvent(NULL, TRUE, TRUE, NULL)) == NULL) { if ((rwlock->can_read = CreateEvent(NULL, TRUE, TRUE, NULL)) == NULL) {
logerror("rwlock_create: failed to create reader event %s at %s:%d", logerror("rwlock_create: failed to create reader event %s at %s:%d",
name, __FILE__, __LINE__); name, __FILE__, __LINE__);
free(rwlock->name);
free(rwlock); free(rwlock);
return NULL; return NULL;
} }
@ -678,6 +679,7 @@ empth_rwlock_create(char *name)
if ((rwlock->can_write = CreateEvent(NULL, FALSE, TRUE, NULL)) == NULL) { if ((rwlock->can_write = CreateEvent(NULL, FALSE, TRUE, NULL)) == NULL) {
logerror("rwlock_create: failed to create writer event %s at %s:%d", logerror("rwlock_create: failed to create writer event %s at %s:%d",
name, __FILE__, __LINE__); name, __FILE__, __LINE__);
free(rwlock->name);
CloseHandle(rwlock->can_read); CloseHandle(rwlock->can_read);
free(rwlock); free(rwlock);
return NULL; return NULL;
@ -690,6 +692,8 @@ empth_rwlock_destroy(empth_rwlock_t *rwlock)
{ {
if (CANT_HAPPEN(rwlock->nread || rwlock->nwrite)) if (CANT_HAPPEN(rwlock->nread || rwlock->nwrite))
return; return;
if (rwlock->name != NULL)
free(rwlock->name);
CloseHandle(rwlock->can_read); CloseHandle(rwlock->can_read);
CloseHandle(rwlock->can_write); CloseHandle(rwlock->can_write);
free(rwlock); free(rwlock);