semId => semMutexId and semBinaryId
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -73,7 +73,7 @@ typedef struct {
|
||||
void *head;
|
||||
allocMem *mallochead;
|
||||
size_t nBlocksAvailable;
|
||||
semId lock;
|
||||
semMutexId lock;
|
||||
}FREELISTPVT;
|
||||
|
||||
epicsShareFunc void epicsShareAPI
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user