IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-21 07:54:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix binpacking with flat networks.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-09-05 09:09:40 -05:00
parent 001694c77f
commit c1e237ab73
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LibreQoS.py
View File

@ -25,7 +25,7 @@ from liblqos_python import is_lqosd_alive, clear_ip_mappings, delete_ip_mapping,
check_config, sqm, upstream_bandwidth_capacity_download_mbps, upstream_bandwidth_capacity_upload_mbps, \
interface_a, interface_b, enable_actual_shell_commands, use_bin_packing_to_balance_cpu, monitor_mode_only, \
run_shell_commands_as_sudo, generated_pn_download_mbps, generated_pn_upload_mbps, queues_available_override, \
on_a_stick, get_tree_weights, get_weights
on_a_stick, get_tree_weights, get_weights, is_network_flat
R2Q = 10
#MAX_R2Q = 200_000
@ -765,7 +765,7 @@ def refreshShapers():
# If we're in binpacking mode, we need to sort the network structure a bit
bins = []
if use_bin_packing_to_balance_cpu():
if use_bin_packing_to_balance_cpu() and not is_network_flat():
print("BinPacking is enabled, so we're going to sort your network.")
cpuBin = {}
weights = get_tree_weights()

6
src/rust/lqos_python/src/lib.rs
View File

@ -91,6 +91,7 @@ fn liblqos_python(_py: Python, m: &PyModule) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(get_weights))?;
m.add_wrapped(wrap_pyfunction!(get_tree_weights))?;
m.add_wrapped(wrap_pyfunction!(get_libreqos_directory))?;
m.add_wrapped(wrap_pyfunction!(is_network_flat))?;
Ok(())
}
@ -674,4 +675,9 @@ pub fn get_tree_weights() -> PyResult<Vec<device_weights::NetworkNodeWeight>> {
pub fn get_libreqos_directory() -> PyResult<String> {
let config = lqos_config::load_config().unwrap();
Ok(config.lqos_directory)
}
#[pyfunction]
pub fn is_network_flat() -> PyResult<bool> {
Ok(lqos_config::NetworkJson::load().unwrap().get_nodes_when_ready().len() == 1)
}