further performance improvements

This commit is contained in:
2024-12-29 13:36:23 -05:00
parent 12f27bad69
commit a20db6c522
5 changed files with 80 additions and 35 deletions

View File

@@ -190,8 +190,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
let mut next_time = Instant::now(); let mut next_time = Instant::now();
let mut index = 0; let mut index = 0;
while !cancellation_token.is_cancelled() { while !cancellation_token.is_cancelled() {
next_time += Duration::from_millis(100); next_time += Duration::from_millis(10);
index += 10; index += 1;
tokio::time::sleep_until(next_time).await; tokio::time::sleep_until(next_time).await;
sin_tlm_handle sin_tlm_handle
.publish( .publish(

View File

@@ -79,6 +79,7 @@ provide<GraphData>(GRAPH_DATA, {
height: () => height.value - 2 * border_top_bottom.value, height: () => height.value - 2 * border_top_bottom.value,
x_map: x_map, x_map: x_map,
lines: telemetry_lines, lines: telemetry_lines,
max_update_rate: 1000 / 10
}); });
const duration = computed(() => { const duration = computed(() => {

View File

@@ -19,6 +19,7 @@ import {
import { GRAPH_DATA, type GraphData } from '@/graph/graph'; import { GRAPH_DATA, type GraphData } from '@/graph/graph';
import { AXIS_DATA, type AxisData } from '@/graph/axis'; import { AXIS_DATA, type AxisData } from '@/graph/axis';
import ValueLabel from '@/components/ValueLabel.vue'; import ValueLabel from '@/components/ValueLabel.vue';
import type { Point } from '@/graph/line';
const props = defineProps<{ const props = defineProps<{
data: string; data: string;
@@ -39,6 +40,17 @@ const axis_data = inject<AxisData>(AXIS_DATA)!;
const min = ref(Infinity); const min = ref(Infinity);
const max = ref(-Infinity); const max = ref(-Infinity);
const recompute_points = shallowRef(0);
function trigger_recompute() {
recompute_points.value = Date.now();
}
function debounced_recompute() {
if (recompute_points.value + toValue(graph_data.max_update_rate) < Date.now()) {
trigger_recompute();
}
}
const line = ref(Symbol()); const line = ref(Symbol());
const index = computed(() => { const index = computed(() => {
return graph_data.lines.value.indexOf(line.value); return graph_data.lines.value.indexOf(line.value);
@@ -52,15 +64,18 @@ onUnmounted(() => {
); );
}); });
const memo = shallowRef<TelemetryDataItem[]>([]); const memo = shallowRef<Point[]>([]);
watch([value], ([val]) => { watch([value], ([val]) => {
const min_x = toValue(graph_data.min_x); const min_x = toValue(graph_data.min_x);
if (val) { if (val) {
const val_t = Date.parse(val.timestamp); const val_t = Date.parse(val.timestamp);
if (val_t >= min_x) { if (val_t >= min_x) {
// TODO: Insert this in the right spot in memo // TODO: Insert this in the right spot in memo
const new_memo = [val].concat(memo.value);
const item_val = val.value[data.value!.data_type] as number; const item_val = val.value[data.value!.data_type] as number;
const new_memo = [{
x: val_t,
y: item_val,
}].concat(memo.value);
if (item_val < min.value) { if (item_val < min.value) {
min.value = item_val; min.value = item_val;
} }
@@ -68,16 +83,17 @@ watch([value], ([val]) => {
max.value = item_val; max.value = item_val;
} }
memo.value = new_memo; memo.value = new_memo;
debounced_recompute();
} }
} }
}); });
watch([graph_data.min_x, graph_data.max_x], ([min_x, max_x]) => { watch([graph_data.min_x, graph_data.max_x], ([min_x, max_x]) => {
let memo_changed = false; let memo_changed = false;
const new_memo = ([] as TelemetryDataItem[]).concat(memo.value); const new_memo = ([] as Point[]).concat(memo.value);
if (min_x) { if (min_x) {
while ( while (
new_memo.length > 2 && new_memo.length > 2 &&
Date.parse(new_memo[new_memo.length - 2].timestamp) < toValue(min_x) new_memo[new_memo.length - 2].x < toValue(min_x)
) { ) {
new_memo.pop(); new_memo.pop();
memo_changed = true; memo_changed = true;
@@ -86,7 +102,7 @@ watch([graph_data.min_x, graph_data.max_x], ([min_x, max_x]) => {
if (max_x) { if (max_x) {
while ( while (
new_memo.length > 2 && new_memo.length > 2 &&
Date.parse(new_memo[1].timestamp) > toValue(max_x) new_memo[1].x > toValue(max_x)
) { ) {
new_memo.shift(); new_memo.shift();
memo_changed = true; memo_changed = true;
@@ -96,11 +112,12 @@ watch([graph_data.min_x, graph_data.max_x], ([min_x, max_x]) => {
let min_val = Infinity; let min_val = Infinity;
let max_val = -Infinity; let max_val = -Infinity;
for (const item of new_memo) { for (const item of new_memo) {
const item_val = item.value[data.value!.data_type] as number; const item_val = item.y;
min_val = Math.min(min_val, item_val); min_val = Math.min(min_val, item_val);
max_val = Math.max(max_val, item_val); max_val = Math.max(max_val, item_val);
} }
memo.value = new_memo; memo.value = new_memo;
debounced_recompute();
max.value = max_val; max.value = max_val;
min.value = min_val; min.value = min_val;
} }
@@ -109,6 +126,7 @@ watch([graph_data.min_x, graph_data.max_x], ([min_x, max_x]) => {
watch( watch(
[min, axis_data.axis_update_watch], [min, axis_data.axis_update_watch],
([min_val]) => { ([min_val]) => {
trigger_recompute();
axis_data.min_y_callback(min_val); axis_data.min_y_callback(min_val);
}, },
{ {
@@ -119,6 +137,7 @@ watch(
watch( watch(
[max, axis_data.axis_update_watch], [max, axis_data.axis_update_watch],
([max_val]) => { ([max_val]) => {
trigger_recompute()
axis_data.max_y_callback(max_val); axis_data.max_y_callback(max_val);
}, },
{ {
@@ -126,35 +145,50 @@ watch(
}, },
); );
// This function is somewhat slow const points = ref("");
const points = computed(() => {
let points = '';
if (memo.value.length == 0 || data.value == null) {
return '';
}
let last_x = graph_data.x_map(toValue(graph_data.max_x)); const old_max = ref(0);
let last_t = toValue(graph_data.max_x) + smoothing_distance;
for (const data_item of memo.value) { const group_transform = computed(() => {
const t = Date.parse(data_item.timestamp); const new_max = toValue(graph_data.max_x);
const v = data_item.value[data.value.data_type]; const offset = graph_data.x_map(old_max.value) - graph_data.x_map(new_max);
const x = graph_data.x_map(t); return `translate(${offset} 0)`;
const y = axis_data.y_map(v); })
if (last_t - t < smoothing_distance) { watch(
points += ` ${x},${y}`; [recompute_points],
} else { () => {
points += ` ${last_x},${y} ${x},${y}`; let new_points = '';
if (memo.value.length == 0 || data.value == null) {
return '';
} }
last_x = x;
last_t = t; const future_number = toValue(graph_data.max_x) + 9999999999;
if (last_x <= 0.0) {
break; let last_x = graph_data.x_map(future_number);
old_max.value = toValue(graph_data.max_x);
let last_t = future_number + smoothing_distance;
for (const data_item of memo.value) {
const t = data_item.x;
const v = data_item.y;
const x = graph_data.x_map(t);
const y = axis_data.y_map(v);
if (last_t - t < smoothing_distance) {
new_points += ` ${x},${y}`;
} else {
new_points += ` ${last_x},${y} ${x},${y}`;
}
last_x = x;
last_t = t;
if (last_x <= 0.0) {
break;
}
} }
points.value = new_points;
} }
return points; )
});
const current_value = computed(() => { const current_value = computed(() => {
const val = value.value; const val = value.value;
@@ -167,11 +201,15 @@ const current_value = computed(() => {
<template> <template>
<g :class="`indexed-color color-${index}`"> <g :class="`indexed-color color-${index}`">
<polyline <g
fill="none"
clip-path="url(#content)" clip-path="url(#content)"
:points="points" >
></polyline> <polyline
fill="none"
:transform="group_transform"
:points="points"
></polyline>
</g>
<ValueLabel <ValueLabel
v-if="current_value" v-if="current_value"
:x="graph_data.x_map(toValue(graph_data.max_x)) + text_offset" :x="graph_data.x_map(toValue(graph_data.max_x)) + text_offset"

View File

@@ -10,4 +10,5 @@ export interface GraphData {
height: MaybeRefOrGetter<number>; height: MaybeRefOrGetter<number>;
x_map: (x: number) => number; x_map: (x: number) => number;
lines: Ref<symbol[]>; lines: Ref<symbol[]>;
max_update_rate: MaybeRefOrGetter<number>,
} }

View File

@@ -0,0 +1,5 @@
export interface Point {
x: number,
y: number,
}