diff --git a/src/libsysprof/categories.txt b/src/libsysprof/categories.txt index 58cb3e64..601d33bb 100644 --- a/src/libsysprof/categories.txt +++ b/src/libsysprof/categories.txt @@ -144,6 +144,11 @@ JS: * javascript inherit +Kernel: +do_coredump coredump inherit +* kernel inherit + + libc: poll main-loop inherit select main-loop inherit diff --git a/src/libsysprof/sysprof-callgraph.c b/src/libsysprof/sysprof-callgraph.c index 20b020ea..5007315e 100644 --- a/src/libsysprof/sysprof-callgraph.c +++ b/src/libsysprof/sysprof-callgraph.c @@ -305,14 +305,11 @@ _sysprof_callgraph_categorize (SysprofCallgraph *self, node->category = SYSPROF_CALLGRAPH_CATEGORY_CONTEXT_SWITCH; break; - case SYSPROF_SYMBOL_KIND_KERNEL: - node->category = SYSPROF_CALLGRAPH_CATEGORY_KERNEL; - break; - case SYSPROF_SYMBOL_KIND_UNWINDABLE: node->category = SYSPROF_CALLGRAPH_CATEGORY_UNWINDABLE; break; + case SYSPROF_SYMBOL_KIND_KERNEL: case SYSPROF_SYMBOL_KIND_USER: node->category = _sysprof_callgraph_node_categorize (node); diff --git a/src/libsysprof/sysprof-callgraph.h b/src/libsysprof/sysprof-callgraph.h index 6704d8f0..1861a555 100644 --- a/src/libsysprof/sysprof-callgraph.h +++ b/src/libsysprof/sysprof-callgraph.h @@ -69,6 +69,7 @@ typedef enum _SysprofCallgraphCategory SYSPROF_CALLGRAPH_CATEGORY_A11Y, SYSPROF_CALLGRAPH_CATEGORY_ACTIONS, SYSPROF_CALLGRAPH_CATEGORY_CONTEXT_SWITCH, + SYSPROF_CALLGRAPH_CATEGORY_COREDUMP, SYSPROF_CALLGRAPH_CATEGORY_CSS, SYSPROF_CALLGRAPH_CATEGORY_GRAPHICS, SYSPROF_CALLGRAPH_CATEGORY_ICONS, diff --git a/src/libsysprof/sysprof-category-summary.c b/src/libsysprof/sysprof-category-summary.c index 08402db9..33b07ca2 100644 --- a/src/libsysprof/sysprof-category-summary.c +++ b/src/libsysprof/sysprof-category-summary.c @@ -143,6 +143,9 @@ sysprof_category_summary_get_category_name (SysprofCategorySummary *self) case SYSPROF_CALLGRAPH_CATEGORY_ACTIONS: return _("Actions"); + case SYSPROF_CALLGRAPH_CATEGORY_COREDUMP: + return _("Crash Handler"); + case SYSPROF_CALLGRAPH_CATEGORY_CONTEXT_SWITCH: return _("Context Switches"); diff --git a/src/sysprof/sysprof-category-icon.c b/src/sysprof/sysprof-category-icon.c index 42b81dd3..51d15d83 100644 --- a/src/sysprof/sysprof-category-icon.c +++ b/src/sysprof/sysprof-category-icon.c @@ -121,6 +121,7 @@ sysprof_category_icon_class_init (SysprofCategoryIconClass *klass) gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_A11Y], "#000"); gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_ACTIONS], "#f66151"); gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_CONTEXT_SWITCH], "#ffbe6f"); + gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_COREDUMP], "#ff0000"); gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_CSS], "#62a0ea"); gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_GRAPHICS], "#ed333b"); gdk_rgba_parse (&category_colors[SYSPROF_CALLGRAPH_CATEGORY_ICONS], "#613583");