Improve SQL handling & aggregate memory events (WIP)data_improvements

3 files changed, 21 insertions, 4 deletions

diff --git a/ui/curses/ui.j2.c b/ui/curses/ui.j2.c
index ddeaf3b..2158eeb 100644
--- a/ui/curses/ui.j2.c
+++ b/ui/curses/ui.j2.c
@@ -416,6 +416,17 @@ void ui_print_core(int l) {
     ui_ulx_field(++l, "pcur", g_cores[g_core].pcur);
     ui_ulx_field(++l, "psli", g_cores[g_core].psli);
     ui_ulx_field(++l, "ivpt", g_cores[g_core].ivpt);
+
+    ++l;
+
+    {% if arch_vars.core_fields|length %}
+    ui_line(false, ++l, PAIR_HEADER, A_BOLD, "ARCH SPECIFIC");
+    {% for type, name, print in arch_vars.core_fields if print %}
+    {% if type == "uint64_t" %}
+    ui_ulx_field(++l, "{{ name }}", g_cores[g_core].{{ name }});
+    {% endif %}
+    {% endfor %}
+    {% endif %}
 }
 
 // ----------------------------------------------------------------------------
diff --git a/ui/curses/ui_vars.py b/ui/curses/ui_vars.py
index 4dfdc10..97d2c07 100644
--- a/ui/curses/ui_vars.py
+++ b/ui/curses/ui_vars.py
@@ -1,2 +1,5 @@
-flags    = ["-lncurses", "-DNCURSES_WIDECHAR=1"]
-includes = ["curses.h", "locale.h", "time.h"]
+def gen_ui_vars(_):
+    return {
+        "flags": ["-lncurses", "-DNCURSES_WIDECHAR=1"],
+        "includes": ["curses.h", "locale.h", "time.h"],
+    }
diff --git a/ui/daemon/ui_vars.py b/ui/daemon/ui_vars.py
index 9d0fc33..bb6be7c 100644
--- a/ui/daemon/ui_vars.py
+++ b/ui/daemon/ui_vars.py
@@ -1,2 +1,5 @@
-flags    = []
-includes = ["signal.h", "stdio.h", "unistd.h"]
+def gen_ui_vars(_):
+    return {
+        "flags": [],
+        "includes": ["signal.h", "stdio.h", "unistd.h"],
+    }