epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

default/osdSpin.c add missing #include "cantProceed.h"

Browse Source 
Also adjusted some error messages for common style.
This commit is contained in:
Andrew Johnson
2014-08-02 23:15:43 -05:00
parent 6767f5089f
commit aedea0da37
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libCom/osi/os/default/osdSpin.c
View File

@@ -13,6 +13,7 @@
#include <stdlib.h>
#define epicsExportSharedSymbols
#include "cantProceed.h"
#include "errlog.h"
#include "epicsMutex.h"
#include "epicsSpin.h"
@@ -47,7 +48,7 @@ epicsSpinId epicsSpinMustCreate(void)
{
epicsSpinId ret = epicsSpinCreate();
if(!ret)
cantProceed("epicsSpinMustCreate fails");
cantProceed("epicsSpinMustCreate: epicsSpinCreate failed.");
return ret;
}
@@ -61,8 +62,9 @@ void epicsSpinLock(epicsSpinId spin) {
status = epicsMutexLock(spin->lock);
if (status != epicsMutexLockOK) {
errlogPrintf("epicsSpin epicsMutexLock failed: error %s\n",
status == epicsMutexLockTimeout ? "epicsMutexLockTimeout" : "epicsMutexLockError");
errlogPrintf("epicsSpinLock(%p): epicsMutexLock returned %s\n", spin,
status == epicsMutexLockTimeout ?
"epicsMutexLockTimeout" : "epicsMutexLockError");
}
}
@@ -73,7 +75,7 @@ int epicsSpinTryLock(epicsSpinId spin) {
if (status == epicsMutexLockOK) return 0;
if (status == epicsMutexLockTimeout) return 1;
errlogPrintf("epicsSpin epicsMutexTryLock failed: error epicsMutexLockError\n");
errlogPrintf("epicsSpinTryLock(%p): epicsMutexTryLock returned epicsMutexLockError\n", spin);
return 2;
}

2
src/libCom/osi/os/posix/osdSpin.c
View File

@@ -175,6 +175,6 @@ epicsSpinId epicsSpinMustCreate(void)
{
epicsSpinId ret = epicsSpinCreate();
if(!ret)
cantProceed("epicsSpinMustCreate fails");
cantProceed("epicsSpinMustCreate: epicsSpinCreate failed.");
return ret;
}