mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
Compare commits
1 Commits
2672-dispa
...
315-now-pl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e8837410f |
@@ -68,12 +68,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
||||
private final static Logger mLog = LoggerFactory.getLogger(PolyphaseChannelManager.class);
|
||||
private static final double CHANNEL_OVERSAMPLING = 2.0;
|
||||
private static final int POLYPHASE_CHANNELIZER_TAPS_PER_CHANNEL = 9;
|
||||
/**
|
||||
* Maximum duration of queued native buffers awaiting the channelizer. The queue is bounded by sample count instead
|
||||
* of buffer count because tuner buffer sizes vary widely, for example about 1,000 samples per RSP buffer and 32,768
|
||||
* samples per RTL-SDR buffer, so that each tuner can absorb a processing delay of the same duration.
|
||||
*/
|
||||
private static final double MAXIMUM_QUEUED_SECONDS = 1.0;
|
||||
private static final int MAXIMUM_QUEUED_NATIVE_BUFFERS = 500;
|
||||
|
||||
private Broadcaster<SourceEvent> mSourceEventBroadcaster = new Broadcaster<>();
|
||||
private TunerController mTunerController;
|
||||
@@ -83,7 +78,7 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
||||
private ComplexPolyphaseChannelizerM2 mPolyphaseChannelizer;
|
||||
private ChannelSourceEventListener mChannelSourceEventListener = new ChannelSourceEventListener();
|
||||
private NativeBufferReceiver mNativeBufferReceiver = new NativeBufferReceiver();
|
||||
private Dispatcher<INativeBuffer> mBufferDispatcher;
|
||||
private Dispatcher mBufferDispatcher;
|
||||
private boolean mRunning = true;
|
||||
|
||||
/**
|
||||
@@ -104,21 +99,10 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
||||
|
||||
mChannelCalculator = new ChannelCalculator(tunerController.getSampleRate(), channelCount,
|
||||
tunerController.getFrequency(), CHANNEL_OVERSAMPLING);
|
||||
mBufferDispatcher = new Dispatcher<>("sdrtrunk polyphase buffer processor", 10, INativeBuffer::sampleCount,
|
||||
getMaximumQueuedSamples(tunerController.getSampleRate()));
|
||||
mBufferDispatcher = new Dispatcher("sdrtrunk polyphase buffer processor", 10, MAXIMUM_QUEUED_NATIVE_BUFFERS);
|
||||
mBufferDispatcher.setListener(mNativeBufferReceiver);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates the maximum number of queued samples for the buffer dispatcher.
|
||||
* @param sampleRate of the tuner
|
||||
* @return maximum queued samples, at least one
|
||||
*/
|
||||
private static long getMaximumQueuedSamples(double sampleRate)
|
||||
{
|
||||
return Math.max(1, (long)(sampleRate * MAXIMUM_QUEUED_SECONDS));
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides a description of the state of this manager.
|
||||
*/
|
||||
@@ -294,7 +278,6 @@ public class PolyphaseChannelManager implements ISourceEventProcessor
|
||||
double sampleRate = sourceEvent.getValue().doubleValue();
|
||||
int channelCount = ComplexPolyphaseChannelizerM2.getChannelCount(sampleRate);
|
||||
mChannelCalculator.setRates(sampleRate, channelCount);
|
||||
mBufferDispatcher.setMaximumQueuedWeight(getMaximumQueuedSamples(sampleRate));
|
||||
break;
|
||||
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_LOCKED:
|
||||
case NOTIFICATION_FREQUENCY_AND_SAMPLE_RATE_UNLOCKED:
|
||||
|
||||
@@ -361,17 +361,6 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
|
||||
columns.add(NowPlayingCells.column("tuner", "Tuner", null, Pos.CENTER,
|
||||
row -> getTunerName(row.getChannelMetadata()), Row::revisionProperty));
|
||||
|
||||
//System and site labels from the channel configuration, hidden by default
|
||||
TableColumn<Row,String> system = NowPlayingCells.column("system", "System", null, Pos.CENTER,
|
||||
row -> toText(row.getChannelMetadata().getSystemConfigurationIdentifier()), Row::revisionProperty);
|
||||
system.setVisible(false);
|
||||
columns.add(system);
|
||||
|
||||
TableColumn<Row,String> site = NowPlayingCells.column("site", "Site", null, Pos.CENTER,
|
||||
row -> toText(row.getChannelMetadata().getSiteConfigurationIdentifier()), Row::revisionProperty);
|
||||
site.setVisible(false);
|
||||
columns.add(site);
|
||||
|
||||
columns.add(NowPlayingCells.column("channel.name", "Channel Name", null, Pos.CENTER,
|
||||
row -> toText(row.getChannelMetadata().getChannelNameConfigurationIdentifier()), Row::revisionProperty));
|
||||
|
||||
@@ -381,8 +370,7 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
|
||||
column.setSortable(false);
|
||||
}
|
||||
|
||||
//Column numbers in the Swing version of the table, for its stored column widths. Talker, Tuner, System and Site are new
|
||||
//columns.
|
||||
//Column numbers in the Swing version of the table, for its stored column widths. Talker and Tuner are new columns.
|
||||
String[] swingColumns = {"status", "decoder", "from", "from.alias", "to", "to.alias", "channel", "frequency",
|
||||
"channel.name"};
|
||||
|
||||
|
||||
@@ -57,7 +57,6 @@ public class TableColumnMonitor<S>
|
||||
public static final String LEGACY_INDEX = "column.legacy.index";
|
||||
private static final String ORDER = ".column.order";
|
||||
private static final String HIDDEN = ".column.hidden";
|
||||
private static final String KNOWN = ".column.known";
|
||||
private static final String WIDTH = ".column.width.";
|
||||
private static final String SEPARATOR = ",";
|
||||
|
||||
@@ -231,7 +230,6 @@ public class TableColumnMonitor<S>
|
||||
|
||||
mPreferences.remove(mKey + ORDER);
|
||||
mPreferences.remove(mKey + HIDDEN);
|
||||
mPreferences.remove(mKey + KNOWN);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -330,13 +328,10 @@ public class TableColumnMonitor<S>
|
||||
if(hidden != null)
|
||||
{
|
||||
Set<String> hiddenIds = Set.of(hidden.isEmpty() ? new String[0] : hidden.split(SEPARATOR));
|
||||
Set<String> knownIds = getKnownIds();
|
||||
|
||||
for(TableColumn<S,?> column: mDefaultOrder)
|
||||
{
|
||||
//Columns that weren't in the table when the visibility was stored are new, so use the default
|
||||
column.setVisible(knownIds.contains(column.getId()) ? !hiddenIds.contains(column.getId()) :
|
||||
mDefaultVisibility.get(column));
|
||||
column.setVisible(!hiddenIds.contains(column.getId()));
|
||||
}
|
||||
|
||||
if(getVisibleColumnCount() == 0)
|
||||
@@ -380,32 +375,6 @@ public class TableColumnMonitor<S>
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* IDs of the columns that were in the table when the visibility was stored. Settings stored before the known
|
||||
* columns were stored only had columns that are shown by default.
|
||||
*/
|
||||
private Set<String> getKnownIds()
|
||||
{
|
||||
String known = mPreferences.get(mKey + KNOWN, null);
|
||||
|
||||
if(known != null)
|
||||
{
|
||||
return Set.of(known.isEmpty() ? new String[0] : known.split(SEPARATOR));
|
||||
}
|
||||
|
||||
Set<String> ids = new HashSet<>();
|
||||
|
||||
for(TableColumn<S,?> column: mDefaultOrder)
|
||||
{
|
||||
if(mDefaultVisibility.get(column))
|
||||
{
|
||||
ids.add(column.getId());
|
||||
}
|
||||
}
|
||||
|
||||
return ids;
|
||||
}
|
||||
|
||||
private int getVisibleColumnCount()
|
||||
{
|
||||
int count = 0;
|
||||
@@ -436,12 +405,9 @@ public class TableColumnMonitor<S>
|
||||
private void storeVisibility()
|
||||
{
|
||||
List<String> ids = new ArrayList<>();
|
||||
List<String> known = new ArrayList<>();
|
||||
|
||||
for(TableColumn<S,?> column: mDefaultOrder)
|
||||
{
|
||||
known.add(column.getId());
|
||||
|
||||
if(!column.isVisible())
|
||||
{
|
||||
ids.add(column.getId());
|
||||
@@ -449,7 +415,6 @@ public class TableColumnMonitor<S>
|
||||
}
|
||||
|
||||
mPreferences.put(mKey + HIDDEN, String.join(SEPARATOR, ids));
|
||||
mPreferences.put(mKey + KNOWN, String.join(SEPARATOR, known));
|
||||
}
|
||||
|
||||
private String getWidthKey(TableColumn<S,?> column)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* *****************************************************************************
|
||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -70,7 +70,7 @@ public class RspNativeBuffer extends AbstractNativeBuffer
|
||||
@Override
|
||||
public int sampleCount()
|
||||
{
|
||||
return mISamples.length;
|
||||
return mISamples.length * 2;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* *****************************************************************************
|
||||
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -31,8 +31,6 @@ import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.ScheduledFuture;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
import java.util.function.ToLongFunction;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@@ -56,9 +54,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
private HeartbeatManager mHeartbeatManager;
|
||||
private long mDroppedCount = 0;
|
||||
private long mLastOverflowLogTimestamp = 0;
|
||||
private final ToLongFunction<E> mWeigher;
|
||||
private volatile long mMaximumQueuedWeight = Long.MAX_VALUE;
|
||||
private final AtomicLong mQueuedWeight = new AtomicLong();
|
||||
|
||||
/**
|
||||
* Constructs an instance of a Dispatcher with integrated heartbeat support.
|
||||
@@ -95,7 +90,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
mThreadName = threadName;
|
||||
mInterval = interval;
|
||||
mQueue = new LinkedTransferQueue<>();
|
||||
mWeigher = null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,46 +103,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
mThreadName = threadName;
|
||||
mInterval = interval;
|
||||
mQueue = new LinkedBlockingQueue<>(maximumQueueSize);
|
||||
mWeigher = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an instance that is bounded by the total weight of the queued elements instead of the element count,
|
||||
* for when element sizes vary widely, for example sample buffers from different tuners. An element is dropped
|
||||
* when adding it would exceed the maximum weight, except when nothing is queued, so that an element heavier than
|
||||
* the maximum is still delivered. Elements count toward the weight until the listener has processed them.
|
||||
*
|
||||
* @param threadName to name the dispatcher thread
|
||||
* @param interval for processing each batch in milliseconds.
|
||||
* @param weigher to calculate the weight of each element, for example a sample count.
|
||||
* @param maximumQueuedWeight for the queued elements.
|
||||
*/
|
||||
public Dispatcher(String threadName, long interval, ToLongFunction<E> weigher, long maximumQueuedWeight)
|
||||
{
|
||||
if(weigher == null)
|
||||
{
|
||||
throw new IllegalArgumentException("Weigher cannot be null");
|
||||
}
|
||||
|
||||
mThreadName = threadName;
|
||||
mInterval = interval;
|
||||
mQueue = new LinkedTransferQueue<>();
|
||||
mWeigher = weigher;
|
||||
setMaximumQueuedWeight(maximumQueuedWeight);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the maximum total weight of the queued elements, for a dispatcher that was constructed with a weigher.
|
||||
* @param maximumQueuedWeight for the queued elements.
|
||||
*/
|
||||
public void setMaximumQueuedWeight(long maximumQueuedWeight)
|
||||
{
|
||||
if(maximumQueuedWeight <= 0)
|
||||
{
|
||||
throw new IllegalArgumentException("Maximum queued weight must be positive: " + maximumQueuedWeight);
|
||||
}
|
||||
|
||||
mMaximumQueuedWeight = maximumQueuedWeight;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -195,27 +149,7 @@ public class Dispatcher<E> implements Listener<E>
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean queued;
|
||||
|
||||
if(mWeigher != null)
|
||||
{
|
||||
long weight = mWeigher.applyAsLong(e);
|
||||
long queuedWeight = mQueuedWeight.addAndGet(weight);
|
||||
|
||||
if(queuedWeight > mMaximumQueuedWeight && queuedWeight > weight)
|
||||
{
|
||||
mQueuedWeight.addAndGet(-weight);
|
||||
queued = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
queued = mQueue.offer(e);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
queued = mQueue.offer(e);
|
||||
}
|
||||
boolean queued = mQueue.offer(e);
|
||||
|
||||
if(!queued)
|
||||
{
|
||||
@@ -255,7 +189,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
}
|
||||
|
||||
mQueue.clear();
|
||||
mQueuedWeight.set(0);
|
||||
mExecutorService = Executors.newSingleThreadScheduledExecutor(new NamingThreadFactory(mThreadName));
|
||||
|
||||
Runnable r = (mHeartbeatManager != null ? new ProcessorWithHeartbeat() : new Processor());
|
||||
@@ -277,7 +210,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
mScheduledFuture.cancel(false);
|
||||
mScheduledFuture = null;
|
||||
mQueue.clear();
|
||||
mQueuedWeight.set(0);
|
||||
}
|
||||
|
||||
if(mExecutorService != null)
|
||||
@@ -327,8 +259,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
mListener.getClass() + "]", t);
|
||||
}
|
||||
}
|
||||
|
||||
release(element);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -364,19 +294,6 @@ public class Dispatcher<E> implements Listener<E>
|
||||
mListener.getClass() + "]", t);
|
||||
}
|
||||
}
|
||||
|
||||
release(element);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes the weight of a dequeued element from the queued weight, once the element is processed.
|
||||
*/
|
||||
private void release(E element)
|
||||
{
|
||||
if(mWeigher != null)
|
||||
{
|
||||
mQueuedWeight.addAndGet(-mWeigher.applyAsLong(element));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -212,27 +212,6 @@ public class TableColumnMonitorTest
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void newHiddenByDefaultColumnStaysHidden() throws Exception
|
||||
{
|
||||
onFx(() -> {
|
||||
//Stored by a version without the hidden by default 'site' column and without the known columns
|
||||
mPreferences.put(KEY + ".column.hidden", "a");
|
||||
TableView<String> table = createTable("a", "b", "site");
|
||||
table.getColumns().get(2).setVisible(false);
|
||||
monitor(table);
|
||||
assertEquals(List.of("b"), visibleIds(table));
|
||||
|
||||
//The user shows the column, which is kept in the next session
|
||||
table.getColumns().get(2).setVisible(true);
|
||||
TableView<String> restored = createTable("a", "b", "site", "system");
|
||||
restored.getColumns().get(2).setVisible(false);
|
||||
restored.getColumns().get(3).setVisible(false);
|
||||
monitor(restored);
|
||||
assertEquals(List.of("b", "site"), visibleIds(restored));
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void lastVisibleColumnCantBeHidden() throws Exception
|
||||
{
|
||||
|
||||
@@ -125,60 +125,4 @@ public class DispatcherTest
|
||||
|
||||
assertEquals(101, received.size());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test: a weight-bounded queue drops elements that would exceed the maximum weight and keeps lighter ones.
|
||||
*/
|
||||
@Test
|
||||
void weightBoundedQueueDropsElementsOverMaximumWeight() throws Exception
|
||||
{
|
||||
//Each element weighs its own value: 1 + 2 + 3 = 6 is queued, then 4 would exceed 6 and is dropped, then 0 fits
|
||||
Dispatcher<Integer> dispatcher = new Dispatcher<>("test", 1, Integer::longValue, 6);
|
||||
List<Integer> received = dispatchWhileBlocked(dispatcher, 4);
|
||||
dispatcher.receive(0);
|
||||
awaitSize(received, 5);
|
||||
Thread.sleep(50);
|
||||
dispatcher.stop();
|
||||
|
||||
assertEquals(List.of(0, 1, 2, 3, 0), received);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test: an element heavier than the maximum weight is delivered when nothing else is queued.
|
||||
*/
|
||||
@Test
|
||||
void weightBoundedQueueAcceptsHeavyElementWhenEmpty() throws Exception
|
||||
{
|
||||
Dispatcher<Integer> dispatcher = new Dispatcher<>("test", 1, Integer::longValue, 6);
|
||||
List<Integer> received = dispatchWhileBlocked(dispatcher, 0);
|
||||
dispatcher.receive(100);
|
||||
dispatcher.receive(1);
|
||||
awaitSize(received, 2);
|
||||
Thread.sleep(50);
|
||||
dispatcher.stop();
|
||||
|
||||
assertEquals(List.of(0, 100), received);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test: processed elements release their weight so that the queue accepts new elements after an overflow.
|
||||
*/
|
||||
@Test
|
||||
void weightBoundedQueueRecoversAfterOverflow() throws Exception
|
||||
{
|
||||
Dispatcher<Integer> dispatcher = new Dispatcher<>("test", 1, Integer::longValue, 6);
|
||||
List<Integer> received = dispatchWhileBlocked(dispatcher, 10);
|
||||
awaitSize(received, 4);
|
||||
Thread.sleep(50);
|
||||
|
||||
for(int x = 0; x < 3; x++)
|
||||
{
|
||||
dispatcher.receive(5);
|
||||
awaitSize(received, 5 + x);
|
||||
}
|
||||
|
||||
dispatcher.stop();
|
||||
|
||||
assertEquals(List.of(0, 1, 2, 3, 5, 5, 5), received);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user