Changeset 1918 in kBuild for trunk/src

Timestamp:

Oct 23, 2008 9:27:11 PM (17 years ago)

Author:

bird

Message:

kmk: New switch --print-stats which will print variable, file, strcache, allocation and heap statistics.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• file.c (modified) (1 diff)
• main.c (modified) (6 diffs)
• make.h (modified) (1 diff)
• misc.c (modified) (2 diffs)
• variable.c (modified) (1 diff)

trunk/src/kmk/Makefile.am

@@ -138 +138 @@
         -DCONFIG_WITH_COMMANDS_FUNC \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
+        -DCONFIG_WITH_PRINT_STATS_SWITCH \
         \
         -DKBUILD_HOST=\"$(BUILD_TARGET)\" \

trunk/src/kmk/Makefile.kmk

@@ -168 +168 @@
         CONFIG_WITH_COMMANDS_FUNC \
         CONFIG_PRETTY_COMMAND_PRINTING \
+        CONFIG_WITH_PRINT_STATS_SWITCH \
         \
         KBUILD_HOST=\"$(KBUILD_TARGET)\" \

trunk/src/kmk/file.c

@@ -1259 +1259 @@
 }
 
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+void
+print_file_stats (void)
+{
+  fputs (_("\n# files hash-table stats:\n# "), stdout);
+  hash_print_stats (&files, stdout);
+  fputs ("\n", stdout);
+}
+#endif
+
 
 /* Verify the integrity of the data base of files.  */

trunk/src/kmk/main.c

@@ -83 +83 @@
 void verify_file_data_base (void);
 
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+void print_variable_stats (void);
+void print_file_stats (void);
+#endif
+
 #if defined HAVE_WAITPID || defined HAVE_WAIT3
 # define HAVE_WAIT_NOHANG
@@ -172 +177 @@
 
 int pretty_command_printing;
+#endif
+
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+/* Nonzero means to print internal statistics before exiting. */
+
+int print_stats_flag;
 #endif
 
@@ -476 +487 @@
        "pretty-command-printing" },
 #endif
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+    { CHAR_MAX+11, flag, (char *) &print_stats_flag, 1, 1, 1, 0, 0,
+       "print-stats" },
+#endif
 #ifdef KMK
