Changeset 2424 in kBuild

Timestamp:

Oct 18, 2010 8:52:03 AM (14 years ago)

Author:

bird

Message:

kash: Some S-bahn optimizations.

Location:

trunk/src/kash

Files:

• eval.c (modified) (3 diffs)
• input.c (modified) (1 diff)
• redir.c (modified) (5 diffs)
• redir.h (modified) (1 diff)
• shfile.c (modified) (8 diffs)
• shfile.h (modified) (1 diff)

trunk/src/kash/eval.c

@@ -511 +511 @@
                         INTON;
                         if (prevfd > 0) {
-                                shfile_close(&psh->fdtab, 0);
-                                copyfd(psh, prevfd, 0);
-                                shfile_close(&psh->fdtab, prevfd);
+                                movefd(psh, prevfd, 0);
                         }
                         if (pip[1] >= 0) {
                                 shfile_close(&psh->fdtab, pip[0]);
                                 if (pip[1] != 1) {
-                                        shfile_close(&psh->fdtab, 1);
-                                        copyfd(psh, pip[1], 1);
-                                        shfile_close(&psh->fdtab, pip[1]);
+                                        movefd(psh, pip[1], 1);
                                 }
                         }
@@ -582 +578 @@
                         shfile_close(&psh->fdtab, pip[0]);
                         if (pip[1] != 1) {
-                                shfile_close(&psh->fdtab, 1);
-                                copyfd(psh, pip[1], 1);
-                                shfile_close(&psh->fdtab, pip[1]);
+                                movefd(psh, pip[1], 1);
                         }
                         eflag(psh) = 0;
@@ -911 +905 @@
                         shfile_close(&psh->fdtab, pip[0]);
                         if (pip[1] != 1) {
-                                shfile_close(&psh->fdtab, 1);
-                                copyfd(psh, pip[1], 1);
-                                shfile_close(&psh->fdtab, pip[1]);
+                                movefd(psh, pip[1], 1);
                         }
                 }

trunk/src/kash/input.c

@@ -408 +408 @@
                 error(psh, "Can't open %s", fname);
         if (fd < 10) {
-                fd2 = copyfd(psh, fd, 10);
-                shfile_close(&psh->fdtab, fd);
+                fd2 = movefd_above(psh, fd, 10);
                 if (fd2 < 0)
                         error(psh, "Out of file descriptors");

trunk/src/kash/redir.c

@@ -233 +233 @@
 
         if (f != fd) {
-                copyfd(psh, f, fd);
-                shfile_close(&psh->fdtab, f);
+                movefd(psh, f, fd);
         }
         INTON;
@@ -302 +301 @@
                         if (i == 0)
                                 psh->fd0_redirected--;
-                        shfile_close(&psh->fdtab, i);
                         if (rp->renamed[i] >= 0) {
-                                copyfd(psh, rp->renamed[i], i);
-                                shfile_close(&psh->fdtab, rp->renamed[i]);
+                                movefd(psh, rp->renamed[i], i);
+                        } else {
+                                shfile_close(&psh->fdtab, i);
                         }
                 }
@@ -378 +377 @@
                 if (errno == EMFILE)
                         return EMPTY;
-                else
-                        error(psh, "%d: %s", from, strerror(errno));
+                error(psh, "%d: %s", from, strerror(errno));
         }
         return newfd;
@@ -386 +384 @@
 
 /*
- * Copy a file descriptor to be = to.  Returns -1
+ * Move a file descriptor to be == to.  Returns -1
  * if the source file descriptor is closed, EMPTY if there are no unused
  * file descriptors left.
@@ -392 +390 @@
 
 int
-copyfd2(shinstance *psh, int from, int to)
+movefd(shinstance *psh, int from, int to)
 {
         int newfd;
 
-        /** @todo Use dup2()... */
-        newfd = shfile_fcntl(&psh->fdtab, from, F_DUPFD, to);
+        newfd = shfile_movefd(&psh->fdtab, from, to);
         if (newfd < 0) {
                 if (errno == EMFILE)
                         return EMPTY;
-                else
-                        error(psh, "%d: %s", from, strerror(errno));
-        }
-        else if (newfd != to) {
-                error(psh, "%d: F_DUPFD returned %d, expected %d", from, newfd, to);
-                close(newfd);
-                newfd = -1;
-        }
-
+                error(psh, "%d: %s", from, strerror(errno));
+        }
         return newfd;
 }
 
