Skip to content

Commit 2e8afad

Browse files
ryanfleuryryanfleury
committed
adjust conversion visualization; strip out old profiling markup
1 parent e7897f3 commit 2e8afad

File tree

6 files changed

+33
-96
lines changed

6 files changed

+33
-96
lines changed

‎src/df/core/df_core.c

+1
Original file line numberDiff line numberDiff line change
@@ -1802,6 +1802,7 @@ df_entity_alloc(DF_StateDeltaHistory *hist, DF_Entity *parent, DF_EntityKind kin
18021802
df_state->entities_id_gen += 1;
18031803
entity->id = df_state->entities_id_gen;
18041804
entity->generation += 1;
1805+
entity->alloc_time_us = os_now_microseconds();
18051806

18061807
// rjf: dirtify caches
18071808
df_state->kind_alloc_gens[kind] += 1;

‎src/df/core/df_core.h

+2
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ struct DF_Entity
430430
DF_EntityFlags flags;
431431
DF_EntityID id;
432432
U64 generation;
433+
U64 alloc_time_us;
433434
B32 deleted;
434435
F32 alive_t;
435436

@@ -1226,6 +1227,7 @@ read_only global DF_Entity df_g_nil_entity =
12261227
0,
12271228
0,
12281229
0,
1230+
0,
12291231

12301232
// rjf: allocationless, simple equipment
12311233
{0},

‎src/df/gfx/df_gfx.c

+12-9
Original file line numberDiff line numberDiff line change
@@ -4408,17 +4408,20 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
44084408
for(DF_EntityNode *n = tasks.first; n != 0; n = n->next)
44094409
{
44104410
DF_Entity *task = n->entity;
4411-
String8 raddbg_path = task->name;
4412-
String8 raddbg_name = str8_skip_last_slash(raddbg_path);
4413-
String8 task_text = push_str8f(scratch.arena, "Creating %S...", raddbg_name);
4414-
UI_Key key = ui_key_from_stringf(ui_key_zero(), "task_%p", task);
4415-
UI_Box *box = ui_build_box_from_key(UI_BoxFlag_DrawHotEffects|UI_BoxFlag_DrawText|UI_BoxFlag_DrawBorder|UI_BoxFlag_DrawBackground|UI_BoxFlag_Clickable, key);
4416-
UI_Signal sig = ui_signal_from_box(box);
4417-
if(ui_hovering(sig)) UI_Tooltip
4411+
if(task->alloc_time_us + 500000 < os_now_microseconds())
44184412
{
4419-
ui_label(raddbg_path);
4413+
String8 raddbg_path = task->name;
4414+
String8 raddbg_name = str8_skip_last_slash(raddbg_path);
4415+
String8 task_text = push_str8f(scratch.arena, "Creating %S...", raddbg_name);
4416+
UI_Key key = ui_key_from_stringf(ui_key_zero(), "task_%p", task);
4417+
UI_Box *box = ui_build_box_from_key(UI_BoxFlag_DrawHotEffects|UI_BoxFlag_DrawText|UI_BoxFlag_DrawBorder|UI_BoxFlag_DrawBackground|UI_BoxFlag_Clickable, key);
4418+
UI_Signal sig = ui_signal_from_box(box);
4419+
if(ui_hovering(sig)) UI_Tooltip
4420+
{
4421+
ui_label(raddbg_path);
4422+
}
4423+
ui_box_equip_display_string(box, task_text);
44204424
}
4421-
ui_box_equip_display_string(box, task_text);
44224425
}
44234426
scratch_end(scratch);
44244427
}

‎src/raddbg_cons/raddbg_cons.c

+1-19
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,6 @@ cons_type_list_push(Arena *arena, CONS_TypeList *list, CONS_Type *type){
13221322

13231323
static CONS_Symbol*
13241324
cons_symbol_handle_from_user_id(CONS_Root *root, U64 symbol_user_id, U64 symbol_user_id_hash){
1325-
ProfBeginFunction();
13261325
CONS__U64ToPtrLookup lookup = {0};
13271326
cons__u64toptr_lookup(&root->symbol_map, symbol_user_id, symbol_user_id_hash, &lookup);
13281327

@@ -1337,13 +1336,11 @@ cons_symbol_handle_from_user_id(CONS_Root *root, U64 symbol_user_id, U64 symbol_
13371336
cons__u64toptr_insert(root->arena, &root->symbol_map, symbol_user_id, symbol_user_id_hash, &lookup, result);
13381337
}
13391338

1340-
ProfEnd();
13411339
return(result);
13421340
}
13431341

13441342
static void
13451343
cons_symbol_set_info(CONS_Root *root, CONS_Symbol *symbol, CONS_SymbolInfo *info){
1346-
ProfBeginFunction();
13471344
CONS_SymbolKind kind = info->kind;
13481345

13491346
if (symbol->kind != CONS_SymbolKind_NULL){
@@ -1416,7 +1413,7 @@ cons_symbol_set_info(CONS_Root *root, CONS_Symbol *symbol, CONS_SymbolInfo *info
14161413
map = cons__name_map_for_kind(root, RADDBG_NameMapKind_Procedures);
14171414
}break;
14181415
}
1419-
if(map != 0) ProfScope("save name map")
1416+
if(map != 0)
14201417
{
14211418
cons__name_map_add_pair(root, map, symbol->name, symbol->idx);
14221419
}
@@ -1428,14 +1425,12 @@ cons_symbol_set_info(CONS_Root *root, CONS_Symbol *symbol, CONS_SymbolInfo *info
14281425
cons__name_map_add_pair(root, map, symbol->link_name, symbol->idx);
14291426
}
14301427
}
1431-
ProfEnd();
14321428
}
14331429

