From 6d233f47e4535e261f11e7e7e628b9cf9312a8e8 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 27 Jun 2013 05:35:35 +0000
Subject: [PATCH] Task #3696: Forward configurable timeout from BufferSettings
to SharedStruct
---
RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.cc | 4 ++--
RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.cc b/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.cc
index 2ddf659924e..faad047d87e 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.cc
+++ b/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.cc
@@ -37,14 +37,14 @@ namespace LOFAR
{
}
- BufferSettings::BufferSettings(const struct StationID &station, bool attach)
+ BufferSettings::BufferSettings(const struct StationID &station, bool attach, time_t timeout)
:
version(currentVersion),
station(station)
{
if (attach) {
do {
- SharedStruct<struct BufferSettings> shm(station.hash(), false);
+ SharedStruct<struct BufferSettings> shm(station.hash(), false, timeout);
*this = shm.get();
} while (!valid());
diff --git a/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.h b/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.h
index 0ace450518b..e8f7edaa14a 100644
--- a/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.h
+++ b/RTCP/Cobalt/InputProc/src/Buffer/BufferSettings.h
@@ -69,7 +69,7 @@ namespace LOFAR
// if attach=true, read settings from shared memory, using the given stationID
// if attach=false, set sane default values
- BufferSettings(const struct StationID &station, bool attach);
+ BufferSettings(const struct StationID &station, bool attach, time_t timeout = 60);
// Shortcut to set nrSamples to represent `seconds' of buffer.
void setBufferSize(double seconds);
--
GitLab