+
+/*
+ * Move a file descriptor to be >= to.  Returns -1
+ * if the source file descriptor is closed, EMPTY if there are no unused
+ * file descriptors left.
+ */
+
+int
+movefd_above(shinstance *psh, int from, int to)
+{
+        int newfd;
+
+        newfd = shfile_movefd_above(&psh->fdtab, from, to);
+        if (newfd < 0) {
+                if (errno == EMFILE)
+                        return EMPTY;
+                error(psh, "%d: %s", from, strerror(errno));
+        }
+        return newfd;
+}
+

trunk/src/kash/redir.h

@@ -46 +46 @@
 void clearredir(struct shinstance *, int);
 int copyfd(struct shinstance *, int, int);
+int movefd(struct shinstance *, int, int);
+int movefd_above(struct shinstance *, int, int);
 

trunk/src/kash/shfile.c

@@ -65 +65 @@
 # define SHFILE_IN_USE
 #endif
+# define SHFILE_IN_USE
 /** The max file table size. */
 #define SHFILE_MAX          1024
@@ -176 +177 @@
 
 /**
+ * Grows the descriptor table, making sure that it can hold @a fdMin,
+ *
+ * @returns The max(fdMin, fdFirstNew) on success, -1 on failure.
+ * @param   pfdtab      The table to grow.
+ * @param   fdMin       Grow to include this index.
+ */
+static int shfile_grow_tab_locked(shfdtab *pfdtab, int fdMin)
+{
+    /*
+     * Grow the descriptor table.
+     */
+    int         fdRet = -1;
+    shfile     *new_tab;
+    int         new_size = pfdtab->size + SHFILE_GROW;
+    while (new_size < fdMin)
+        new_size += SHFILE_GROW;
+    new_tab = sh_realloc(shthread_get_shell(), pfdtab->tab, new_size * sizeof(shfile));
+    if (new_tab)
+    {
+        int     i;
+        for (i = pfdtab->size; i < new_size; i++)
+        {
+            new_tab[i].fd = -1;
+            new_tab[i].oflags = 0;
+            new_tab[i].shflags = 0;
+            new_tab[i].native = -1;
+        }
+
+        fdRet = pfdtab->size;
+        if (fdRet < fdMin)
+            fdRet = fdMin;
+
+        pfdtab->tab = new_tab;
+        pfdtab->size = new_size;
+    }
+
+    return fdRet;
+}
+
+/**
  * Inserts the file into the descriptor table.
  *
@@ -219 +260 @@
      */
     fd = -1;
-    for (i = 0; (unsigned)i < pfdtab->size; i++)
-        if (    i >= fdMin
-            &&  pfdtab->tab[i].fd == -1)
+    for (i = fdMin >= 0 ? fdMin : 0; (unsigned)i < pfdtab->size; i++)
+        if (pfdtab->tab[i].fd == -1)
         {
             fd = i;
@@ -227 +267 @@
         }
     if (fd == -1)