14341430
// scopes
14351431

14361432
static CONS_Scope*
14371433
cons_scope_handle_from_user_id(CONS_Root *root, U64 scope_user_id, U64 scope_user_id_hash){
1438-
ProfBeginFunction();
14391434
CONS__U64ToPtrLookup lookup = {0};
14401435
cons__u64toptr_lookup(&root->scope_map, scope_user_id, scope_user_id_hash, &lookup);
14411436

@@ -1451,7 +1446,6 @@ cons_scope_handle_from_user_id(CONS_Root *root, U64 scope_user_id, U64 scope_use
14511446
cons__u64toptr_insert(root->arena, &root->scope_map, scope_user_id, scope_user_id_hash, &lookup, result);
14521447
}
14531448

1454-
ProfEnd();
14551449
return(result);
14561450
}
14571451

@@ -1485,7 +1479,6 @@ cons_scope_add_voff_range(CONS_Root *root, CONS_Scope *scope, U64 voff_first, U6
14851479

14861480
static CONS_Local*
14871481
cons_local_handle_from_user_id(CONS_Root *root, U64 local_user_id, U64 local_user_id_hash){
1488-
ProfBeginFunction();
14891482
CONS__U64ToPtrLookup lookup = {0};
14901483
cons__u64toptr_lookup(&root->local_map, local_user_id, local_user_id_hash, &lookup);
14911484

@@ -1498,7 +1491,6 @@ cons_local_handle_from_user_id(CONS_Root *root, U64 local_user_id, U64 local_use
14981491
cons__u64toptr_insert(root->arena, &root->local_map, local_user_id, local_user_id_hash, &lookup, result);
14991492
}
15001493

1501-
ProfEnd();
15021494
return(result);
15031495
}
15041496

@@ -1711,14 +1703,12 @@ cons__type_udt_from_record_type(CONS_Root *root, CONS_Type *type){
17111703

17121704
static void
17131705
cons__scope_recursive_set_symbol(CONS_Scope *scope, CONS_Symbol *symbol){
1714-
ProfBeginFunction();
17151706
scope->symbol = symbol;
17161707
for (CONS_Scope *node = scope->first_child;
17171708
node != 0;
17181709
node = node->next_sibling){
17191710
cons__scope_recursive_set_symbol(node, symbol);
17201711
}
1721-
ProfEnd();
17221712
}
17231713

17241714
// name maps
@@ -1739,7 +1729,6 @@ cons__name_map_for_kind(CONS_Root *root, RADDBG_NameMapKind kind){
17391729

17401730
static void
17411731
cons__name_map_add_pair(CONS_Root *root, CONS__NameMap *map, String8 string, U32 idx){
1742-
ProfBeginFunction();
17431732

17441733
// hash
17451734
U64 hash = raddbg_hash(string.str, string.size);
@@ -1796,7 +1785,6 @@ cons__name_map_add_pair(CONS_Root *root, CONS__NameMap *map, String8 string, U32
17961785
match->idx_count += 1;
17971786
}
17981787

1799-
ProfEnd();
18001788
}
18011789

18021790
// u64 to ptr map
@@ -1830,7 +1818,6 @@ cons__u64toptr_lookup(CONS__U64ToPtrMap *map, U64 key, U64 hash, CONS__U64ToPtrL
18301818
static void
18311819
cons__u64toptr_insert(Arena *arena, CONS__U64ToPtrMap *map, U64 key, U64 hash,
18321820
CONS__U64ToPtrLookup *lookup, void *ptr){
1833-
ProfBeginFunction();
18341821
if (lookup->fill_node != 0){
18351822
CONS__U64ToPtrNode *node = lookup->fill_node;
18361823
U32 k = lookup->fill_k;
@@ -1851,7 +1838,6 @@ cons__u64toptr_insert(Arena *arena, CONS__U64ToPtrMap *map, U64 key, U64 hash,
18511838
map->pair_count += 1;
18521839
map->bucket_collision_count += (node->next != 0);
18531840
}
1854-
ProfEnd();
18551841
}
18561842

18571843
// str8 to ptr map
@@ -1865,7 +1851,6 @@ cons__str8toptr_init(Arena *arena, CONS__Str8ToPtrMap *map, U64 bucket_count)
18651851

18661852
static void*
18671853
cons__str8toptr_lookup(CONS__Str8ToPtrMap *map, String8 key, U64 hash){
1868-
ProfBeginFunction();
18691854
void *result = 0;
18701855
U64 bucket_idx = hash%map->buckets_count;
18711856
for (CONS__Str8ToPtrNode *node = map->buckets[bucket_idx];
@@ -1876,13 +1861,11 @@ cons__str8toptr_lookup(CONS__Str8ToPtrMap *map, String8 key, U64 hash){
18761861
break;
18771862
}
18781863
}
1879-
ProfEnd();
18801864
return(result);
18811865
}
18821866

18831867
static void
18841868
cons__str8toptr_insert(Arena *arena, CONS__Str8ToPtrMap *map, String8 key, U64 hash, void *ptr){
1885-
ProfBeginFunction();
18861869
U64 bucket_idx = hash%map->buckets_count;
18871870

18881871
CONS__Str8ToPtrNode *node = push_array(arena, CONS__Str8ToPtrNode, 1);
@@ -1893,7 +1876,6 @@ cons__str8toptr_insert(Arena *arena, CONS__Str8ToPtrMap *map, String8 key, U64 h
18931876
node->ptr = ptr;
18941877
map->bucket_collision_count += (node->next != 0);
18951878
map->pair_count += 1;
1896-
ProfEnd();
18971879
}
18981880

18991881

0 commit comments

Comments
 (0)