main: Move initialization of runtime and user interface to same file

Since the user interface contains some GC pointers, we need to guarantee that the mutex in the runtime is initialized before the garbage collected pointers in the user interface. Move the runtime and user interface to the `main` file to guarantee that this consstraint is respected. Signed-off-by: Christophe de Dinechin <[email protected]>
c3d · Dec 8, 2024 · 6365ef5 · 6365ef5
1 parent e67ab92
commit 6365ef5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/dmcp/main.cc b/src/dmcp/main.cc
@@ -57,6 +57,10 @@
 using std::max;
 using std::min;
 
+// Those are put in the same file to guarantee initialization order
+runtime rt(nullptr, 0);
+runtime::gcptr *runtime::GCSafe;
+user_interface ui;
 
 uint last_keystroke_time = 0;
 int  last_key            = 0;

diff --git a/src/runtime.cc b/src/runtime.cc
@@ -42,9 +42,6 @@
 #include <cstring>
 
 
-// The one and only runtime
-runtime rt(nullptr, 0);
-runtime::gcptr *runtime::GCSafe;
 
 RECORDER(runtime,       16, "RPL runtime");
 RECORDER(runtime_error, 16, "RPL runtime error (anomalous behaviors)");

diff --git a/src/user_interface.cc b/src/user_interface.cc
@@ -66,9 +66,6 @@
 #include <wctype.h>
 
 
-// The primary user interface of the calculator
-user_interface ui;
-
 using std::max;
 using std::min;