epicsAutoMutex has a new name, fixed free lists, and use c++ thread class,
and fixed dll symbol exports
This commit is contained in:
@@ -16,8 +16,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
#include "iocinf.h"
|
||||
|
||||
#include "oldAccess.h"
|
||||
|
||||
extern epicsThreadPrivateId caClientContextId;
|
||||
@@ -39,7 +39,7 @@ oldCAC::~oldCAC ()
|
||||
|
||||
void oldCAC::changeExceptionEvent ( caExceptionHandler *pfunc, void *arg )
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
this->ca_exception_func = pfunc;
|
||||
this->ca_exception_arg = arg;
|
||||
// should block here until releated callback in progress completes
|
||||
@@ -47,7 +47,7 @@ void oldCAC::changeExceptionEvent ( caExceptionHandler *pfunc, void *arg )
|
||||
|
||||
void oldCAC::replaceErrLogHandler ( caPrintfFunc *ca_printf_func )
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
if ( ca_printf_func ) {
|
||||
this->pVPrintfFunc = ca_printf_func;
|
||||
}
|
||||
@@ -59,7 +59,7 @@ void oldCAC::replaceErrLogHandler ( caPrintfFunc *ca_printf_func )
|
||||
|
||||
void oldCAC::registerForFileDescriptorCallBack ( CAFDHANDLER *pFunc, void *pArg )
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
this->fdRegFunc = pFunc;
|
||||
this->fdRegArg = pArg;
|
||||
// should block here until releated callback in progress completes
|
||||
@@ -83,7 +83,7 @@ int oldCAC::vPrintf ( const char *pformat, va_list args ) const // X aCC 361
|
||||
{
|
||||
caPrintfFunc *pFunc;
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
pFunc = this->pVPrintfFunc;
|
||||
}
|
||||
if ( pFunc ) {
|
||||
@@ -101,7 +101,7 @@ void oldCAC::exception ( int stat, const char *pCtx,
|
||||
caExceptionHandler *pFunc;
|
||||
void *pArg;
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
pFunc = this->ca_exception_func;
|
||||
pArg = this->ca_exception_arg;
|
||||
}
|
||||
@@ -133,7 +133,7 @@ void oldCAC::exception ( int status, const char *pContext,
|
||||
caExceptionHandler *pFunc;
|
||||
void *pArg;
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
pFunc = this->ca_exception_func;
|
||||
pArg = this->ca_exception_arg;
|
||||
}
|
||||
@@ -166,7 +166,7 @@ void oldCAC::fdWasCreated ( int fd )
|
||||
CAFDHANDLER *pFunc;
|
||||
void *pArg;
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
pFunc = this->fdRegFunc;
|
||||
pArg = this->fdRegArg;
|
||||
}
|
||||
@@ -180,7 +180,7 @@ void oldCAC::fdWasDestroyed ( int fd )
|
||||
CAFDHANDLER *pFunc;
|
||||
void *pArg;
|
||||
{
|
||||
epicsAutoMutex autoMutex ( this->mutex );
|
||||
epicsGuard < epicsMutex > autoMutex ( this->mutex );
|
||||
pFunc = this->fdRegFunc;
|
||||
pArg = this->fdRegArg;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user