Make mnesia:wait_for_tables/2 contain internal message in temp process

Author: Mikaka27

lib/mnesia/src/mnesia_controller.erl

@@ -232,16 +232,28 @@ wait_for_tables(Tabs, Timeout) ->
 do_wait_for_tables(Tabs, 0) ->
     reply_wait(Tabs);
 do_wait_for_tables(Tabs, Timeout) ->
-    Pid = spawn_link(?MODULE, wait_for_tables_init, [self(), Tabs]),
+    Parent = self(),
+    Fun = fun() ->
+                  PidInner = spawn_link(?MODULE, wait_for_tables_init, [self(), Tabs]),
+                  receive
+                      {?SERVER_NAME, PidInner, Res} ->
+                          Parent ! {?SERVER_NAME, self(), Res},
+                          unlink(Parent)
+                  after Timeout ->
+                          unlink(PidInner),
+                          exit(PidInner, timeout),
+                          Parent ! {?SERVER_NAME, self(), timeout},
+                          unlink(Parent)
+                  end
+          end,
+    PidOuter = spawn_link(Fun),
     receive
-	{?SERVER_NAME, Pid, Res} ->
-	    Res;
-	{'EXIT', Pid, _} ->
-	    reply_wait(Tabs)
-    after Timeout ->
-	    unlink(Pid),
-	    exit(Pid, timeout),
-	    reply_wait(Tabs)
+        {?SERVER_NAME, PidOuter, timeout} ->
+            reply_wait(Tabs);
+        {?SERVER_NAME, PidOuter, Res} ->
+            Res;
+        {'EXIT', PidOuter, _} ->
+            reply_wait(Tabs)
     end.
 
 reply_wait(Tabs) ->