Skip to content

Commit 5548d6d

Browse files
ubugeeeiryoppippi
authored andcommitted
perf: optimize memory allocation, hash, compile-time computation (#1096)
1 parent b29540e commit 5548d6d

12 files changed

Lines changed: 375 additions & 152 deletions

File tree

‎rust/Cargo.lock‎

Lines changed: 112 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust/crates/ccusage/Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ jiff = { version = "0.2.24", default-features = false, features = [
2020
"tzdb-zoneinfo",
2121
] }
2222
memchr = "2"
23+
compact_str = "0.9"
24+
phf = { version = "0.13", features = ["macros"] }
25+
rustc-hash = "2"
2326
schemars = "0.8"
2427
serde = { version = "1", features = ["derive"] }
2528
serde_json = "1"
29+
smallvec = "1"
2630
sqlite = { version = "0.37.0", default-features = false, features = ["bundled", "linkage"] }
2731
ureq = { version = "3.3.0", default-features = false, features = ["rustls"] }
2832

‎rust/crates/ccusage/src/adapter/all.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,9 @@ impl AllAccumulator {
767767
}
768768

769769
fn aggregate_model_breakdowns(rows: &[AllRow]) -> Vec<ModelBreakdown> {
770-
use std::collections::HashMap;
771-
let mut indexes: HashMap<String, usize> = HashMap::new();
770+
use crate::fast::FxHashMap;
771+
772+
let mut indexes = FxHashMap::<String, usize>::default();
772773
let mut breakdowns: Vec<ModelBreakdown> = Vec::new();
773774
for row in rows {
774775
for item in &row.model_breakdowns {

‎rust/crates/ccusage/src/adapter/codex.rs‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,37 @@
11
use std::{
2-
collections::{hash_map::DefaultHasher, BTreeMap, HashSet},
2+
collections::BTreeMap,
33
env, fs,
44
hash::{Hash, Hasher},
55
path::{Path, PathBuf},
66
sync::Mutex,
77
thread,
88
};
99

10+
use compact_str::CompactString;
1011
use jiff::tz::TimeZone as JiffTimeZone;
12+
use rustc_hash::FxHasher;
1113
use serde_json::{json, Value};
1214

1315
use crate::{
1416
cli::{AgentCommandArgs, AgentReportKind, CodexSpeed, SharedArgs, WeekDay},
15-
color, format_currency, format_date_tz, format_models_multiline, format_number, json_float,
17+
color,
18+
fast::FxHashSet,
19+
format_currency, format_date_tz, format_models_multiline, format_number, json_float,
1620
json_value_u64, log_level, parse_ts_timestamp, parse_tz, print_box_title, print_json_or_jq,
1721
wants_json, week_start, Align, CodexGroup, CodexModelUsage, CodexTokenUsageEvent, Color,
1822
PricingMap, Result, SimpleTable,
1923
};
2024

21-
type CodexEventKey = (String, Option<String>, u64, u64, u64, u64, u64);
22-
type CodexDedupeShards = [Mutex<HashSet<CodexEventKey>>];
25+
type CodexEventKey = (
26+
CompactString,
27+
Option<CompactString>,
28+
u64,
29+
u64,
30+
u64,
31+
u64,
32+
u64,
33+
);
34+
type CodexDedupeShards = [Mutex<FxHashSet<CodexEventKey>>];
2335

2436
pub(crate) fn run(args: AgentCommandArgs) -> Result<()> {
2537
let shared = args.shared;
@@ -293,26 +305,26 @@ fn accumulate_codex_event_into_group(
293305
model_usage.is_fallback |= event.is_fallback_model;
294306
}
295307

296-
fn create_dedupe_shards() -> Vec<Mutex<HashSet<CodexEventKey>>> {
308+
fn create_dedupe_shards() -> Vec<Mutex<FxHashSet<CodexEventKey>>> {
297309
let shard_count = thread::available_parallelism()
298310
.map(usize::from)
299311
.unwrap_or(1);
300312
(0..shard_count.max(1))
301-
.map(|_| Mutex::new(HashSet::new()))
313+
.map(|_| Mutex::new(FxHashSet::default()))
302314
.collect()
303315
}
304316

305317
fn insert_event_key(event: &CodexTokenUsageEvent, seen: &CodexDedupeShards) -> bool {
306318
let key = (
307-
event.timestamp.clone(),
308-
event.model.clone(),
319+
CompactString::new(&event.timestamp),
320+
event.model.as_deref().map(CompactString::new),
309321
event.input_tokens,
310322
event.cached_input_tokens,
311323
event.output_tokens,
312324
event.reasoning_output_tokens,
313325
event.total_tokens,
314326
);
315-
let mut hasher = DefaultHasher::new();
327+
let mut hasher = FxHasher::default();
316328
key.hash(&mut hasher);
317329
let shard_index = hasher.finish() as usize % seen.len();
318330
seen[shard_index].lock().unwrap().insert(key)

‎rust/crates/ccusage/src/blocks.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
use std::collections::HashSet;
2-
31
use serde_json::{json, Value};
42

53
use crate::{
64
am_pm,
75
cli::{SharedArgs, SortOrder},
8-
color, format_currency, format_date, format_models_multiline, format_number,
9-
format_rfc3339_millis, format_utc_second, hour_12, json_float, local_parts, print_box_title,
10-
terminal_width, utc_now, Align, BurnRate, Color, LoadedEntry, Projection, SessionBlock,
11-
SimpleTable, TimestampMs, TokenCounts, BLOCKS_COMPACT_WIDTH_THRESHOLD,
12-
BLOCKS_WARNING_THRESHOLD, MILLIS_PER_HOUR, MILLIS_PER_MINUTE,
6+
color,
7+
fast::FxHashSet,
8+
format_currency, format_date, format_models_multiline, format_number, format_rfc3339_millis,
9+
format_utc_second, hour_12, json_float, local_parts, print_box_title, terminal_width, utc_now,
10+
Align, BurnRate, Color, LoadedEntry, Projection, SessionBlock, SimpleTable, TimestampMs,
11+
TokenCounts, BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_WARNING_THRESHOLD, MILLIS_PER_HOUR,
12+
MILLIS_PER_MINUTE,
1313
};
1414

1515
pub(crate) fn identify_session_blocks(
@@ -80,7 +80,7 @@ fn create_block(
8080
let mut token_counts = TokenCounts::default();
8181
let mut cost = 0.0;
8282
let mut models = Vec::new();
83-
let mut seen_models = HashSet::new();
83+
let mut seen_models = FxHashSet::default();
8484
let mut usage_limit_reset_time = None;
8585
for entry in &entries {
8686
token_counts.add_usage(entry.data.message.usage);

0 commit comments

Comments
 (0)