Catch fatal errors during domain creation

ocaml-multicore · Jul 14, 2015 · 577c831 · 577c831
1 parent a1a22c6
commit 577c831
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/byterun/domain.c b/byterun/domain.c
@@ -149,6 +149,7 @@ static void create_domain(uintnat initial_minor_heap_size, int is_main) {
   if (d) {
     d->running = 1;
     d->state.is_main = 0;
+    d->state.vm_inited = 0;
     d->state.internals = d;
     /* FIXME: shutdown RPC? */
     atomic_store_rel(&d->rpc_request, RPC_IDLE);
@@ -183,6 +184,7 @@ static void create_domain(uintnat initial_minor_heap_size, int is_main) {
     d->state.state = caml_domain_state;
     d->state.mark_stack = &caml_mark_stack;
     d->state.mark_stack_count = &caml_mark_stack_count;
+    d->state.vm_inited = 1;
   }
   caml_plat_unlock(&all_domains_lock);
 }

diff --git a/byterun/domain.h b/byterun/domain.h
@@ -7,6 +7,7 @@
 struct domain {
   int id;
   int is_main;
+  int vm_inited;
 
   struct dom_internal* internals;
   struct caml_runqueue* runqueue;

diff --git a/byterun/fail.c b/byterun/fail.c
@@ -95,6 +95,10 @@ static value get_exception(int exn, const char* exn_name)
     fprintf(stderr, "Fatal error %s during initialisation\n", exn_name);
     exit(2);
   }
+  if (caml_domain_self() == 0 || !caml_domain_self()->vm_inited) {
+    fprintf(stderr, "Fatal error %s during domain creation\n", exn_name);
+    exit(2);
+  }
   return Field(caml_read_root(caml_global_data), exn);
 }