From 9e4b366ee88a41edb569fc666bb4871cc2d87760 Mon Sep 17 00:00:00 2001 From: Jeremy Lorelli Date: Wed, 24 Jun 2026 16:58:31 -0700 Subject: [PATCH] libcom: Switch epicsMutexMustLock() to cantProceed() --- modules/libcom/src/osi/epicsMutex.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/libcom/src/osi/epicsMutex.h b/modules/libcom/src/osi/epicsMutex.h index 117767a48..c88f57e74 100644 --- a/modules/libcom/src/osi/epicsMutex.h +++ b/modules/libcom/src/osi/epicsMutex.h @@ -41,6 +41,7 @@ #ifndef epicsMutexh #define epicsMutexh +#include "cantProceed.h" #include "epicsAssert.h" #include "libComAPI.h" @@ -212,9 +213,12 @@ LIBCOM_API epicsMutexLockStatus epicsStdCall epicsMutexLock( * This routine does not return if the identifier is invalid. * \param ID The mutex identifier. **/ -#define epicsMutexMustLock(ID) { \ - epicsMutexLockStatus status = epicsMutexLock(ID); \ - assert(status == epicsMutexLockOK); \ +#define epicsMutexMustLock(ID) { \ + epicsMutexLockStatus status = epicsMutexLock(ID); \ + if(status != epicsMutexLockOK) { \ + cantProceed("epicsMutexMustLock() failed at %s:%d", \ + __FILE__, __LINE__); \ + } \ } /**\brief Similar to epicsMutexLock() except that the call returns immediately,