epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix incorrect value for highWaterMark in epicsRingBytes

Browse Source
This commit is contained in:
Martin Konrad
2018-11-29 19:14:55 -05:00
parent d436561cb2
commit 10d951e2d7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libCom/ring/epicsRingBytes.c
View File

@@ -121,7 +121,7 @@ epicsShareFunc int epicsShareAPI epicsRingBytesPut(
{
ringPvt *pring = (ringPvt *)id;
int nextGet, nextPut, size;
int freeCount, copyCount, topCount;
int freeCount, copyCount, topCount, used;
if (pring->lock) epicsSpinLock(pring->lock);
nextGet = pring->nextGet;
@@ -135,11 +135,7 @@ epicsShareFunc int epicsShareAPI epicsRingBytesPut(
return 0;
}
if (nbytes) {
int curUsed = pring->size - SLOP - freeCount;
memcpy ((void *)&pring->buffer[nextPut], value, nbytes);
if (curUsed > epicsAtomicGetIntT(&pring->highWaterMark)) {
epicsAtomicSetIntT(&pring->highWaterMark, curUsed);
}
}
nextPut += nbytes;
}
@@ -152,11 +148,7 @@ epicsShareFunc int epicsShareAPI epicsRingBytesPut(
topCount = size - nextPut;
copyCount = (nbytes > topCount) ? topCount : nbytes;
if (copyCount) {
int curUsed = pring->size - SLOP - freeCount;
memcpy ((void *)&pring->buffer[nextPut], value, copyCount);
if (curUsed > epicsAtomicGetIntT(&pring->highWaterMark)) {
epicsAtomicSetIntT(&pring->highWaterMark, curUsed);
}
}
nextPut += copyCount;
if (nextPut == size) {
@@ -168,6 +160,12 @@ epicsShareFunc int epicsShareAPI epicsRingBytesPut(
}
pring->nextPut = nextPut;
used = nextPut - nextGet;
if (used < 0) used += pring->size;
if (used > epicsAtomicGetIntT(&pring->highWaterMark)) {
epicsAtomicSetIntT(&pring->highWaterMark, used);
}
if (pring->lock) epicsSpinUnlock(pring->lock);
return nbytes;
}