Skip to content

Commit 4ef2d23

Browse files
authored
Merge pull request DeusData#2234 from lorenzozanee/fix/framework-entry-dead-code
fix(ui): preserve framework route entry points from dead-code status
2 parents 9e7794b + 87b346e commit 4ef2d23

2 files changed

Lines changed: 115 additions & 44 deletions

File tree

‎src/ui/layout3d.c‎

Lines changed: 65 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -575,59 +575,77 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
575575

576576
/* 3. Query edges — filter during fetch via binary search (O(e log n)) */
577577
int *deg = calloc((size_t)n, sizeof(int));
578+
bool *framework_entry = cbm_calloc(CBM_MEM_CLASS_OTHER, (size_t)n * sizeof(bool));
578579
int mapped = 0;
579580
int edge_cap = CBM_SZ_256;
580581
cbm_edge_t *all_edges = malloc((size_t)edge_cap * sizeof(cbm_edge_t));
581582
int *es = malloc((size_t)edge_cap * sizeof(int));
582583
int *ed = malloc((size_t)edge_cap * sizeof(int));
583584
cbm_schema_info_t schema;
584585
memset(&schema, 0, sizeof(schema));
585-
if (deg && all_edges && es && ed &&
586-
cbm_store_get_schema(store, project, &schema) == CBM_STORE_OK) {
587-
for (int t = 0; t < schema.edge_type_count; t++) {
588-
cbm_edge_t *te = NULL;
589-
int tc = 0;
590-
if (cbm_store_find_edges_by_type(store, project, schema.edge_types[t].type, &te, &tc) ==
591-
CBM_STORE_OK) {
592-
for (int e = 0; e < tc; e++) {
593-
int si = find_node_index(id_map, n, te[e].source_id);
594-
int di = find_node_index(id_map, n, te[e].target_id);
595-
if (si >= 0 && di >= 0) {
596-
if (mapped >= edge_cap) {
597-
int nc = edge_cap * PAIR_LEN;
598-
cbm_edge_t *te2 = realloc(all_edges, (size_t)nc * sizeof(cbm_edge_t));
599-
int *ts = realloc(es, (size_t)nc * sizeof(int));
600-
int *td = realloc(ed, (size_t)nc * sizeof(int));
601-
if (!te2 || !ts || !td) {
602-
if (te2)
603-
all_edges = te2;
604-
if (ts)
605-
es = ts;
606-
if (td)
607-
ed = td;
608-
free_edge_array(te + e, tc - e);
609-
goto edges_done;
586+
bool framework_entries_valid = deg && framework_entry && all_edges && es && ed;
587+
if (framework_entries_valid) {
588+
if (cbm_store_get_schema(store, project, &schema) == CBM_STORE_OK) {
589+
for (int t = 0; t < schema.edge_type_count; t++) {
590+
cbm_edge_t *te = NULL;
591+
int tc = 0;
592+
if (cbm_store_find_edges_by_type(store, project, schema.edge_types[t].type, &te,
593+
&tc) == CBM_STORE_OK) {
594+
for (int e = 0; e < tc; e++) {
595+
int si = find_node_index(id_map, n, te[e].source_id);
596+
int di = find_node_index(id_map, n, te[e].target_id);
597+
if (si >= 0 && te[e].type && strcmp(te[e].type, "HANDLES") == 0) {
598+
cbm_node_t route = {0};
599+
if (cbm_store_find_node_by_id(store, te[e].target_id, &route) ==
600+
CBM_STORE_OK) {
601+
if (route.label && strcmp(route.label, "Route") == 0)
602+
framework_entry[si] = true;
603+
cbm_node_free_fields(&route);
604+
} else
605+
framework_entries_valid = false;
606+
}
607+
if (si >= 0 && di >= 0) {
608+
if (mapped >= edge_cap) {
609+
int nc = edge_cap * PAIR_LEN;
610+
cbm_edge_t *te2 =
611+
realloc(all_edges, (size_t)nc * sizeof(cbm_edge_t));
612+
int *ts = realloc(es, (size_t)nc * sizeof(int));
613+
int *td = realloc(ed, (size_t)nc * sizeof(int));
614+
if (!te2 || !ts || !td) {
615+
framework_entries_valid = false;
616+
if (te2)
617+
all_edges = te2;
618+
if (ts)
619+
es = ts;
620+
if (td)
621+
ed = td;
622+
free_edge_array(te + e, tc - e);
623+
goto edges_done;
624+
}
625+
all_edges = te2;
626+
es = ts;
627+
ed = td;
628+
edge_cap = nc;
610629
}
611-
all_edges = te2;
612-
es = ts;
613-
ed = td;
614-
edge_cap = nc;
630+
all_edges[mapped] = te[e];
631+
memset(&te[e], 0, sizeof(cbm_edge_t));
632+
es[mapped] = si;
633+
ed[mapped] = di;
634+
deg[si]++;
635+
deg[di]++;
636+
mapped++;
637+
} else {
638+
free((void *)te[e].project);
639+
free((void *)te[e].type);
640+
free((void *)te[e].properties_json);
615641
}
616-
all_edges[mapped] = te[e];
617-
memset(&te[e], 0, sizeof(cbm_edge_t));
618-
es[mapped] = si;
619-
ed[mapped] = di;
620-
deg[si]++;
621-
deg[di]++;
622-
mapped++;
623-
} else {
624-
free((void *)te[e].project);
625-
free((void *)te[e].type);
626-
free((void *)te[e].properties_json);
627642
}
628-
}
629-
free(te);
643+
free(te);
644+
} else
645+
framework_entries_valid = false;
630646
}
647+
} else {
648+
framework_entries_valid = false;
631649
}
632650
edges_done:
633651
cbm_store_schema_free(&schema);
@@ -651,6 +669,7 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
651669
if (!result || !bodies) {
652670
free(bodies);
653671
free(deg);
672+
cbm_free(CBM_MEM_CLASS_OTHER, framework_entry);
654673
free(es);
655674
free(ed);
656675
free(cdepth);
@@ -757,11 +776,12 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
757776
status = "structural";
758777
else if (testish)
759778
status = "test";
760-
else if (nf.is_entry || nf.is_route)
779+
else if (nf.is_entry || nf.is_route ||
780+
(framework_entries_valid && framework_entry && framework_entry[i]))
761781
status = "entry";
762782
else if (nf.is_exported)
763783
status = "exported";
764-
else if (ic == 0 && iu == 0)
784+
else if (framework_entries_valid && ic == 0 && iu == 0)
765785
status = "dead";
766786
else if (ic == 1)
767787
status = "single";
@@ -795,6 +815,7 @@ cbm_layout_result_t *cbm_layout_from_nodes(cbm_store_t *store, const char *proje
795815

796816
free(bodies);
797817
free(deg);
818+
cbm_free(CBM_MEM_CLASS_OTHER, framework_entry);
798819
free(es);
799820
free(ed);
800821
free(cdepth);

‎tests/test_ui.c‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,30 @@ TEST(layout_dead_code_classification) {
635635
.qualified_name = "dc::exportedfn",
636636
.file_path = "src/d.c",
637637
.properties_json = "{\"is_exported\":true}"};
638+
cbm_node_t framework = {.project = "dc",
639+
.label = "Function",
640+
.name = "frameworkfn",
641+
.qualified_name = "dc::frameworkfn",
642+
.file_path = "src/routes.c",
643+
.properties_json = "{}"};
644+
cbm_node_t route = {.project = "dc",
645+
.label = "Route",
646+
.name = "GET /framework",
647+
.qualified_name = "dc::route",
648+
.file_path = "src/routes.c",
649+
.properties_json = "{}"};
650+
cbm_node_t unrelated = {.project = "dc",
651+
.label = "Class",
652+
.name = "UnrelatedTarget",
653+
.qualified_name = "dc::unrelated",
654+
.file_path = "src/routes.c",
655+
.properties_json = "{}"};
656+
cbm_node_t nonroute = {.project = "dc",
657+
.label = "Function",
658+
.name = "nonroutefn",
659+
.qualified_name = "dc::nonroutefn",
660+
.file_path = "src/routes.c",
661+
.properties_json = "{}"};
638662
cbm_node_t single = {.project = "dc",
639663
.label = "Function",
640664
.name = "calledonce",
@@ -666,6 +690,14 @@ TEST(layout_dead_code_classification) {
666690
cbm_store_upsert_node(store, &tst);
667691
cbm_store_upsert_node(store, &tstpath);
668692
cbm_store_upsert_node(store, &exp);
693+
int64_t id_framework = cbm_store_upsert_node(store, &framework);
694+
int64_t id_route = cbm_store_upsert_node(store, &route);
695+
int64_t id_unrelated = cbm_store_upsert_node(store, &unrelated);
696+
int64_t id_nonroute = cbm_store_upsert_node(store, &nonroute);
697+
ASSERT_GT(id_framework, 0);
698+
ASSERT_GT(id_route, 0);
699+
ASSERT_GT(id_unrelated, 0);
700+
ASSERT_GT(id_nonroute, 0);
669701
int64_t id_single = cbm_store_upsert_node(store, &single);
670702
int64_t id_norm = cbm_store_upsert_node(store, &norm);
671703
int64_t id_caller = cbm_store_upsert_node(store, &caller);
@@ -678,9 +710,15 @@ TEST(layout_dead_code_classification) {
678710
cbm_edge_t e2 = {
679711
.project = "dc", .source_id = id_caller, .target_id = id_norm, .type = "CALLS"};
680712
cbm_edge_t e3 = {.project = "dc", .source_id = id_dead, .target_id = id_norm, .type = "CALLS"};
713+
cbm_edge_t framework_route = {
714+
.project = "dc", .source_id = id_framework, .target_id = id_route, .type = "HANDLES"};
715+
cbm_edge_t framework_unrelated = {
716+
.project = "dc", .source_id = id_nonroute, .target_id = id_unrelated, .type = "HANDLES"};
681717
cbm_store_insert_edge(store, &e1);
682718
cbm_store_insert_edge(store, &e2);
683719
cbm_store_insert_edge(store, &e3);
720+
ASSERT_GT(cbm_store_insert_edge(store, &framework_route), 0);
721+
ASSERT_GT(cbm_store_insert_edge(store, &framework_unrelated), 0);
684722

685723
cbm_layout_result_t *r = cbm_layout_compute(store, "dc", CBM_LAYOUT_OVERVIEW, NULL, 0, 100);
686724
ASSERT_NOT_NULL(r);
@@ -708,6 +746,18 @@ TEST(layout_dead_code_classification) {
708746
ASSERT_NOT_NULL(ln);
709747
ASSERT_STR_EQ(ln->status, "exported");
710748

749+
ln = find_layout_node(r, "frameworkfn");
750+
ASSERT_NOT_NULL(ln);
751+
ASSERT_STR_EQ(ln->status, "entry");
752+
753+
ln = find_layout_node(r, "nonroutefn");
754+
ASSERT_NOT_NULL(ln);
755+
ASSERT_STR_EQ(ln->status, "dead");
756+
757+
ln = find_layout_node(r, "GET /framework");
758+
ASSERT_NOT_NULL(ln);
759+
ASSERT_STR_EQ(ln->status, "structural");
760+
711761
ln = find_layout_node(r, "calledonce");
712762
ASSERT_NOT_NULL(ln);
713763
ASSERT_STR_EQ(ln->status, "single");

0 commit comments

Comments
 (0)