-    {
-        /*
-         * Grow the descriptor table.
-         */
-        shfile     *new_tab;
-        int         new_size = pfdtab->size + SHFILE_GROW;
-        while (new_size < fdMin)
-            new_size += SHFILE_GROW;
-        new_tab = sh_realloc(shthread_get_shell(), pfdtab->tab, new_size * sizeof(shfile));
-        if (new_tab)
-        {
-            for (i = pfdtab->size; i < new_size; i++)
-            {
-                new_tab[i].fd = -1;
-                new_tab[i].oflags = 0;
-                new_tab[i].shflags = 0;
-                new_tab[i].native = -1;
-            }
-
-            fd = pfdtab->size;
-            if (fd < fdMin)
-                fd = fdMin;
-
-            pfdtab->tab = new_tab;
-            pfdtab->size = new_size;
-        }
-    }
+        fd = shfile_grow_tab_locked(pfdtab, fdMin);
 
     /*
@@ -1134 +1148 @@
 
 /**
+ * Move the file descriptor, closing any existing descriptor at @a fdto.
+ *
+ * @returns fdto on success, -1 and errno on failure.
+ * @param   pfdtab          The file descriptor table.
+ * @param   fdfrom          The descriptor to move.
+ * @param   fdto            Where to move it.
+ */
+int shfile_movefd(shfdtab *pfdtab, int fdfrom, int fdto)
+{
+#ifdef SHFILE_IN_USE
+    int         rc;
+    shmtxtmp    tmp;
+    shfile     *file = shfile_get(pfdtab, fdfrom, &tmp);
+    if (file)
+    {
+        /* prepare the new entry */
+        if (fdto >= (int)pfdtab->size)
+            shfile_grow_tab_locked(pfdtab, fdto);
+        if (fdto < (int)pfdtab->size)
+        {
+            if (pfdtab->tab[fdto].fd != -1)
+                shfile_native_close(pfdtab->tab[fdto].native, pfdtab->tab[fdto].oflags);
+
+            /* setup the target. */
+            pfdtab->tab[fdto].fd      = fdto;
+            pfdtab->tab[fdto].oflags  = file->oflags;
+            pfdtab->tab[fdto].shflags = file->shflags;
+            pfdtab->tab[fdto].native  = file->native;
+
+            /* close the source. */
+            file->fd        = -1;
+            file->oflags    = 0;
+            file->shflags   = 0;
+            file->native    = -1;
+
+            rc = fdto;
+        }
+        else
+        {
+            errno = EMFILE;
+            rc = -1;
+        }
+
+        shfile_put(pfdtab, file, &tmp);
+    }
+    else
+        rc = -1;
+    return rc;
+
+#else
+    return dup2(fdfrom, fdto);
+#endif
+}
+
+/**
+ * Move the file descriptor to somewhere at @a fdMin or above.
+ *
+ * @returns the new file descriptor success, -1 and errno on failure.
+ * @param   pfdtab          The file descriptor table.
+ * @param   fdfrom          The descriptor to move.
+ * @param   fdMin           The minimum descriptor.
+ */
+int shfile_movefd_above(shfdtab *pfdtab, int fdfrom, int fdMin)
+{
+#ifdef SHFILE_IN_USE
+    int         fdto;
+    shmtxtmp    tmp;
+    shfile     *file = shfile_get(pfdtab, fdfrom, &tmp);
+    if (file)
+    {
+        /* find a new place */
+        int i;
+        fdto = -1;
+        for (i = fdMin; (unsigned)i < pfdtab->size; i++)
+            if (pfdtab->tab[i].fd == -1)
+            {
+                fdto = i;
+                break;
+            }
+        if (fdto == -1)
+            fdto = shfile_grow_tab_locked(pfdtab, fdMin);
+        if (fdto != -1)
+        {
+            /* setup the target. */
+            pfdtab->tab[fdto].fd      = fdto;
+            pfdtab->tab[fdto].oflags  = file->oflags;
+            pfdtab->tab[fdto].shflags = file->shflags;
+            pfdtab->tab[fdto].native  = file->native;
+
+            /* close the source. */
+            file->fd        = -1;
+            file->oflags    = 0;
+            file->shflags   = 0;
+            file->native    = -1;
+        }
+        else
+        {
+            errno = EMFILE;
+            fdto = -1;
+        }
+
+        shfile_put(pfdtab, file, &tmp);
+    }
+    else
+        fdto = -1;
+    return fdto;
+
+#else
+    int fdnew = fcntl(fdfrom, F_DUPFD, fdMin);
+    if (fdnew >= 0)
+        close(fdfrom);
+    return fdnew;
+#endif
+}
+
+/**
  * close().
  */
@@ -1158 +1288 @@
 
 #else
-    fsync(fd);
-    {
-        struct stat s;
-        fstat(fd, &s);
-        TRACE2((NULL, "shfile_close(%d) - %lu bytes\n", fd, (long)s.st_size));
-    }
     rc = close(fd);
 #endif
@@ -1430 +1554 @@
 int shfile_chdir(shfdtab *pfdtab, const char *path)
 {
-    shinstance *psh = shthread_get_shell();
     int         rc;
 #ifdef SHFILE_IN_USE
+    shinstance *psh = shthread_get_shell();
     char        abspath[SHFILE_MAX_PATH];
 
@@ -1459 +1583 @@
 #endif
 
-    TRACE2((psh, "shfile_chdir(,%s) -> %d [%d]\n", path, rc, errno));
+    TRACE2((NULL, "shfile_chdir(,%s) -> %d [%d]\n", path, rc, errno));
     return rc;
 }

trunk/src/kash/shfile.h

@@ -142 +142 @@
 int shfile_fcntl(shfdtab *, int fd, int cmd, int arg);
 int shfile_dup(shfdtab *, int fd);
+int shfile_movefd(shfdtab *, int fdfrom, int fdto);
+int shfile_movefd_above(shfdtab *, int fdfrom, int fdmin);
 
 int shfile_stat(shfdtab *, const char *, struct stat *);