Changeset 3458 for trunk/src/kash/shfile.c

Timestamp:

Sep 14, 2020, 11:46:32 PM (5 years ago)

Author:

bird

Message:

kash: Use reference counting of parser output in threaded-mode.

File:

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

trunk/src/kash/shfile.c

@@ -921 +921 @@
  * Safe to call more than once.
  */
-void shfile_uninit(shfdtab *pfdtab)
+void shfile_uninit(shfdtab *pfdtab, int tracefd)
 {
     if (!pfdtab)
@@ -930 +930 @@
         unsigned left = pfdtab->size;
         struct shfile *pfd = pfdtab->tab;
+        unsigned tracefdfound = 0;
         while (left-- > 0)
         {
             if (pfd->fd != -1)
             {
+                if (pfd->fd != tracefd)
+                {
 #if K_OS == K_OS_WINDOWS
-                BOOL rc = CloseHandle((HANDLE)pfd->native);
-                assert(rc == TRUE); K_NOREF(rc);
-#else
-                int rc = close((int)pfd->native);
-                assert(rc == 0); K_NOREF(rc);
-#endif
-                pfd->fd     = -1;
-                pfd->native = -1;
+                    BOOL rc = CloseHandle((HANDLE)pfd->native);
+                    assert(rc == TRUE); K_NOREF(rc);
+#else
+                    int rc = close((int)pfd->native);
+                    assert(rc == 0); K_NOREF(rc);
+#endif
+                    pfd->fd     = -1;
+                    pfd->native = -1;
+                }
+                else
+                    tracefdfound++; /* there is only the one */
             }
             pfd++;
         }
+
+        if (!tracefdfound)
+        { /* likely */ }
+        else
+            return;
 
         sh_free(NULL, pfdtab->tab);