Changeset 3005 for trunk/src/lib/nt/fts-nt.c

Timestamp:

Nov 6, 2016, 1:07:37 AM (9 years ago)

Author:

bird

Message:

fts-nt.c: Wide char support, part 4.

File:

• trunk/src/lib/nt/fts-nt.c (modified) (14 diffs)

trunk/src/lib/nt/fts-nt.c

@@ -118 +118 @@
 #define MAX(a, b)  ( (a) >= (b) ? (a) : (b) )
 
+/** Enables BirdDir_T reuse. (Saves malloc and free calls.) */
+#define FTS_WITH_DIRHANDLE_REUSE
+/** Enables allocation statistics. */
+//#define FTS_WITH_STATISTICS
+/** Enables FTSENT allocation cache. */
 #define FTS_WITH_ALLOC_CACHE
 /** Number of size buckets for the FTSENT allocation cache. */
-#define FTS_NUM_FREE_BUCKETS    64
+#define FTS_NUM_FREE_BUCKETS    64
 /** Shift for converting size to free bucket index. */
 #define FTS_FREE_BUCKET_SHIFT   4
 /** The FTSENT allocation alignment. */
-#define FTS_ALIGN_FTSENT        (1U << FTS_FREE_BUCKET_SHIFT)
-/** Enables allocation statistics. */
-//#define FTS_WITH_STATISTICS
+#define FTS_ALIGN_FTSENT        (1U << FTS_FREE_BUCKET_SHIFT)
 
 /*
@@ -135 +138 @@
 struct _fts_private {
         FTS             ftsp_fts;
+#ifdef FTS_WITH_DIRHANDLE_REUSE
+        /** Statically allocate directory handle. */
+        BirdDir_T       dirhandle;
+#endif
 #ifdef FTS_WITH_ALLOC_CACHE
         /** Number of free entries in the above buckets. */
@@ -403 +410 @@
 #endif
         nt_fts_free_alloc_cache(sp);
+#ifdef FTS_WITH_DIRHANDLE_REUSE
+        birdDirClose(&((struct _fts_private *)sp)->dirhandle);
+#endif
 
         /* Free up the stream pointer. */
@@ -461 +471 @@
         wchar_t *pwc;
 
-        /* If finished or unrecoverable error, return NULL. */
-        if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-                return (NULL);
-
         /* Set current node pointer. */
         p = sp->fts_cur;
+
+        /* If finished or unrecoverable error, return NULL. */
+        if (p != NULL && !ISSET(FTS_STOP)) {
+                /* likely */
+        } else {
+                return (NULL);
+        }
 
         /* Save and zero out user instructions. */
@@ -473 +486 @@
 
         /* Any type of file may be re-visited; re-stat and re-turn. */
-        if (instr == FTS_AGAIN) {
+        if (instr != FTS_AGAIN) {
+                /* likely */
+        } else {
                 p->fts_info = fts_stat(sp, p, 0, INVALID_HANDLE_VALUE);
                 return (p);
@@ -487 +502 @@
          *     here in case a API client checks it.
          */
-        if (instr == FTS_FOLLOW &&
-            (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
+        if (   instr != FTS_FOLLOW
+            || (p->fts_info != FTS_SL && p->fts_info != FTS_SLNONE)) {
+            /* likely */
+        } else {
                 p->fts_info = fts_stat(sp, p, 1, INVALID_HANDLE_VALUE);
                 if (p->fts_info == FTS_D /*&& !ISSET(FTS_NOCHDIR)*/) {
@@ -499 +516 @@
         if (p->fts_info == FTS_D) {
                 /* If skipped or crossed mount point, do post-order visit. */
-                if (instr == FTS_SKIP ||
-                    (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
+                if (  instr == FTS_SKIP
+                    || (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
                         if (sp->fts_child) {
                                 fts_lfree(sp->fts_child);
@@ -528 +545 @@
                  * FTS_STOP or the fts_info field of the node.
                  */
-                if (sp->fts_child != NULL) {
-                        /* nothing to do */
-                } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-                        if (ISSET(FTS_STOP))
-                                return (NULL);
-                        return (p);
-                }
-                p = sp->fts_child;
-                sp->fts_child = NULL;
+                if (sp->fts_child == NULL) {
+                        p = fts_build(sp, BREAD);
+                        if (p != NULL) {
+                            /* likely */
+                        } else {
+                            if (ISSET(FTS_STOP))
+                                    return (NULL);
+                            return sp->fts_cur;
+                        }
+
+                } else {
+                        p = sp->fts_child;
+                        sp->fts_child = NULL;
+                }
                 goto name;
         }
@@ -547 +569 @@
                  * the root of the tree), and load the paths for the next root.
                  */
-                if (p->fts_level == FTS_ROOTLEVEL) {
+                if (p->fts_level != FTS_ROOTLEVEL) {
+                        /* likely */
+                } else {
                         fts_free_entry(sp, tmp);
                         fts_load(sp, p);
@@ -558 +582 @@
                  * get back if necessary.
                  */
-                if (p->fts_instr == FTS_SKIP) {
+                if (p->fts_instr != FTS_SKIP) {
+                        /* likely */
+                } else {
                         fts_free_entry(sp, tmp);
                         goto next;
                 }
-                if (p->fts_instr == FTS_FOLLOW) {
+                if (p->fts_instr != FTS_FOLLOW) {
+                        /* likely */
+                } else {
                         p->fts_info = fts_stat(sp, p, 1, INVALID_HANDLE_VALUE);
                         /* NT: See above regarding fts_flags. */
@@ -588 +616 @@
         p = tmp->fts_parent;
 
-        if (p->fts_level == FTS_ROOTPARENTLEVEL) {
+        if (p->fts_level != FTS_ROOTPARENTLEVEL) {
+                /* likely */
+        } else {
                 /*
                  * Done; free everything up and set errno to 0 so the user
@@ -787 +817 @@
                 fDirOpenFlags |= BIRDDIR_F_RESTART_SCAN;
         }
+#ifdef FTS_WITH_DIRHANDLE_REUSE
+        dirp = birdDirOpenFromHandleWithReuse(&((struct _fts_private *)sp)->dirhandle, cur->fts_dirfd, NULL, 
+                                              fDirOpenFlags | BIRDDIR_F_STATIC_ALLOC);
+#else
         dirp = birdDirOpenFromHandle(cur->fts_dirfd, NULL, fDirOpenFlags);
+#endif
         if (dirp == NULL) {
 l_open_err:
@@ -856 +891 @@
                                         free(p);
                                 fts_lfree(head);
+#ifndef FTS_WITH_DIRHANDLE_REUSE
                                 birdDirClose(dirp);
+#endif
                                 birdCloseFile(cur->fts_dirfd);
                                 cur->fts_dirfd = INVALID_HANDLE_VALUE;
@@ -887 +924 @@
         }
 
+#ifndef FTS_WITH_DIRHANDLE_REUSE
         birdDirClose(dirp);
+#endif
 
         /*