lin-epics-modules/StreamGenerator
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes pausing issue due to logic bug
Some checks failed
Test And Build / Build (push) Failing after 2s
Details
Test And Build / Lint (push) Successful in 3s
Details

Browse Source
This commit is contained in:
wall_e
2025-11-19 15:08:59 +01:00
parent 5b65a01e51
commit 668dd65823
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/asynStreamGeneratorDriver.cpp
View File

@@ -499,7 +499,7 @@ void asynStreamGeneratorDriver::receiveUDP() {
const std::size_t minCmdBufferHeaderLength = 20; const std::size_t minCmdBufferHeaderLength = 20;
if (received >= minDataBufferHeaderLength && if (received >= minDataBufferHeaderLength &&
received == bufferLength * 2 && !isCmdBuffer) { received == bufferLength * 2) {
epicsRingBytesPut(this->udpQueue, (char *)buffer, bufferSize); epicsRingBytesPut(this->udpQueue, (char *)buffer, bufferSize);
@@ -681,7 +681,7 @@ inline void asynStreamGeneratorDriver::queueForKafka(NormalisedEvent &ne) {
void asynStreamGeneratorDriver::processEvents() { void asynStreamGeneratorDriver::processEvents() {
// const char functionName[]{"processEvents"}; const char functionName[]{"processEvents"};
// x * number of ids * max events in packet * event size // x * number of ids * max events in packet * event size
int bufferedEvents = 5 * 10 * 243; int bufferedEvents = 5 * 10 * 243;
@@ -776,19 +776,38 @@ void asynStreamGeneratorDriver::processEvents() {
for (std::size_t i = 0; i < this->num_channels; ++i) { for (std::size_t i = 0; i < this->num_channels; ++i) {
counts[i] = 0; counts[i] = 0;
} }
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: starting count: (%d, %d, %d, %" PRIu64 ")\n",
driverName, functionName, countPreset, timePreset,
presetChannel, startTimestamp);
} }
if (currStatus == STATUS_COUNTING) { if (currStatus == STATUS_COUNTING) {
for (std::size_t i = 0; i < toProcess; ++i) { for (std::size_t i = 0; i < toProcess; ++i) {
counts[eventsA[i].source == 0 ? eventsA[i].pixelId counts[eventsA[i].source == 0 ? eventsA[i].pixelId
: this->num_channels - 1] += 1; : this->num_channels - 1] += 1;
elapsedSeconds = (eventsA[i].timestamp - startTimestamp) / 1e9; elapsedSeconds = (eventsA[i].timestamp - startTimestamp) / 1e9;
// TODO should really check there an no more events with the const bool reachedCount =
// same final timestamp countPreset && counts[presetChannel] >= countPreset;
if ((countPreset && counts[presetChannel] >= countPreset) || const bool reachedTime =
(timePreset && elapsedSeconds > (double)timePreset)) { timePreset && elapsedSeconds > (double)timePreset;
if (reachedCount || reachedTime) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: reached preset: (%lld, %f)\n", driverName,
functionName, counts[presetChannel],
elapsedSeconds);
// TODO should really check there an no more events with the
// same final timestamp
if (counts[presetChannel] == countPreset)
this->queueForKafka(eventsA[i]);
elapsedSeconds = elapsedSeconds =
timePreset == 0 ? elapsedSeconds : timePreset; timePreset == 0 ? elapsedSeconds : timePreset;
@@ -805,7 +824,9 @@ void asynStreamGeneratorDriver::processEvents() {
setDoubleParam(P_ElapsedTime, elapsedSeconds); setDoubleParam(P_ElapsedTime, elapsedSeconds);
if ((countPreset && counts[presetChannel] >= countPreset) || if ((countPreset && counts[presetChannel] >= countPreset) ||
(timePreset && elapsedSeconds > (double)timePreset)) { (timePreset && elapsedSeconds >= (double)timePreset)) {
asynPrint(pasynUserSelf, ASYN_TRACE_ERROR,
"%s:%s: finished count\n", driverName, functionName);
setIntegerParam(this->P_Status, STATUS_IDLE); setIntegerParam(this->P_Status, STATUS_IDLE);
setIntegerParam(this->P_CountPreset, 0); setIntegerParam(this->P_CountPreset, 0);
setIntegerParam(this->P_TimePreset, 0); setIntegerParam(this->P_TimePreset, 0);