Changeset 3466 for trunk/src/kash/shinstance.c

Timestamp:

Sep 15, 2020, 11:28:37 PM (5 years ago)

Author:

bird

Message:

kash: Introduced asynchronous closing of files we're written to on windows because it may take a while on NTFS. We only need to make sure async CloseHandle are done when executing or forking.

File:

• trunk/src/kash/shinstance.c (modified) (2 diffs)

trunk/src/kash/shinstance.c

@@ -2091 +2091 @@
             {
                 char errmsg[512];
-                rc = nt_child_inject_standard_handles(ProcInfo.hProcess, fdinfo.replacehandles, (HANDLE*)&fdinfo.handles[0],
-                                                      errmsg, sizeof(errmsg));
+                if (!fdinfo.inherithandles)
+                    rc = nt_child_inject_standard_handles(ProcInfo.hProcess, fdinfo.replacehandles,
+                                                          (HANDLE *)&fdinfo.handles[0], errmsg, sizeof(errmsg));
+                else
+                    rc = 0;
                 if (!rc)
                 {
+#  ifdef KASH_ASYNC_CLOSE_HANDLE
+                    shfile_async_close_sync();
+#  endif
                     rc = ResumeThread(ProcInfo.hThread);
                     if (!rc)
@@ -2121 +2127 @@
                 if (GetExitCodeProcess(ProcInfo.hProcess, &dwExitCode))
                 {
-#ifndef SH_FORKED_MODE
+#  ifndef SH_FORKED_MODE
                     shsubshellstatus_signal_and_release(psh, (int)dwExitCode);
-#endif
+#  endif
                     CloseHandle(ProcInfo.hProcess);
                     ProcInfo.hProcess = INVALID_HANDLE_VALUE;