Changeset 3468 for trunk/src

Timestamp:

Sep 16, 2020, 1:28:47 AM (5 years ago)

Author:

bird

Message:

kash: Need to initialize mutexes on windows after forking now that we've finally got real mutexes.

Location:

trunk/src/kash

Files:

• shfork-win.c (modified) (1 diff)
• shinstance.c (modified) (2 diffs)
• shinstance.h (modified) (1 diff)

trunk/src/kash/shfork-win.c

@@ -158 +158 @@
         setlocale(LC_ALL, "");
         init_syntax();
+        sh_init_globals();
     }
     return pid;

trunk/src/kash/shinstance.c

@@ -175 +175 @@
 
 /**
+ * Initialize globals in shinstance.c.
+ *
+ * Called when creating the rootshell and on windows after forking.
+ */
+void sh_init_globals(void)
+{
+    assert(g_sh_mtx.au64[SHMTX_MAGIC_IDX] != SHMTX_MAGIC);
+    shmtx_init(&g_sh_mtx);
+#ifndef SH_FORKED_MODE
+    shmtx_init(&g_sh_exec_inherit_mtx);
+    shmtx_init(&g_sh_sts_mtx);
+#endif
+}
+
+
+/**
  * Links the shell instance.
  *
@@ -709 +725 @@
     shinstance *psh;
 
-    assert(g_sh_mtx.au64[SHMTX_MAGIC_IDX] != SHMTX_MAGIC);
-    shmtx_init(&g_sh_mtx);
-#ifndef SH_FORKED_MODE
-    shmtx_init(&g_sh_exec_inherit_mtx);
-    shmtx_init(&g_sh_sts_mtx);
-#endif
+    sh_init_globals();
 
     psh = sh_create_shell_common(argv, envp, NULL /*parentfdtab*/);

trunk/src/kash/shinstance.h

@@ -444 +444 @@
 };
 
-
+extern void sh_init_globals(void);
 extern shinstance *sh_create_root_shell(char **, char **);
 extern shinstance *sh_create_child_shell(shinstance *);