Changeset 3438 for trunk/src/kash/show.c

Timestamp:

Sep 9, 2020, 10:01:39 PM (5 years ago)

Author:

bird

Message:

kash: Hammering on threaded mode.

File:

• trunk/src/kash/show.c (modified) (3 diffs)

trunk/src/kash/show.c

@@ -299 +299 @@
 
         if (pos) {
-        int     s = errno;
+                int     s = errno;
                 char    prefix[40];
                 size_t  len;
 
-                len = sprintf(prefix, "[%d] ", sh_getpid(psh));
+#ifdef SH_FORKED_MODE
+                len = sprintf(prefix, "[%" SHPID_PRI "] ", sh_getpid(psh));
+#else
+                shpid pid = sh_getpid(psh);
+                len = sprintf(prefix, "[%d/%d] ", SHPID_GET_PID(pid), SHPID_GET_TID(pid));
+#endif
                 shfile_write(&psh->fdtab, psh->tracefd, prefix, len);
                 shfile_write(&psh->fdtab, psh->tracefd, psh->tracebuf, pos);
@@ -310 +315 @@
                 psh->tracebuf[0] = '\0';
 
-        errno = s;
+                errno = s;
         }
 }
@@ -359 +364 @@
                 } else {
                         /* it's too big for some reason... */
-            int s = errno;
+                        int s = errno;
                         trace_flush(psh);
                         shfile_write(&psh->fdtab, psh->tracefd, str, len);
                         if (!flush_it)
                                 shfile_write(&psh->fdtab, psh->tracefd, "[too long]\n", sizeof( "[too long]\n") - 1);
-            errno = s;
+                        errno = s;
                 }