From dbf87b772e84462fc4b435889d87079cc1f58368 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 27 Jan 2000 20:06:03 +0000 Subject: [PATCH] semId => semMutexId and semBinaryId --- src/libCom/error/errlog.c | 6 +++--- src/libCom/freeList/freeListLib.c | 2 +- src/libCom/gpHash/gpHashLib.c | 2 +- src/libCom/logClient/logClient.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libCom/error/errlog.c b/src/libCom/error/errlog.c index e3b34a411..517109169 100644 --- a/src/libCom/error/errlog.c +++ b/src/libCom/error/errlog.c @@ -67,9 +67,9 @@ typedef struct msgNode { } msgNode; LOCAL struct { - semId errlogTaskWaitForWork; - semId msgQueueLock; - semId listenerLock; + semBinaryId errlogTaskWaitForWork; + semMutexId msgQueueLock; + semMutexId listenerLock; ELLLIST listenerList; ELLLIST msgQueue; msgNode *pnextSend; diff --git a/src/libCom/freeList/freeListLib.c b/src/libCom/freeList/freeListLib.c index f183970bd..749cc1940 100644 --- a/src/libCom/freeList/freeListLib.c +++ b/src/libCom/freeList/freeListLib.c @@ -73,7 +73,7 @@ typedef struct { void *head; allocMem *mallochead; size_t nBlocksAvailable; - semId lock; + semMutexId lock; }FREELISTPVT; epicsShareFunc void epicsShareAPI diff --git a/src/libCom/gpHash/gpHashLib.c b/src/libCom/gpHash/gpHashLib.c index 5e8bebfd2..e5d350792 100644 --- a/src/libCom/gpHash/gpHashLib.c +++ b/src/libCom/gpHash/gpHashLib.c @@ -68,7 +68,7 @@ typedef struct gphPvt { int tableSize; int nShift; ELLLIST **paplist; /*pointer to array of pointers to ELLLIST */ - semId lock; + semMutexId lock; }gphPvt; diff --git a/src/libCom/logClient/logClient.c b/src/libCom/logClient/logClient.c index 107894c6f..8dd410320 100644 --- a/src/libCom/logClient/logClient.c +++ b/src/libCom/logClient/logClient.c @@ -71,15 +71,15 @@ typedef struct { ELLNODE node; /* must be the first field in struct */ struct sockaddr_in addr; FILE *file; - semId mutex; + semMutexId mutex; SOCKET sock; unsigned connectTries; unsigned connectCount; unsigned connectReset; }logClient; -LOCAL semId logClientGlobalMutex; -LOCAL semId logClientGlobalSignal; +LOCAL semMutexId logClientGlobalMutex; +LOCAL semBinaryId logClientGlobalSignal; LOCAL ELLLIST logClientList; LOCAL threadId logClientThreadId; LOCAL logClient *pLogClientDefaultClient; @@ -589,7 +589,7 @@ epicsShareFunc logClientId epicsShareAPI logClientInit () */ while (pClient->file==NULL) { - semMutexGive (logClientGlobalSignal); + semBinaryGive (logClientGlobalSignal); threadSleep (50e-3);