Changeset 3140 for trunk/src/kmk/incdep.c

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• incdep.c (modified) (42 diffs)

trunk/src/kmk/incdep.c

@@ -38 +38 @@
 #endif
 
-#include "make.h"
+#include "makeint.h"
 
 #if !defined(WINDOWS32) && !defined(__OS2__)
@@ -48 +48 @@
 #include <glob.h>
 
+#include "filedef.h"
 #include "dep.h"
-#include "filedef.h"
 #include "job.h"
 #include "commands.h"
@@ -108 +108 @@
     int recursive;
     struct variable_set *set;
-    const struct floc *flocp;               /* NILF */
+    const floc *flocp;                      /* NILF */
 };
 
@@ -115 +115 @@
     struct incdep_variable_def *next;
     /* the parameters */
-    const struct floc *flocp;               /* NILF */
+    const floc *flocp;                      /* NILF */
     struct strcache2_entry *name_entry;     /* dep strcache - WRONG */
     char *value;                            /* xmalloc'ed, free it */
@@ -131 +131 @@
     struct strcache2_entry *filename_entry; /* dep strcache; converted to a nameseq record. */
     struct dep *deps;                       /* All the names are dep strcache entries. */
-    const struct floc *flocp;               /* NILF */
+    const floc *flocp;                     /* NILF */
 };
 
@@ -238 +238 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static void incdep_flush_it (struct floc *);
-static void eval_include_dep_file (struct incdep *, struct floc *);
+static void incdep_flush_it (floc *);
+static void eval_include_dep_file (struct incdep *, floc *);
 static void incdep_commit_recorded_file (const char *filename, struct dep *deps,
-                                         const struct floc *flocp);
+                                         const floc *flocp);
 
 
@@ -496 +496 @@
 /* Reads a dep file into memory. */
 static int
-incdep_read_file (struct incdep *cur, struct floc *f)
+incdep_read_file (struct incdep *cur, floc *f)
 {
 #ifdef INCDEP_USE_KFSCACHE
@@ -513 +513 @@
       incdep_xfree (cur, cur->file_base);
     }
-  error (f, "%s/%s: error reading file", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName);
+  OSS (error, f, "%s/%s: error reading file", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName);
 
 #else /* !INCDEP_USE_KFSCACHE */
@@ -520 +520 @@
 
   errno = 0;
-#ifdef O_BINARY
+# ifdef O_BINARY
   fd = open (cur->name, O_RDONLY | O_BINARY, 0);
-#else
+# else
   fd = open (cur->name, O_RDONLY, 0);
-#endif
+# endif
   if (fd < 0)
     {
@@ -531 +531 @@
       if (err == ENOENT || stat (cur->name, &st) != 0)
         return 1;
-      error (f, "%s: %s", cur->name, strerror (err));
+      OSS (error, f, "%s: %s", cur->name, strerror (err));
       return -1;
     }
-#ifdef KBUILD_OS_WINDOWS /* fewer kernel calls */
+# ifdef KBUILD_OS_WINDOWS /* fewer kernel calls */
   if (!birdStatOnFdJustSize (fd, &st.st_size))
-#else
+# else
   if (!fstat (fd, &st))
-#endif
+# endif
     {
       cur->file_base = incdep_xmalloc (cur, st.st_size + 1);
@@ -673 +673 @@
   if (getenv ("KMK_THREADS_DISABLED"))
     {
-      message (1, "Threads disabled (environment)");
+      O (message, 1, "Threads disabled (environment)");
       return 0;
     }
@@ -694 +694 @@
    || getenv ("FAKEROOT_DB_SEARCH_PATHS"))
     {
-      message (1, "Threads disabled (fakeroot)");
+      O (message, 1, "Threads disabled (fakeroot)");
       return 0;
     }
@@ -702 +702 @@
   if (getenv ("LD_PRELOAD"))
     {
-      message (1, "Threads disabled (LD_PRELOAD)");
+      O (message, 1, "Threads disabled (LD_PRELOAD)");
       return 0;
     }
@@ -723 +723 @@
 /* Creates the the worker threads. */
 static void
