Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
730fd7a1a3 | ||
|
|
8789ba8efa | ||
|
|
fc98c2a974 | ||
|
|
98b396bd98 |
@@ -274,8 +274,7 @@ mod tests {
|
||||
|
||||
// Pseudo-random noise vs gradient — correlation should be low.
|
||||
let noise: Vec<u8> = (0..256)
|
||||
.map(|i| (i as u32).wrapping_mul(1_103_515_245).wrapping_add(12_345))
|
||||
.map(|value| ((value >> 8) & 0xff) as u8)
|
||||
.map(|i| ((i * 1103515245 + 12345) as u32 >> 8 & 0xff) as u8)
|
||||
.collect();
|
||||
let r = asm.correlation_with_last(&noise).expect("r");
|
||||
assert!(
|
||||
|
||||
@@ -840,8 +840,6 @@ let jogMult = loadSetting("jogMult", 1); // divisor: 1, 10, 100
|
||||
let jogStep = Math.max(Math.round(jogUnit / jogMult), 1);
|
||||
let minFreqStepHz = 1;
|
||||
let lastModeName = "";
|
||||
let lastWfmCci = 0;
|
||||
let lastWfmAci = 0;
|
||||
const VFO_COLORS = ["var(--accent-green)", "var(--accent-yellow)"];
|
||||
function vfoColor(idx) {
|
||||
if (idx < VFO_COLORS.length) return VFO_COLORS[idx];
|
||||
@@ -3295,14 +3293,8 @@ function render(update) {
|
||||
wfmStFlagEl.classList.toggle("wfm-st-flag-stereo", detected);
|
||||
wfmStFlagEl.classList.toggle("wfm-st-flag-mono", !detected);
|
||||
}
|
||||
if (typeof update.filter.wfm_cci === "number") {
|
||||
lastWfmCci = Math.max(0, Math.min(100, update.filter.wfm_cci));
|
||||
updateIntfBar(wfmCciFillEl, wfmCciValEl, lastWfmCci);
|
||||
}
|
||||
if (typeof update.filter.wfm_aci === "number") {
|
||||
lastWfmAci = Math.max(0, Math.min(100, update.filter.wfm_aci));
|
||||
updateIntfBar(wfmAciFillEl, wfmAciValEl, lastWfmAci);
|
||||
}
|
||||
if (typeof update.filter.wfm_cci === "number") updateIntfBar(wfmCciFillEl, wfmCciValEl, update.filter.wfm_cci);
|
||||
if (typeof update.filter.wfm_aci === "number") updateIntfBar(wfmAciFillEl, wfmAciValEl, update.filter.wfm_aci);
|
||||
if (samStereoWidthEl && typeof update.filter.sam_stereo_width === "number") {
|
||||
samStereoWidthEl.value = String(Math.round(update.filter.sam_stereo_width * 100));
|
||||
}
|
||||
@@ -4276,7 +4268,7 @@ const MODE_BW_DEFAULTS = {
|
||||
FM: [12_500, 2_500, 25_000, 500],
|
||||
AIS: [25_000, 12_500, 50_000, 500],
|
||||
VDES: [100_000, 25_000, 200_000, 1_000],
|
||||
WFM: [180_000, 60_000,300_000,5_000],
|
||||
WFM: [180_000, 50_000,300_000,5_000],
|
||||
DIG: [3_000, 300, 6_000, 100],
|
||||
PKT: [25_000, 300, 50_000, 500],
|
||||
};
|
||||
@@ -4356,110 +4348,64 @@ async function applyBandwidthFromInput() {
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
function estimateOccupiedBandwidth(data, centerHz, interference = {}) {
|
||||
function estimateBandwidthAroundPeak(data, centerHz) {
|
||||
if (!data || !isBinsArray(data.bins) || data.bins.length < 3 || !Number.isFinite(centerHz)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const bins = data.bins;
|
||||
const maxIdx = bins.length - 1;
|
||||
const hzPerBin = data.sample_rate / maxIdx;
|
||||
const fullLoHz = data.center_hz - data.sample_rate / 2;
|
||||
const centerIdx = Math.max(
|
||||
1,
|
||||
Math.min(maxIdx - 1, Math.round(((centerHz - fullLoHz) / data.sample_rate) * maxIdx)),
|
||||
);
|
||||
const mode = (modeEl ? modeEl.value : "USB").toUpperCase();
|
||||
const [defaultBw, minBw, maxBw, stepBw] = mwDefaultsForMode(mode);
|
||||
const oneSided = mode === "USB" || mode === "DIG" || mode === "CW"
|
||||
? 1
|
||||
: mode === "LSB" || mode === "CWR" ? -1 : 0;
|
||||
const isWfm = mode === "WFM";
|
||||
const searchRadius = Math.max(6, Math.min(120, Math.round(maxIdx * 0.03)));
|
||||
const searchLo = Math.max(1, centerIdx - searchRadius);
|
||||
const searchHi = Math.min(maxIdx - 1, centerIdx + searchRadius);
|
||||
|
||||
let peakIdx = centerIdx;
|
||||
for (let i = searchLo; i <= searchHi; i++) {
|
||||
if (bins[i] > bins[peakIdx]) peakIdx = i;
|
||||
}
|
||||
|
||||
// Reduce single-bin peaks and holes before finding occupied-channel edges.
|
||||
// WFM needs a wider smoothing window because its energy is noise-like and
|
||||
// spread across the entire channel rather than concentrated at a carrier.
|
||||
const smoothRadius = isWfm ? 3 : 1;
|
||||
const smoothed = bins.map((_, i) => {
|
||||
let sum = 0;
|
||||
let count = 0;
|
||||
for (let j = Math.max(0, i - smoothRadius); j <= Math.min(maxIdx, i + smoothRadius); j++) {
|
||||
sum += bins[j];
|
||||
count += 1;
|
||||
}
|
||||
return sum / count;
|
||||
});
|
||||
const sorted = [...bins].sort((a, b) => a - b);
|
||||
const noise = sorted[Math.floor(sorted.length * 0.2)];
|
||||
const maxSpanBins = Math.max(2, Math.ceil(maxBw / hzPerBin));
|
||||
const searchHalfBins = oneSided === 0 ? Math.ceil(maxSpanBins / 2) : maxSpanBins;
|
||||
const searchLo = Math.max(1, centerIdx - (oneSided > 0 ? 2 : searchHalfBins));
|
||||
const searchHi = Math.min(maxIdx - 1, centerIdx + (oneSided < 0 ? 2 : searchHalfBins));
|
||||
let peak = -Infinity;
|
||||
for (let i = searchLo; i <= searchHi; i++) peak = Math.max(peak, smoothed[i]);
|
||||
const snr = peak - noise;
|
||||
if (!Number.isFinite(snr) || snr < (isWfm ? 5 : 4)) return isWfm ? minBw : defaultBw;
|
||||
const peak = bins[peakIdx];
|
||||
const threshold = Math.max(noise + 4, peak - Math.max(8, (peak - noise) * 0.35));
|
||||
|
||||
// A threshold relative to the noise floor finds occupied bandwidth much
|
||||
// more reliably than one relative to the peak. The latter fails for WFM,
|
||||
// whose multiplex spectrum has peaks, notches, and no narrow centre carrier.
|
||||
const threshold = noise + Math.max(3, Math.min(isWfm ? 6 : 10, snr * (isWfm ? 0.18 : 0.28)));
|
||||
const allowedGap = Math.max(isWfm ? 4 : 2, Math.ceil((isWfm ? 12_000 : stepBw) / hzPerBin));
|
||||
|
||||
function occupiedExtent(direction, limitBins) {
|
||||
let lastOccupied = centerIdx;
|
||||
let gap = 0;
|
||||
for (let n = 0; n <= limitBins; n++) {
|
||||
const i = centerIdx + direction * n;
|
||||
if (i <= 0 || i >= maxIdx) break;
|
||||
if (smoothed[i] >= threshold) {
|
||||
lastOccupied = i;
|
||||
gap = 0;
|
||||
} else if (++gap > allowedGap) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return Math.abs(lastOccupied - centerIdx) * hzPerBin;
|
||||
let left = peakIdx;
|
||||
let right = peakIdx;
|
||||
let belowCount = 0;
|
||||
for (let i = peakIdx; i > 1; i--) {
|
||||
if (bins[i] < threshold) belowCount += 1;
|
||||
else belowCount = 0;
|
||||
if (belowCount >= 2) break;
|
||||
left = i;
|
||||
}
|
||||
|
||||
let rawBw;
|
||||
if (oneSided !== 0) {
|
||||
rawBw = occupiedExtent(oneSided, maxSpanBins);
|
||||
} else {
|
||||
const leftHz = occupiedExtent(-1, searchHalfBins);
|
||||
const rightHz = occupiedExtent(1, searchHalfBins);
|
||||
// A symmetric RF filter must contain the larger of the two sidebands.
|
||||
rawBw = 2 * Math.max(leftHz, rightHz);
|
||||
belowCount = 0;
|
||||
for (let i = peakIdx; i < maxIdx - 1; i++) {
|
||||
if (bins[i] < threshold) belowCount += 1;
|
||||
else belowCount = 0;
|
||||
if (belowCount >= 2) break;
|
||||
right = i;
|
||||
}
|
||||
|
||||
// Add a transition-band margin. Weak WFM deliberately falls back to the
|
||||
// 60 kHz mode floor above: a narrower filter trades stereo/RDS content for
|
||||
// a useful improvement in intelligibility when the signal is very poor.
|
||||
rawBw *= isWfm ? 1.08 : 1.12;
|
||||
if (isWfm) {
|
||||
const aci = Math.max(0, Math.min(100, Number(interference.aci) || 0)) / 100;
|
||||
const cci = Math.max(0, Math.min(100, Number(interference.cci) || 0)) / 100;
|
||||
// Adjacent-channel energy is outside the wanted modulation, so ACI can
|
||||
// safely drive the cap all the way from the 300 kHz ceiling to 60 kHz.
|
||||
const aciCap = maxBw - (maxBw - minBw) * aci;
|
||||
// CCI overlaps the wanted station and cannot be removed by an RF filter.
|
||||
// Only distrust the widest edge estimates, retaining at least 65% of the
|
||||
// useful range between the weak-signal floor and nominal WFM bandwidth.
|
||||
const cciFloor = minBw + (defaultBw - minBw) * 0.65;
|
||||
const cciCap = maxBw - (maxBw - cciFloor) * cci;
|
||||
rawBw = Math.min(rawBw, aciCap, cciCap);
|
||||
}
|
||||
const shoulderPad = Math.max(1, Math.round((right - left) * 0.08));
|
||||
left = Math.max(0, left - shoulderPad);
|
||||
right = Math.min(maxIdx, right + shoulderPad);
|
||||
|
||||
const hzPerBin = data.sample_rate / maxIdx;
|
||||
const rawBw = Math.max(hzPerBin, (right - left) * hzPerBin);
|
||||
const [, minBw, maxBw, stepBw] = mwDefaultsForMode(modeEl ? modeEl.value : "USB");
|
||||
const clamped = Math.max(minBw, Math.min(maxBw, rawBw));
|
||||
return Math.max(stepBw, Math.round(clamped / stepBw) * stepBw);
|
||||
}
|
||||
|
||||
async function applyAutoBandwidth() {
|
||||
if (!lastSpectrumData || lastFreqHz == null) return;
|
||||
// WFM interference telemetry belongs to the primary DSP channel. Do not
|
||||
// apply it to a virtual channel, where it would describe the wrong signal.
|
||||
const onVirtual = typeof vchanIsOnVirtual === "function" && vchanIsOnVirtual();
|
||||
const interference = onVirtual ? {} : { cci: lastWfmCci, aci: lastWfmAci };
|
||||
const estimated = estimateOccupiedBandwidth(lastSpectrumData, lastFreqHz, interference);
|
||||
const estimated = estimateBandwidthAroundPeak(lastSpectrumData, lastFreqHz);
|
||||
if (!Number.isFinite(estimated) || estimated <= 0) {
|
||||
syncBandwidthInput(currentBandwidthHz);
|
||||
return;
|
||||
|
||||
@@ -1641,41 +1641,16 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
'settings': ['/vchan.js', '/scheduler.js']
|
||||
};
|
||||
var loaded = new Set();
|
||||
var loading = new Map();
|
||||
|
||||
function loadScript(src) {
|
||||
if (loaded.has(src)) return Promise.resolve();
|
||||
if (loading.has(src)) return loading.get(src);
|
||||
|
||||
var request = new Promise(function(resolve, reject) {
|
||||
var s = document.createElement('script');
|
||||
s.src = src;
|
||||
s.onload = function() {
|
||||
loaded.add(src);
|
||||
loading.delete(src);
|
||||
resolve();
|
||||
};
|
||||
s.onerror = function() {
|
||||
loading.delete(src);
|
||||
reject(new Error('Failed to load plugin script: ' + src));
|
||||
};
|
||||
document.body.appendChild(s);
|
||||
});
|
||||
loading.set(src, request);
|
||||
return request;
|
||||
}
|
||||
|
||||
function loadPlugins(tab) {
|
||||
var scripts = pluginScripts[tab];
|
||||
if (!scripts) return Promise.resolve();
|
||||
return scripts.reduce(function(sequence, src) {
|
||||
return sequence.then(function() { return loadScript(src); });
|
||||
}, Promise.resolve());
|
||||
}
|
||||
|
||||
function requestPlugins(tab) {
|
||||
return loadPlugins(tab).catch(function(err) {
|
||||
console.error(err);
|
||||
if (!scripts) return;
|
||||
scripts.forEach(function(src) {
|
||||
if (loaded.has(src)) return;
|
||||
loaded.add(src);
|
||||
var s = document.createElement('script');
|
||||
s.src = src;
|
||||
s.defer = true;
|
||||
document.body.appendChild(s);
|
||||
});
|
||||
}
|
||||
// Eager plugin loading is triggered by app.js (after window.trx is set up)
|
||||
@@ -1683,14 +1658,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
// loading them before app.js would cause map-core.js to crash when
|
||||
// window.trx is not yet defined.
|
||||
window.loadEagerPlugins = function() {
|
||||
return Promise.all(
|
||||
['digital-modes', 'map-data', 'bookmarks', 'settings'].map(requestPlugins)
|
||||
);
|
||||
['digital-modes', 'map-data', 'bookmarks', 'settings'].forEach(loadPlugins);
|
||||
};
|
||||
// Load others on tab switch
|
||||
document.addEventListener('click', function(e) {
|
||||
var tab = e.target.closest('[data-tab]');
|
||||
if (tab) requestPlugins(tab.dataset.tab);
|
||||
if (tab) loadPlugins(tab.dataset.tab);
|
||||
});
|
||||
window.loadPluginsForTab = loadPlugins;
|
||||
})();
|
||||
|
||||
@@ -6,9 +6,7 @@
|
||||
|
||||
#[cfg(feature = "ft2")]
|
||||
use std::collections::HashMap;
|
||||
use std::collections::HashSet;
|
||||
#[cfg(test)]
|
||||
use std::collections::VecDeque;
|
||||
use std::collections::{HashSet, VecDeque};
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
@@ -35,9 +33,10 @@ use trx_core::audio::{
|
||||
AUDIO_MSG_VCHAN_MODE, AUDIO_MSG_VCHAN_REMOVE, AUDIO_MSG_VCHAN_SUB, AUDIO_MSG_VCHAN_UNSUB,
|
||||
AUDIO_MSG_VDES_DECODE, AUDIO_MSG_WEFAX_DECODE, AUDIO_MSG_WEFAX_PROGRESS, AUDIO_MSG_WSPR_DECODE,
|
||||
};
|
||||
#[cfg(test)]
|
||||
use trx_core::decode::{AisMessage, AprsPacket, CwEvent};
|
||||
use trx_core::decode::{DecodedMessage, Ft8Message, LrptImage, LrptProgress, WsprMessage};
|
||||
use trx_core::decode::{
|
||||
AisMessage, AprsPacket, CwEvent, DecodedMessage, Ft8Message, LrptImage, LrptProgress,
|
||||
WsprMessage,
|
||||
};
|
||||
use trx_core::rig::state::{RigMode, RigState};
|
||||
use trx_core::vchan::SharedVChanManager;
|
||||
use trx_cw::CwDecoder;
|
||||
@@ -47,9 +46,9 @@ use trx_wspr::WsprDecoder;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::config::AudioConfig;
|
||||
use crate::history_policy::{current_timestamp_ms, lock_or_recover};
|
||||
#[cfg(test)]
|
||||
use crate::history_policy::{enforce_capacity, prune_by_age, MAX_HISTORY_ENTRIES};
|
||||
use crate::history_policy::{
|
||||
current_timestamp_ms, enforce_capacity, lock_or_recover, prune_by_age, MAX_HISTORY_ENTRIES,
|
||||
};
|
||||
use trx_decode_log::DecoderLoggers;
|
||||
|
||||
/// Silence timeout before auto-finalising an LRPT pass (30 s without new MCUs).
|
||||
|
||||
@@ -465,25 +465,8 @@ impl DecoderHistories {
|
||||
/// entries across all decoders, used for pre-allocating the replay blob.
|
||||
///
|
||||
/// Uses an `AtomicUsize` counter maintained by record/prune/clear methods,
|
||||
/// avoiding 11 separate mutex acquisitions.
|
||||
/// avoiding 9 separate mutex acquisitions.
|
||||
pub fn estimated_total_count(&self) -> usize {
|
||||
self.total_count.load(Ordering::Relaxed)
|
||||
}
|
||||
|
||||
/// Rebuild the aggregate count after bulk restoration bypasses the normal
|
||||
/// record methods.
|
||||
pub(crate) fn recalculate_total_count(&self) {
|
||||
let total = lock_or_recover(&self.ais, "ais_history").len()
|
||||
+ lock_or_recover(&self.vdes, "vdes_history").len()
|
||||
+ lock_or_recover(&self.aprs, "aprs_history").len()
|
||||
+ lock_or_recover(&self.hf_aprs, "hf_aprs_history").len()
|
||||
+ lock_or_recover(&self.cw, "cw_history").len()
|
||||
+ lock_or_recover(&self.ft8, "ft8_history").len()
|
||||
+ lock_or_recover(&self.ft4, "ft4_history").len()
|
||||
+ lock_or_recover(&self.ft2, "ft2_history").len()
|
||||
+ lock_or_recover(&self.wspr, "wspr_history").len()
|
||||
+ lock_or_recover(&self.lrpt, "lrpt_history").len()
|
||||
+ lock_or_recover(&self.wefax, "wefax_history").len();
|
||||
self.total_count.store(total, Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ use pickledb::{PickleDb, PickleDbDumpPolicy, SerializationMethod};
|
||||
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
||||
|
||||
use trx_core::decode::{
|
||||
AisMessage, AprsPacket, CwEvent, Ft8Message, LrptImage, VdesMessage, WefaxMessage, WsprMessage,
|
||||
AisMessage, AprsPacket, CwEvent, Ft8Message, VdesMessage, WefaxMessage, WsprMessage,
|
||||
};
|
||||
|
||||
use crate::audio::DecoderHistories;
|
||||
@@ -118,11 +118,6 @@ pub fn load_all(db: &PickleDb, rig_id: &str, histories: &Arc<DecoderHistories>)
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.hf_aprs.lock() {
|
||||
for e in load_key::<AprsPacket>(db, &k("hf_aprs")) {
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.cw.lock() {
|
||||
for e in load_key::<CwEvent>(db, &k("cw")) {
|
||||
h.push_back(e);
|
||||
@@ -133,32 +128,16 @@ pub fn load_all(db: &PickleDb, rig_id: &str, histories: &Arc<DecoderHistories>)
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.ft4.lock() {
|
||||
for e in load_key::<Ft8Message>(db, &k("ft4")) {
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.ft2.lock() {
|
||||
for e in load_key::<Ft8Message>(db, &k("ft2")) {
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.wspr.lock() {
|
||||
for e in load_key::<WsprMessage>(db, &k("wspr")) {
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.lrpt.lock() {
|
||||
for e in load_key::<LrptImage>(db, &k("lrpt")) {
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
if let Ok(mut h) = histories.wefax.lock() {
|
||||
for e in load_key::<WefaxMessage>(db, &k("wefax")) {
|
||||
h.push_back(e);
|
||||
}
|
||||
}
|
||||
histories.recalculate_total_count();
|
||||
}
|
||||
|
||||
/// Flush `histories` to the database under `rig_id`-prefixed keys and sync.
|
||||
@@ -183,11 +162,6 @@ pub fn flush_all(db: &mut PickleDb, rig_id: &str, histories: &Arc<DecoderHistori
|
||||
drop(h);
|
||||
save_key(db, &k("aprs"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.hf_aprs.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
save_key(db, &k("hf_aprs"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.cw.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
@@ -198,26 +172,11 @@ pub fn flush_all(db: &mut PickleDb, rig_id: &str, histories: &Arc<DecoderHistori
|
||||
drop(h);
|
||||
save_key(db, &k("ft8"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.ft4.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
save_key(db, &k("ft4"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.ft2.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
save_key(db, &k("ft2"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.wspr.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
save_key(db, &k("wspr"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.lrpt.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
save_key(db, &k("lrpt"), &snapshot);
|
||||
}
|
||||
if let Ok(h) = histories.wefax.lock() {
|
||||
let snapshot = h.clone();
|
||||
drop(h);
|
||||
@@ -226,38 +185,20 @@ pub fn flush_all(db: &mut PickleDb, rig_id: &str, histories: &Arc<DecoderHistori
|
||||
let _ = db.dump();
|
||||
}
|
||||
|
||||
fn flush_all_rigs(db: &Mutex<PickleDb>, rig_histories: &[(String, Arc<DecoderHistories>)]) {
|
||||
let Ok(mut guard) = db.lock() else {
|
||||
tracing::warn!("history database mutex poisoned; skipping periodic flush");
|
||||
return;
|
||||
};
|
||||
for (rig_id, histories) in rig_histories {
|
||||
flush_all(&mut guard, rig_id, histories);
|
||||
}
|
||||
}
|
||||
|
||||
/// Spawn a Tokio task that flushes all rigs' histories to disk every 60 seconds.
|
||||
///
|
||||
/// Snapshot cloning, JSON serialization, and disk I/O run on Tokio's blocking
|
||||
/// pool so a large history database cannot stall an async runtime worker.
|
||||
pub fn spawn_flush_task(
|
||||
db: Arc<Mutex<PickleDb>>,
|
||||
rig_histories: Vec<(String, Arc<DecoderHistories>)>,
|
||||
) {
|
||||
tokio::spawn(async move {
|
||||
let rig_histories = Arc::new(rig_histories);
|
||||
let mut interval = tokio::time::interval(Duration::from_secs(60));
|
||||
interval.tick().await; // consume the immediate first tick
|
||||
loop {
|
||||
interval.tick().await;
|
||||
let db = Arc::clone(&db);
|
||||
let rig_histories = Arc::clone(&rig_histories);
|
||||
if let Err(err) = tokio::task::spawn_blocking(move || {
|
||||
flush_all_rigs(&db, rig_histories.as_slice());
|
||||
})
|
||||
.await
|
||||
{
|
||||
tracing::warn!(error = %err, "history flush worker failed");
|
||||
if let Ok(mut guard) = db.lock() {
|
||||
for (rig_id, histories) in &rig_histories {
|
||||
flush_all(&mut guard, rig_id, histories);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -361,79 +302,4 @@ mod tests {
|
||||
let _ = std::fs::remove_file(&db_file);
|
||||
let _ = std::fs::remove_dir(&dir);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flush_and_load_all_restores_previously_omitted_histories() {
|
||||
let db_file = std::env::temp_dir().join(format!(
|
||||
"trx_history_all_{}_{}.db",
|
||||
std::process::id(),
|
||||
now_unix_ms()
|
||||
));
|
||||
let mut db = PickleDb::new(
|
||||
&db_file,
|
||||
PickleDbDumpPolicy::DumpUponRequest,
|
||||
SerializationMethod::Json,
|
||||
);
|
||||
let source = DecoderHistories::new();
|
||||
let now = Instant::now();
|
||||
|
||||
source.hf_aprs.lock().unwrap().push_back((
|
||||
now,
|
||||
AprsPacket {
|
||||
rig_id: Some("rig-a".into()),
|
||||
ts_ms: Some(now_unix_ms()),
|
||||
src_call: "TEST".into(),
|
||||
dest_call: "APRS".into(),
|
||||
path: String::new(),
|
||||
info: "history".into(),
|
||||
info_bytes: Vec::new(),
|
||||
packet_type: "position".into(),
|
||||
crc_ok: true,
|
||||
lat: None,
|
||||
lon: None,
|
||||
symbol_table: None,
|
||||
symbol_code: None,
|
||||
},
|
||||
));
|
||||
for (queue, mode) in [(&source.ft4, "FT4"), (&source.ft2, "FT2")] {
|
||||
queue.lock().unwrap().push_back((
|
||||
now,
|
||||
Ft8Message {
|
||||
rig_id: Some("rig-a".into()),
|
||||
ts_ms: now_unix_ms(),
|
||||
snr_db: -10.0,
|
||||
dt_s: 0.1,
|
||||
freq_hz: 1_000.0,
|
||||
message: mode.into(),
|
||||
},
|
||||
));
|
||||
}
|
||||
source.lrpt.lock().unwrap().push_back((
|
||||
now,
|
||||
LrptImage {
|
||||
rig_id: Some("rig-a".into()),
|
||||
pass_start_ms: now_unix_ms(),
|
||||
pass_end_ms: now_unix_ms(),
|
||||
mcu_count: 1,
|
||||
path: "/tmp/lrpt.png".into(),
|
||||
ts_ms: Some(now_unix_ms()),
|
||||
satellite: None,
|
||||
channels: None,
|
||||
geo_bounds: None,
|
||||
ground_track: None,
|
||||
},
|
||||
));
|
||||
|
||||
flush_all(&mut db, "rig-a", &source);
|
||||
let restored = DecoderHistories::new();
|
||||
load_all(&db, "rig-a", &restored);
|
||||
|
||||
assert_eq!(restored.hf_aprs.lock().unwrap().len(), 1);
|
||||
assert_eq!(restored.ft4.lock().unwrap().len(), 1);
|
||||
assert_eq!(restored.ft2.lock().unwrap().len(), 1);
|
||||
assert_eq!(restored.lrpt.lock().unwrap().len(), 1);
|
||||
assert_eq!(restored.estimated_total_count(), 4);
|
||||
|
||||
let _ = std::fs::remove_file(db_file);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,9 +251,9 @@ fn mul_freq_domain(buf: &mut [FftComplex<f32>], h_freq: &[FftComplex<f32>], scal
|
||||
unsafe {
|
||||
mul_freq_domain_neon(buf, h_freq, scale);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "aarch64"))]
|
||||
mul_freq_domain_scalar(buf, h_freq, scale);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user