From aedea0da3705658f47e494f4fd0b592f032f5dd9 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sat, 2 Aug 2014 23:15:43 -0500
Subject: [PATCH] default/osdSpin.c add missing #include "cantProceed.h"

Also adjusted some error messages for common style.
---
 src/libCom/osi/os/default/osdSpin.c | 10 ++++++----
 src/libCom/osi/os/posix/osdSpin.c   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libCom/osi/os/default/osdSpin.c b/src/libCom/osi/os/default/osdSpin.c
index f4caf4930..6e9acb158 100644
--- a/src/libCom/osi/os/default/osdSpin.c
+++ b/src/libCom/osi/os/default/osdSpin.c
@@ -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;
 }
 
diff --git a/src/libCom/osi/os/posix/osdSpin.c b/src/libCom/osi/os/posix/osdSpin.c
index 6ebc9f785..ee578c41a 100644
--- a/src/libCom/osi/os/posix/osdSpin.c
+++ b/src/libCom/osi/os/posix/osdSpin.c
@@ -175,6 +175,6 @@ epicsSpinId epicsSpinMustCreate(void)
 {
     epicsSpinId ret = epicsSpinCreate();
     if(!ret)
-        cantProceed("epicsSpinMustCreate fails");
+        cantProceed("epicsSpinMustCreate: epicsSpinCreate failed.");
     return ret;
 }