-incdep_init (struct floc *f)
+incdep_init (floc *f)
 {
   unsigned i;
@@ -754 +754 @@
   rc = pthread_mutex_init (&incdep_mtx, NULL);
   if (rc)
-    fatal (f, _("pthread_mutex_init failed: err=%d"), rc);
+    ON (fatal, f, _("pthread_mutex_init failed: err=%d"), rc);
   rc = pthread_cond_init (&incdep_cond_todo, NULL);
   if (rc)
-    fatal (f, _("pthread_cond_init failed: err=%d"), rc);
+    ON (fatal, f, _("pthread_cond_init failed: err=%d"), rc);
   rc = pthread_cond_init (&incdep_cond_done, NULL);
   if (rc)
-    fatal (f, _("pthread_cond_init failed: err=%d"), rc);
+    ON (fatal, f, _("pthread_cond_init failed: err=%d"), rc);
 
 #elif defined (WINDOWS32)
@@ -766 +766 @@
   incdep_hev_todo = CreateEvent (NULL, TRUE /*bManualReset*/, FALSE /*bInitialState*/, NULL);
   if (!incdep_hev_todo)
-    fatal (f, _("CreateEvent failed: err=%d"), GetLastError());
+    ON (fatal, f, _("CreateEvent failed: err=%d"), GetLastError());
   incdep_hev_done = CreateEvent (NULL, TRUE /*bManualReset*/, FALSE /*bInitialState*/, NULL);
   if (!incdep_hev_done)
-    fatal (f, _("CreateEvent failed: err=%d"), GetLastError());
+    ON (fatal, f, _("CreateEvent failed: err=%d"), GetLastError());
   incdep_hev_todo_waiters = 0;
   incdep_hev_done_waiters = 0;
@@ -777 +777 @@
   rc = DosCreateEventSem (NULL, &incdep_hev_todo, 0, FALSE);
   if (rc)
-    fatal (f, _("DosCreateEventSem failed: rc=%d"), rc);
+    ON (fatal, f, _("DosCreateEventSem failed: rc=%d"), rc);
   rc = DosCreateEventSem (NULL, &incdep_hev_done, 0, FALSE);
   if (rc)
-    fatal (f, _("DosCreateEventSem failed: rc=%d"), rc);
+    ON (fatal, f, _("DosCreateEventSem failed: rc=%d"), rc);
   incdep_hev_todo_waiters = 0;
   incdep_hev_done_waiters = 0;
@@ -827 +827 @@
           rc = pthread_attr_init (&attr);
           if (rc)
-            fatal (f, _("pthread_attr_init failed: err=%d"), rc);
+            ON (fatal, f, _("pthread_attr_init failed: err=%d"), rc);
           /*rc = pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE); */
           rc = pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
           if (rc)
-            fatal (f, _("pthread_attr_setdetachstate failed: err=%d"), rc);
+            ON (fatal, f, _("pthread_attr_setdetachstate failed: err=%d"), rc);
           rc = pthread_create (&incdep_threads[i], &attr,
                                incdep_worker_pthread, (void *)(size_t)i);
           if (rc)
-            fatal (f, _("pthread_mutex_init failed: err=%d"), rc);
+            ON (fatal, f, _("pthread_mutex_init failed: err=%d"), rc);
           pthread_attr_destroy (&attr);
 
@@ -843 +843 @@
                                     (void *)i, 0, &tid);
           if (hThread == 0 || hThread == ~(uintptr_t)0)
-            fatal (f, _("_beginthreadex failed: err=%d"), errno);
+            ON (fatal, f, _("_beginthreadex failed: err=%d"), errno);
           incdep_threads[i] = (HANDLE)hThread;
 
@@ -849 +849 @@
           tid = _beginthread (incdep_worker_os2, NULL, 128*1024, (void *)i);
           if (tid <= 0)
-            fatal (f, _("_beginthread failed: err=%d"), errno);
+            ON (fatal, f, _("_beginthread failed: err=%d"), errno);
           incdep_threads[i] = tid;
 #endif
@@ -927 +927 @@
   if (cur->err_msg)
 #ifdef INCDEP_USE_KFSCACHE
-    error(NILF, "%s/%s(%d): %s", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName, cur->err_line_no, cur->err_msg);
+    OSSNS (error, NILF, "%s/%s(%d): %s", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName,
+           cur->err_line_no, cur->err_msg);
 #else
-    error(NILF, "%s(%d): %s", cur->name, cur->err_line_no, cur->err_msg);
+    OSNS (error,NILF, "%s(%d): %s", cur->name, cur->err_line_no, cur->err_msg);
 #endif
 
@@ -1008 +1009 @@
   if (cur->worker_tid == -1)
 #ifdef INCDEP_USE_KFSCACHE
-    error (NILF, "%s/%s(%d): %s", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName, line_no, msg);
+    OSSNS (error,NILF, "%s/%s(%d): %s", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName, line_no, msg);
 #else
-    error (NILF, "%s(%d): %s", cur->name, line_no, msg);
+    OSNS (error, NILF, "%s(%d): %s", cur->name, line_no, msg);
 #endif
 #ifdef PARSE_IN_WORKER
@@ -1079 +1080 @@
                                int recursive,
                                struct variable_set *set,
