diff --git a/backend/routes/stats.ts b/backend/routes/stats.ts index eb09c3e..2d281a3 100644 --- a/backend/routes/stats.ts +++ b/backend/routes/stats.ts @@ -1,4 +1,4 @@ -import { jsonResponse, stats, subsetCache, fontBufferCache, markStatsDirty } from "../shared"; +import { jsonResponse, stats, subsetCache, fontBufferCache, markStatsDirty, latencySnapshot } from "../shared"; /** GET /api/stats — 返回运行时统计 */ export async function handleStats(req: Request, _res: Response) { @@ -15,6 +15,8 @@ export async function handleStats(req: Request, _res: Response) { offlineDownloads: stats.offlineDownloads, subsetCacheEntries: subsetCache.size, fontBufferCacheEntries: fontBufferCache.size, + /** 最近 1024 次子集请求耗时分位(毫秒,进程级观测) */ + ...latencySnapshot(), }), }; } diff --git a/backend/routes/subset.ts b/backend/routes/subset.ts index 913403a..635d50c 100644 --- a/backend/routes/subset.ts +++ b/backend/routes/subset.ts @@ -1,4 +1,4 @@ -import { parseUrl, stats, subsetCache, findFontPath, markStatsDirty } from "../shared"; +import { parseUrl, stats, subsetCache, findFontPath, markStatsDirty, recordSubsetLatency } from "../shared"; import { markFontUsed } from "../temp_cleaner"; import { withMemoryGate } from "../subset_queue"; import { estimateSubsetMemory, subsetFontFile } from "../font_util/subset_file"; @@ -78,6 +78,7 @@ export async function handleFontSubset(req: Request, res: Response) { if (cached) { stats.subsetCacheHits++; markStatsDirty(); + recordSubsetLatency(t1 - t0); const contentTypes: Record = { ttf: "font/ttf", woff2: "font/woff2" }; return { req, @@ -121,6 +122,7 @@ export async function handleFontSubset(req: Request, res: Response) { /** 写入裁剪结果缓存(与找字体共享;ttf 对象一并缓存供评分直接复用) */ subsetCache.set(cacheKey, { bytes: newFont, ttf: subsetResult.ttf ?? null }); + recordSubsetLatency(t3 - t0); const contentTypes: Record = { ttf: "font/ttf", woff2: "font/woff2" }; diff --git a/backend/shared.ts b/backend/shared.ts index e4c265a..b3b2c0b 100644 --- a/backend/shared.ts +++ b/backend/shared.ts @@ -68,14 +68,50 @@ export function snapshotStats(): PersistedStats { }; } +/** 子集请求总耗时直方图:固定容量环形缓冲,只保留最近 1024 个样本(进程级,不持久化) */ +const LATENCY_RING = 1024; +const latencyRing = new Array(LATENCY_RING).fill(0); +let latencyNext = 0; +let latencyCount = 0; + +/** 记录一次子集请求总耗时(毫秒,含缓存命中路径) */ +export function recordSubsetLatency(totalMs: number): void { + latencyRing[latencyNext] = totalMs; + latencyNext = (latencyNext + 1) % LATENCY_RING; + if (latencyCount < LATENCY_RING) latencyCount++; +} + +/** 最近样本的分位数(percentile 0~100);无样本返回 null */ +function latencyPercentile(p: number): number | null { + if (latencyCount === 0) return null; + const sorted = latencyRing.slice(0, latencyCount).sort((a, b) => a - b); + const idx = Math.min(sorted.length - 1, Math.round(((sorted.length - 1) * p) / 100)); + return sorted[idx]; +} + +/** 延迟分位快照(/api/stats 输出用) */ +export function latencySnapshot(): { + latencySamples: number; + latencyP50: number | null; + latencyP95: number | null; + latencyP99: number | null; +} { + return { + latencySamples: latencyCount, + latencyP50: latencyPercentile(50), + latencyP95: latencyPercentile(95), + latencyP99: latencyPercentile(99), + }; +} + /** * 标记统计已变更,触发防抖落盘 * - * 请求热路径调用:仅做一次对象赋值 + 幂等的定时器检查,绝不阻塞。 - * 真正的磁盘 IO 由 stats_store 内部按 FLUSH_INTERVAL 批量执行。 + * 请求热路径调用:仅置脏标志 + 幂等的定时器检查,快照延迟到落盘时才取 + * (消除每请求一次对象拷贝)。真正的磁盘 IO 由 stats_store 按间隔批量执行。 */ export function markStatsDirty(): void { - scheduleStatsFlush(snapshotStats()); + scheduleStatsFlush(snapshotStats); } /** 字体文件 LRU 缓存,最多保留 3 个最近使用的字体 buffer(按条目数淘汰) */ diff --git a/backend/stats_store.ts b/backend/stats_store.ts index af6f56e..cf753b8 100644 --- a/backend/stats_store.ts +++ b/backend/stats_store.ts @@ -33,8 +33,8 @@ export interface PersistedStats { /** 落盘防抖间隔(毫秒):在请求热路径之外的最低频写盘,平衡丢失量与 IO */ const FLUSH_INTERVAL = 30_000; -/** 待落盘的快照;写入完成后才清空,避免写入期间的增量丢失 */ -let pending: PersistedStats | null = null; +/** 待落盘的快照函数;写入完成后才清空,避免写入期间的增量丢失 */ +let pending: (() => PersistedStats) | null = null; /** 防抖定时器句柄 */ let flushTimer: ReturnType | null = null; @@ -66,13 +66,13 @@ export async function loadPersistedStats(): Promise PersistedStats): void { + pending = snapFn; if (flushTimer !== null) return; flushTimer = setInterval(flushStats, FLUSH_INTERVAL); } @@ -80,17 +80,17 @@ export function scheduleStatsFlush(snapshot: PersistedStats): void { /** 取快照并写盘;无变更时直接跳过 */ async function flushStats(): Promise { if (pending === null) return; - /** 先取走快照再写:写盘期间新到的增量会进下一次 pending,不会丢 */ - const snapshot = pending; + /** 落盘时刻才取快照:写入期间的增量进下一次周期,不会丢 */ + const snapshot = pending(); pending = null; try { /** font/ 目录通常已由 ensureDirectories 创建,这里兜底以防万一 */ await mkdir("font"); await writeFile(STATS_FILE, new TextEncoder().encode(JSON.stringify(snapshot))); } catch (err) { - /** 写盘失败不影响服务:把快照放回 pending,等下个周期重试 */ + /** 写盘失败不影响服务:把快照函数放回 pending,等下个周期重试 */ console.log("[stats] flush failed:", err); - pending = snapshot; + pending = () => snapshot; } } diff --git a/package.json b/package.json index 51599b5..6e0a7d2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "webfont", "private": true, - "version": "1.15.5", + "version": "1.15.6", "type": "module", "scripts": { "dev": "pnpx tsx scripts/dev-all.ts", diff --git a/rust-spike/src/main.rs b/rust-spike/src/main.rs index ed4694b..babc810 100644 --- a/rust-spike/src/main.rs +++ b/rust-spike/src/main.rs @@ -451,6 +451,7 @@ fn handle_subset( if let Some(bytes) = app.subset_cache.get(&cache_key) { misc::stats_record_cache_hit(); let t_hit = Instant::now(); + misc::stats_record_latency(ms(t0, t_hit) as u64); let timing = [format!("X-Timing-Total: {}", ms(t0, t_hit))]; let timing: Vec<&str> = timing.iter().map(|s| s.as_str()).collect(); let etag = http::etag_of(&bytes); @@ -501,22 +502,22 @@ fn handle_subset( return Ok(close); } }; - // woff2 编码(outType=woff2 时)。Zig 版 `try` 上抛后 defer 释放闸门再静默收线 + let t3 = Instant::now(); + // 闸门只管重活(读盘+解析+裁剪):subset 完成即释放槽位, + // woff2 编码(毫秒级 CPU、内存仅为子集产物大小)移到闸门外—— + // 高并发时槽位更快回收,编码在各连接线程天然并行,吞吐不受闸门并发上限压制 + misc::gate_release(est); let out_bytes: Vec = if out_woff2 { match woff2::encode_ttf_to_woff2(&result) { Ok(b) => b, - Err(_) => { - misc::gate_release(est); - return Ok(true); - } + Err(_) => return Ok(true), } } else { result }; - let t3 = Instant::now(); - misc::gate_release(est); app.subset_cache.insert(&cache_key, out_bytes.to_vec()); + misc::stats_record_latency(ms(t0, t3) as u64); let timing = [ format!("X-Timing-Find: {}", ms(t0, t1)), diff --git a/rust-spike/src/misc.rs b/rust-spike/src/misc.rs index 4c49877..ced1a8f 100644 --- a/rust-spike/src/misc.rs +++ b/rust-spike/src/misc.rs @@ -93,6 +93,37 @@ static STATS: Mutex = Mutex::new(StatsInner { offline_downloads: 0, }, }); + +/// 子集请求总耗时直方图:固定容量环形缓冲,只保留最近 LATENCY_RING 个样本 +/// (进程级观测,不持久化——重启重新采样即可) +const LATENCY_RING: usize = 1024; +static LATENCIES: Mutex<(Vec, usize)> = Mutex::new((Vec::new(), 0)); + +/// 记录一次子集请求总耗时(毫秒,含缓存命中路径) +pub fn stats_record_latency(total_ms: u64) { + let mut g = LATENCIES.lock().unwrap(); + let (ring, next) = &mut *g; + if ring.len() < LATENCY_RING { + // 未满时只 push,保证 ring.len() == 真实样本数,分位不掺零值 + ring.push(total_ms as u32); + } else { + ring[*next] = total_ms as u32; + } + *next = (*next + 1) % LATENCY_RING; +} + +/// 最近样本的分位数(percentile 0~100);无样本返回 None +fn latency_percentile(p: f64) -> Option { + let g = LATENCIES.lock().unwrap(); + let (ring, _next) = &*g; + if ring.is_empty() { + return None; + } + let mut sorted: Vec = ring.to_vec(); + sorted.sort_unstable(); + let idx = ((sorted.len() as f64 - 1.0) * p / 100.0).round() as usize; + Some(sorted[idx.min(sorted.len() - 1)] as u64) +} /// 启动时刻(uptime 只算本次进程) static STATS_START_MS: OnceLock = OnceLock::new(); @@ -948,11 +979,23 @@ pub fn handle_stats( ) -> io::Result { let c = { STATS.lock().unwrap().c }; let uptime: u64 = (wall_now_ms() - STATS_START_MS.get().copied().unwrap_or(0)).max(0) as u64 / 1000; + // 最近 1024 次子集请求耗时分位(可观测性:热路径健康度一眼可见) + let lat_count = { + let g = LATENCIES.lock().unwrap(); + g.0.len() + }; + let lat = format!( + "\"latencySamples\":{},\"latencyP50\":{},\"latencyP95\":{},\"latencyP99\":{}", + lat_count, + latency_percentile(50.0).unwrap_or(0), + latency_percentile(95.0).unwrap_or(0), + latency_percentile(99.0).unwrap_or(0), + ); let body = format!( - "{{\"uptime\":{},\"totalRequests\":{},\"subsetRequests\":{},\"subsetCacheHits\":{},\"totalChars\":{},\"tempUploads\":{},\"offlineSubsets\":{},\"offlineDownloads\":{},\"subsetCacheEntries\":{},\"fontBufferCacheEntries\":{}}}", + "{{\"uptime\":{},\"totalRequests\":{},\"subsetRequests\":{},\"subsetCacheHits\":{},\"totalChars\":{},\"tempUploads\":{},\"offlineSubsets\":{},\"offlineDownloads\":{},\"subsetCacheEntries\":{},\"fontBufferCacheEntries\":{},{}}}", uptime, c.total_requests, c.subset_requests, c.subset_cache_hits, c.total_chars, c.temp_uploads, c.offline_subsets, c.offline_downloads, - subset_cache_entries, font_buffer_cache_entries, + subset_cache_entries, font_buffer_cache_entries, lat, ); http::send_json(stream, 200, &body, close)?; Ok(close)