Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a3c426a93 |
@@ -1641,41 +1641,16 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||||||
'settings': ['/vchan.js', '/scheduler.js']
|
'settings': ['/vchan.js', '/scheduler.js']
|
||||||
};
|
};
|
||||||
var loaded = new Set();
|
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) {
|
function loadPlugins(tab) {
|
||||||
var scripts = pluginScripts[tab];
|
var scripts = pluginScripts[tab];
|
||||||
if (!scripts) return Promise.resolve();
|
if (!scripts) return;
|
||||||
return scripts.reduce(function(sequence, src) {
|
scripts.forEach(function(src) {
|
||||||
return sequence.then(function() { return loadScript(src); });
|
if (loaded.has(src)) return;
|
||||||
}, Promise.resolve());
|
loaded.add(src);
|
||||||
}
|
var s = document.createElement('script');
|
||||||
|
s.src = src;
|
||||||
function requestPlugins(tab) {
|
s.defer = true;
|
||||||
return loadPlugins(tab).catch(function(err) {
|
document.body.appendChild(s);
|
||||||
console.error(err);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Eager plugin loading is triggered by app.js (after window.trx is set up)
|
// 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
|
// loading them before app.js would cause map-core.js to crash when
|
||||||
// window.trx is not yet defined.
|
// window.trx is not yet defined.
|
||||||
window.loadEagerPlugins = function() {
|
window.loadEagerPlugins = function() {
|
||||||
return Promise.all(
|
['digital-modes', 'map-data', 'bookmarks', 'settings'].forEach(loadPlugins);
|
||||||
['digital-modes', 'map-data', 'bookmarks', 'settings'].map(requestPlugins)
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
// Load others on tab switch
|
// Load others on tab switch
|
||||||
document.addEventListener('click', function(e) {
|
document.addEventListener('click', function(e) {
|
||||||
var tab = e.target.closest('[data-tab]');
|
var tab = e.target.closest('[data-tab]');
|
||||||
if (tab) requestPlugins(tab.dataset.tab);
|
if (tab) loadPlugins(tab.dataset.tab);
|
||||||
});
|
});
|
||||||
window.loadPluginsForTab = loadPlugins;
|
window.loadPluginsForTab = loadPlugins;
|
||||||
})();
|
})();
|
||||||
|
|||||||
@@ -185,20 +185,38 @@ pub fn flush_all(db: &mut PickleDb, rig_id: &str, histories: &Arc<DecoderHistori
|
|||||||
let _ = db.dump();
|
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.
|
/// 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(
|
pub fn spawn_flush_task(
|
||||||
db: Arc<Mutex<PickleDb>>,
|
db: Arc<Mutex<PickleDb>>,
|
||||||
rig_histories: Vec<(String, Arc<DecoderHistories>)>,
|
rig_histories: Vec<(String, Arc<DecoderHistories>)>,
|
||||||
) {
|
) {
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
let rig_histories = Arc::new(rig_histories);
|
||||||
let mut interval = tokio::time::interval(Duration::from_secs(60));
|
let mut interval = tokio::time::interval(Duration::from_secs(60));
|
||||||
interval.tick().await; // consume the immediate first tick
|
interval.tick().await; // consume the immediate first tick
|
||||||
loop {
|
loop {
|
||||||
interval.tick().await;
|
interval.tick().await;
|
||||||
if let Ok(mut guard) = db.lock() {
|
let db = Arc::clone(&db);
|
||||||
for (rig_id, histories) in &rig_histories {
|
let rig_histories = Arc::clone(&rig_histories);
|
||||||
flush_all(&mut guard, rig_id, 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");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user