-                               const struct floc *flocp)
+                               const floc *flocp)
 {
   assert (!duplicate_value);
@@ -1112 +1113 @@
 static void
 incdep_record_variable_def (struct incdep *cur,
-                            const struct floc *flocp,
+                            const floc *flocp,
                             const char *name,
                             unsigned int name_length,
@@ -1152 +1153 @@
 static void
 incdep_commit_recorded_file (const char *filename, struct dep *deps,
-                             const struct floc *flocp)
+                             const floc *flocp)
 {
   struct file *f;
@@ -1174 +1175 @@
      )
     {
-      error (flocp, _("reserved filename '%s' used in dependency file, ignored"), filename);
+      OS (error, flocp, _("reserved filename '%s' used in dependency file, ignored"), filename);
       return;
     }
@@ -1182 +1183 @@
   if (f->double_colon)
     {
-      error (flocp, _("dependency file '%s' has a double colon entry already, ignoring"), filename);
+      OS (error, flocp, _("dependency file '%s' has a double colon entry already, ignoring"), filename);
       return;
     }
@@ -1208 +1209 @@
                     const char *filename,
                     struct dep *deps,
-                    const struct floc *flocp)
+                    const floc *flocp)
 {
   if (cur->worker_tid == -1)
@@ -1253 +1254 @@
    */
 static void
-eval_include_dep_file (struct incdep *curdep, struct floc *f)
+eval_include_dep_file (struct incdep *curdep, floc *f)
 {
   unsigned line_no = 1;
@@ -1268 +1269 @@
     {
       /* skip empty lines */
-      while (cur < file_end && isspace ((unsigned char)*cur) && *cur != '\n')
+      while (cur < file_end && ISSPACE (*cur) && *cur != '\n')
         ++cur;
       if (cur >= file_end)
@@ -1312 +1313 @@
           /* extract the variable name. */
           cur += 7;
-          while (isblank ((unsigned char)*cur))
+          while (ISBLANK (*cur))
             ++cur;
           value_start = endp = memchr (cur, '\n', file_end - cur);
           if (!endp)
               endp = cur;
-          while (endp > cur && isspace ((unsigned char)endp[-1]))
+          while (endp > cur && ISSPACE (endp[-1]))
             --endp;
           var_len = endp - cur;
@@ -1337 +1338 @@
                 {
                   endp = cur + 5;
-                  while (endp < file_end && isspace ((unsigned char)*endp) && *endp != '\n')
+                  while (endp < file_end && ISSPACE (*endp) && *endp != '\n')
                     endp++;
                   if (endp >= file_end || *endp == '\n')
@@ -1448 +1449 @@
               /* extract the variable name. */
               endp = flavor == f_recursive ? equalp : equalp - 1;
-              while (endp > cur && isblank ((unsigned char)endp[-1]))
+              while (endp > cur && ISBLANK (endp[-1]))
                 --endp;
               var_len = endp - cur;
@@ -1467 +1468 @@
               /* find the start of the value. */
               cur = equalp + 1;
-              while (cur < file_end && isblank ((unsigned char)*cur))
+              while (cur < file_end && ISBLANK (*cur))
                 cur++;
               value_start = cur;
@@ -1629 +1630 @@
               /* Extract the first filename after trimming and basic checks. */
               fnend = colonp;
-              while ((uintptr_t)fnend > (uintptr_t)cur && isblank ((unsigned char)fnend[-1]))
+              while ((uintptr_t)fnend > (uintptr_t)cur && ISBLANK (fnend[-1]))
                 --fnend;
               if (cur == fnend)
@@ -1643 +1644 @@
 
               fnnext = cur;
-              while (fnnext != fnend && !isblank ((unsigned char)*fnnext))
+              while (fnnext != fnend && !ISBLANK (*fnnext))
                 fnnext++;
               filename = incdep_dep_strcache (curdep, cur, fnnext - cur);
@@ -1652 +1653 @@
                 {
                   /* skip blanks and count lines. */
-                  while (cur < file_end && isspace ((unsigned char)*cur) && *cur != '\n')
+                  while (cur < file_end && ISSPACE (*cur) && *cur != '\n')
                     ++cur;
                   if (cur >= file_end)
@@ -1679 +1680 @@
                   /* find the end of the filename */
                   endp = cur;
-                  while (endp < file_end && !isspace ((unsigned char)*endp))
+                  while (endp < file_end && !ISSPACE (*endp))
                     ++endp;
 
@@ -1700 +1701 @@
                     const char *filename_prev = filename;
                     const char *fnstart;
-                    while (fnnext != fnend && isblank ((unsigned char)*fnnext))
+                    while (fnnext != fnend && ISBLANK (*fnnext))
                       fnnext++;
                     if (fnnext == fnend)
@@ -1706 +1707 @@
 
                     fnstart = fnnext;
-                    while (fnnext != fnend && !isblank ((unsigned char)*fnnext))
+                    while (fnnext != fnend && !ISBLANK (*fnnext))
                       fnnext++;
 
@@ -1724 +1725 @@
 /* Flushes the incdep todo and done lists. */
 static void
-incdep_flush_it (struct floc *f)
+incdep_flush_it (floc *f)
 {
   incdep_lock ();
@@ -1785 +1786 @@
    employing threads to try speed up the file reading. */
 void
-eval_include_dep (const char *names, struct floc *f, enum incdep_op op)
+eval_include_dep (const char *names, floc *f, enum incdep_op op)
 {
   struct incdep *head = 0;