make ui more responsive - acquire lock with timeout when getting status

dernasherbrezon · Mar 6, 2024 · 5ba8e54 · 5ba8e54
1 parent 81de0e2
commit 5ba8e54
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -308,7 +308,7 @@
 					<arch>all</arch>
 					<section>embedded</section>
 					<osDependencies>
-						<r2cloud-ui>>=1513613469</r2cloud-ui>
+						<r2cloud-ui>>=20240303125106</r2cloud-ui>
 						<r2cloud-jdk>>=17.0.5-1</r2cloud-jdk>
 						<nginx-light>>=1.10.3</nginx-light>
 						<rtl-sdr>>=0.6.4</rtl-sdr>

diff --git a/src/main/java/ru/r2cloud/device/RtlSdrDevice.java b/src/main/java/ru/r2cloud/device/RtlSdrDevice.java
@@ -1,5 +1,7 @@
 package ru.r2cloud.device;
 
+import java.util.concurrent.locks.ReentrantLock;
+
 import ru.r2cloud.model.DeviceConfiguration;
 import ru.r2cloud.model.DeviceStatus;
 import ru.r2cloud.model.Framing;
@@ -26,7 +28,7 @@ public class RtlSdrDevice extends Device {
 	private final Configuration config;
 	private final ProcessFactory processFactory;
 	private final RtlStatusProcess statusDao;
-	private final Object lock = new Object();
+	private final ReentrantLock lock = new ReentrantLock();
 
 	public RtlSdrDevice(String id, TransmitterFilter filter, int numberOfConcurrentObservations, ObservationFactory observationFactory, ThreadPoolFactory threadpoolFactory, Clock clock, DeviceConfiguration deviceConfiguration, IObservationDao observationDao, DecoderService decoderService,
 			PredictOreKit predict, Schedule schedule, Configuration config, ProcessFactory processFactory) {

diff --git a/src/main/java/ru/r2cloud/satellite/reader/RtlFmReader.java b/src/main/java/ru/r2cloud/satellite/reader/RtlFmReader.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.ProcessBuilder.Redirect;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,9 +28,9 @@ public class RtlFmReader implements IQReader {
 	private final ObservationRequest req;
 	private final Configuration config;
 	private final ProcessFactory factory;
-	private final Object lock;
+	private final ReentrantLock lock;
 
-	public RtlFmReader(Configuration config, DeviceConfiguration deviceConfiguration, ProcessFactory factory, ObservationRequest req, Object lock) {
+	public RtlFmReader(Configuration config, DeviceConfiguration deviceConfiguration, ProcessFactory factory, ObservationRequest req, ReentrantLock lock) {
 		this.config = config;
 		this.deviceConfiguration = deviceConfiguration;
 		this.factory = factory;
@@ -39,8 +40,11 @@ public RtlFmReader(Configuration config, DeviceConfiguration deviceConfiguration
 
 	@Override
 	public IQData start() throws InterruptedException {
-		synchronized (lock) {
+		lock.lock();
+		try {
 			return startInternally();
+		} finally {
+			lock.unlock();
 		}
 	}
 

diff --git a/src/main/java/ru/r2cloud/satellite/reader/RtlSdrReader.java b/src/main/java/ru/r2cloud/satellite/reader/RtlSdrReader.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,9 +33,9 @@ public class RtlSdrReader implements IQReader {
 	private final ProcessFactory factory;
 	private final ObservationRequest req;
 	private final Transmitter transmitter;
-	private final Object lock;
+	private final ReentrantLock lock;
 
-	public RtlSdrReader(Configuration config, DeviceConfiguration deviceConfiguration, ProcessFactory factory, ObservationRequest req, Transmitter transmitter, Object lock) {
+	public RtlSdrReader(Configuration config, DeviceConfiguration deviceConfiguration, ProcessFactory factory, ObservationRequest req, Transmitter transmitter, ReentrantLock lock) {
 		this.config = config;
 		this.deviceConfiguration = deviceConfiguration;
 		this.factory = factory;
@@ -64,8 +65,11 @@ public RtlSdrReader(Configuration config, DeviceConfiguration deviceConfiguratio
 
 	@Override
 	public IQData start() throws InterruptedException {
-		synchronized (lock) {
+		lock.lock();
+		try {
 			return startInternally();
+		} finally {
+			lock.unlock();
 		}
 	}
 

diff --git a/src/main/java/ru/r2cloud/sdr/RtlStatusProcess.java b/src/main/java/ru/r2cloud/sdr/RtlStatusProcess.java
@@ -3,6 +3,8 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -24,27 +26,39 @@ public class RtlStatusProcess implements SdrStatusProcess {
 	private final Configuration config;
 	private final ProcessFactory factory;
 	private final int expectedRtlDeviceId;
-	private final Object lock;
+	private final ReentrantLock lock;
+	private SdrStatus previousStatus;
 
-	public RtlStatusProcess(Configuration config, ProcessFactory factory, int expectedRtlDeviceId, Object lock) {
+	public RtlStatusProcess(Configuration config, ProcessFactory factory, int expectedRtlDeviceId, ReentrantLock lock) {
 		this.config = config;
 		this.factory = factory;
 		this.expectedRtlDeviceId = expectedRtlDeviceId;
 		this.lock = lock;
+		this.previousStatus = getStatus();
 	}
 
 	@Override
 	public SdrStatus getStatus() {
-		SdrStatus result = null;
 		// won't help much for systems with multiple rtlsdr sticks
 		// rtl_test will lock each device despite "-d" argument
-		synchronized (lock) {
-			result = getStatusInternally(result);
+		try {
+			if (lock.tryLock(1000, TimeUnit.MILLISECONDS)) {
+				try {
+					previousStatus = getStatusInternally();
+					return previousStatus;
+				} finally {
+					lock.unlock();
+				}
+			}
+			LOG.info("can't get status within specified timeout. returning previous status");
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 		}
-		return result;
+		return previousStatus;
 	}
 
-	private SdrStatus getStatusInternally(SdrStatus result) {
+	private SdrStatus getStatusInternally() {
+		SdrStatus result = null;
 		try {
 			BufferedReader r = null;
 			ProcessWrapper process = factory.create(config.getProperty("satellites.rtlsdr.test.path") + " -t", false, false);

diff --git a/src/test/java/ru/r2cloud/RtlStatusProcessTest.java b/src/test/java/ru/r2cloud/RtlStatusProcessTest.java
@@ -4,6 +4,7 @@
 
 import java.io.File;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.junit.After;
 import org.junit.Before;
@@ -66,7 +67,7 @@ public void start() throws Exception {
 		rtlTestServer = new RtlTestServer(8003);
 		rtlTestServer.start();
 
-		dao = new RtlStatusProcess(config, new ProcessFactory(), expectedRtlDeviceId, new Object());
+		dao = new RtlStatusProcess(config, new ProcessFactory(), expectedRtlDeviceId, new ReentrantLock());
 	}
 
 	@After

diff --git a/src/test/java/ru/r2cloud/satellite/reader/RtlFmReaderTest.java b/src/test/java/ru/r2cloud/satellite/reader/RtlFmReaderTest.java
@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -52,7 +53,7 @@ public void testFailure() throws Exception {
 		ObservationRequest req = new ObservationRequest();
 		req.setSatelliteId(satelliteId);
 
-		RtlFmReader o = new RtlFmReader(config, new DeviceConfiguration(), factory, req, new Object());
+		RtlFmReader o = new RtlFmReader(config, new DeviceConfiguration(), factory, req, new ReentrantLock());
 		IQData iqData = o.start();
 		o.complete();
 		assertNull(iqData.getDataFile());
@@ -70,7 +71,7 @@ public void testSuccess() throws Exception {
 
 		ObservationRequest req = new ObservationRequest();
 
-		RtlFmReader o = new RtlFmReader(config, new DeviceConfiguration(), factory, req, new Object());
+		RtlFmReader o = new RtlFmReader(config, new DeviceConfiguration(), factory, req, new ReentrantLock());
 		o.start();
 		o.complete();
 		assertEquals(data, new String(baos.toByteArray(), StandardCharsets.UTF_8));

diff --git a/src/test/java/ru/r2cloud/satellite/reader/RtlSdrReaderTest.java b/src/test/java/ru/r2cloud/satellite/reader/RtlSdrReaderTest.java
@@ -7,6 +7,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -44,7 +45,7 @@ public void testBiasTSuccess() throws Exception {
 		Transmitter transmitter = new Transmitter();
 		transmitter.setBaudRates(Collections.singletonList(9600));
 
-		RtlSdrReader o = new RtlSdrReader(config, deviceConfiguration, factory, req, transmitter, new Object());
+		RtlSdrReader o = new RtlSdrReader(config, deviceConfiguration, factory, req, transmitter, new ReentrantLock());
 		IQData iqData = o.start();
 		o.complete();
 		assertNotNull(iqData.getDataFile());
@@ -64,7 +65,7 @@ public void testBiasTFailure() throws Exception {
 		Transmitter transmitter = new Transmitter();
 		transmitter.setBaudRates(Collections.singletonList(9600));
 
-		RtlSdrReader o = new RtlSdrReader(config, deviceConfiguration, factory, req, transmitter, new Object());
+		RtlSdrReader o = new RtlSdrReader(config, deviceConfiguration, factory, req, transmitter, new ReentrantLock());
 		IQData iqData = o.start();
 		o.complete();
 		assertNull(iqData);
@@ -81,7 +82,7 @@ public void testFailure() throws Exception {
 		Transmitter transmitter = new Transmitter();
 		transmitter.setBaudRates(Collections.singletonList(9600));
 
-		RtlSdrReader o = new RtlSdrReader(config, new DeviceConfiguration(), factory, req, transmitter, new Object());
+		RtlSdrReader o = new RtlSdrReader(config, new DeviceConfiguration(), factory, req, transmitter, new ReentrantLock());
 		IQData iqData = o.start();
 		o.complete();
 		assertNull(iqData.getDataFile());
@@ -98,7 +99,7 @@ public void testSuccess() throws Exception {
 		Transmitter transmitter = new Transmitter();
 		transmitter.setBaudRates(Collections.singletonList(9600));
 
-		RtlSdrReader o = new RtlSdrReader(config, new DeviceConfiguration(), factory, req, transmitter, new Object());
+		RtlSdrReader o = new RtlSdrReader(config, new DeviceConfiguration(), factory, req, transmitter, new ReentrantLock());
 		IQData iqData = o.start();
 		o.complete();
 		assertNotNull(iqData.getDataFile());