-    { CHAR_MAX+11, positive_int, (char *) &process_priority, 1, 1, 0,
+    { CHAR_MAX+12, positive_int, (char *) &process_priority, 1, 1, 0,
       (char *) &process_priority, (char *) &process_priority, "priority" },
-    { CHAR_MAX+12, positive_int, (char *) &process_affinity, 1, 1, 0,
+    { CHAR_MAX+14, positive_int, (char *) &process_affinity, 1, 1, 0,
       (char *) &process_affinity, (char *) &process_affinity, "affinity" },
 #endif
@@ -490 +505 @@
       "no-keep-going" },
 #if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)
-    { CHAR_MAX+14, flag, (char *) &make_expensive_statistics, 1, 1, 1, 0, 0,
+    { CHAR_MAX+15, flag, (char *) &make_expensive_statistics, 1, 1, 1, 0, 0,
        "statistics" },
 #endif
@@ -3653 +3668 @@
   printf (_("\n# Finished Make data base on %s\n"), ctime (&when));
 }
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+
+static void
+print_stats ()
+{
+  time_t when;
+
+  when = time ((time_t *) 0);
+  printf (_("\n# Make statistics, printed on %s"), ctime (&when));
+
+  print_variable_stats ();
+  print_file_stats ();
+# ifndef CONFIG_WITH_STRCACHE2
+  strcache_print_stats ("#");
+# else
+  strcache2_print_stats_all ("#");
+# endif
+# ifdef CONFIG_WITH_ALLOC_CACHES
+  alloccache_print_all ();
+# endif
+  print_heap_stats ();
+
+  when = time ((time_t *) 0);
+  printf (_("\n# Finished Make statistics on %s\n"), ctime (&when));
+}
+#endif
 
 static void
@@ -3734 +3775 @@
       if (print_data_base_flag)
         print_data_base ();
+
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+      if (print_stats_flag)
+        print_stats ();
+#endif
 
 #ifdef NDEBUG /* bird: Don't waste time on debug sanity checks.  */

trunk/src/kmk/make.h

@@ -433 +433 @@
 void *xrealloc (void *, unsigned int);
 char *xstrdup (const char *);
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+void print_heap_stats (void);
+#endif
 char *find_next_token (const char **, unsigned int *);
 char *next_token (const char *);

trunk/src/kmk/misc.c

@@ -22 +22 @@
 #ifdef CONFIG_WITH_VALUE_LENGTH
 # include <assert.h>
+#endif
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+# ifdef __APPLE__
+#  include <malloc/malloc.h>
+# endif
 #endif
 
@@ -1326 +1331 @@
 
 #endif /* CONFIG_WITH_ALLOC_CACHES */
+
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+/* Print heap statistics if supported by the platform. */
+void print_heap_stats (void)
+{
+  /* Darwin / Mac OS X */
+# ifdef __APPLE__
+  malloc_statistics_t s;
+
+  malloc_zone_statistics (NULL, &s);
+  printf (_("\n# CRT Heap: %zu bytes in use, in %u block, avg %zu bytes/block\n"),
+          s.size_in_use, s.blocks_in_use, s.size_in_use / s.blocks_in_use);
+  printf (_("#           %zu bytes max in use (high water mark)\n"),
+          s.max_size_in_use);
+  printf (_("#           %zu bytes reserved,  %zu bytes free (estimate)\n"),
+          s.size_allocated, s.size_allocated - s.size_in_use);
+# endif /* __APPLE__ */
+
+  /* Darwin Libc sources indicates that something like this may be
+     found in GLIBC, however, it's not in any current one...  */
+# if 0 /* ??? */
+  struct mstats m;
+
+  m = mstats();
+  printf (_("\n# CRT Heap: %zu blocks / %zu bytes in use,  %zu blocks / %zu bytes free\n"),
+          m.chunks_used, m.bytes_used, m.chunks_free, m.bytes_free);
+  printf (_("#           %zu bytes reserved\n"),
+          m.bytes_total);
+# endif /* ??? */
+
+   /* XVID2/XPG mallinfo (displayed per GLIBC documentation).  */
+# if 0 && defined(__GLIBC__) /* XXX: finish on linux, check older glibc versions. */
+  struct mallinfo m;
+
+  m = mallinfo();
+  printf (_("\n# CRT Heap: %d bytes in use,  %d bytes free\n"),
+          m.uordblks, s.fordblks);
+
+  printf (_("#           # free chunks=%d,  # fastbin blocks=%d\n"),
+          m.ordblks, m.smblks);
+  printf (_("#           # mapped regions=%d,  space in mapped regions=%d\n"),
+          m.hblks, m.hblkhd);
+  printf (_("#           non-mapped space allocated from system=%d\n"),
+          m.arena);
+  printf (_("#           maximum total allocated space=%d\n"),
+          m.usmblks);
+  printf (_("#           top-most releasable space=%d\n"),
+          m.keepcost);
+# endif /* __GLIBC__ */
+
+  /* XXX: windows */
+}
+#endif /* CONFIG_WITH_PRINT_STATS_SWITCH */
+

trunk/src/kmk/variable.c

@@ -2293 +2293 @@
 }
 
+#ifdef CONFIG_WITH_PRINT_STATS_SWITCH
+void
+print_variable_stats (void)
+{
+  fputs (_("\n# Global variable hash-table stats:\n# "), stdout);
+  hash_print_stats (&global_variable_set.table, stdout);
+  fputs ("\n", stdout);
+}
+#endif
 
 /* Print all the local variables of FILE.  */