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

committed merge

Browse Source
This commit is contained in:
Jeff Hill
2011-08-16 18:34:36 -06:00
committed by Andrew Johnson
parent b5f1a94fc9 e929857ac8
commit 4bea8cbb0a
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libCom/osi/epicsAtomic.h
View File

@@ -1,4 +1,3 @@
/*************************************************************************\
* Copyright (c) 2011 LANS LLC, as Operator of
* Los Alamos National Laboratory.
@@ -91,10 +90,10 @@ epicsShareFunc size_t epicsLockedIncrSizeT ( size_t * pTarget );
epicsShareFunc size_t epicsLockedDecrSizeT ( size_t * pTarget );
epicsShareFunc void epicsLockedSetSizeT ( size_t * pTarget, size_t newVal );
epicsShareFunc void epicsLockedSetUIntT ( unsigned * pTarget, unsigned newVal );
epicsShareFunc void epicsLockedSetPtrT ( unsigned * pTarget, EpicsAtomicPtrT newVal );
epicsShareFunc void epicsLockedSetPtrT ( EpicsAtomicPtrT * pTarget, EpicsAtomicPtrT newVal );
epicsShareFunc size_t epicsLockedGetSizeT ( const size_t * pTarget );
epicsShareFunc unsigned epicsLockedGetUIntT ( const unsigned * pTarget );
epicsShareFunc EpicsAtomicPtrT epicsLockedGetPtrT ( const unsigned * pTarget );
epicsShareFunc EpicsAtomicPtrT epicsLockedGetPtrT ( const EpicsAtomicPtrT * pTarget );
epicsShareFunc unsigned epicsLockedCmpAndSwapUIntT ( unsigned * pTarget,
unsigned oldval, unsigned newval );
epicsShareFunc EpicsAtomicPtrT epicsLockedCmpAndSwapPtrT ( EpicsAtomicPtrT * pTarget,

18
src/libCom/osi/epicsAtomicLocked.cpp
View File

@@ -1,4 +1,3 @@
/*************************************************************************\
* Copyright (c) 2011 LANS LLC, as Operator of
* Los Alamos National Laboratory.
@@ -105,13 +104,25 @@ void epicsLockedSetUIntT ( unsigned * pTarget, unsigned newVal )
*pTarget = newVal;
}
void epicsLockedSetPtrT ( EpicsAtomicPtrT * pTarget, EpicsAtomicPtrT newVal )
{
AtomicGuard atomicGuard;
*pTarget = newVal;
}
unsigned epicsLockedGetUIntT ( const unsigned * pTarget )
{
AtomicGuard atomicGuard;
return *pTarget;
}
size_t epicsLockedGetSizeT ( const size_t * pTarget )
{
AtomicGuard atomicGuard;
return *pTarget;
}
unsigned epicsLockedGetUIntT ( const unsigned * pTarget )
EpicsAtomicPtrT epicsLockedGetPtrT ( const EpicsAtomicPtrT * pTarget )
{
AtomicGuard atomicGuard;
return *pTarget;
@@ -141,6 +152,3 @@ EpicsAtomicPtrT epicsLockedCmpAndSwapPtrT ( EpicsAtomicPtrT * pTarget,
} // end of extern "C"

8
src/libCom/osi/epicsAtomicLocked.h
View File

@@ -1,4 +1,3 @@
/*************************************************************************\
* Copyright (c) 2011 LANS LLC, as Operator of
* Los Alamos National Laboratory.
@@ -62,14 +61,14 @@ OSD_ATOMIC_INLINE EpicsAtomicPtrT epicsAtomicGetPtrT ( const EpicsAtomicPtrT * p
return epicsLockedGetPtrT ( pTarget );
}
OSD_ATOMIC_INLINE unsigned epicsAomicCmpAndSwapUIntT ( unsigned * pTarget,
OSD_ATOMIC_INLINE unsigned epicsAtomicCmpAndSwapUIntT ( unsigned * pTarget,
unsigned oldVal, unsigned newVal )
{
return epicsLockedCmpAndSwapUIntT ( pTarget, oldVal, newVal );
}
OSD_ATOMIC_INLINE EpicsAtomicPtrT epicsLockedCmpAndSwapPtrT ( EpicsAtomicPtrT * pTarget,
EpicsAtomicPtrT oldval, EpicsAtomicPtrT newval )
OSD_ATOMIC_INLINE EpicsAtomicPtrT epicsAtomicCmpAndSwapPtrT ( EpicsAtomicPtrT * pTarget,
EpicsAtomicPtrT oldVal, EpicsAtomicPtrT newVal )
{
return epicsLockedCmpAndSwapPtrT ( pTarget, oldVal, newVal );
}
@@ -95,4 +94,3 @@ OSD_ATOMIC_INLINE EpicsAtomicPtrT epicsLockedCmpAndSwapPtrT ( EpicsAtomicPtrT *
#endif /* epicsAtomicLocked_h */