[BACK]Return to stats.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/stats.c between version 1.10 and 1.11

version 1.10, 2010/07/19 19:46:44 version 1.11, 2014/04/22 12:21:17
Line 58 
Line 58 
 static float  static float
 average_runs(unsigned long val)  average_runs(unsigned long val)
 {  {
     return (float)val / STAT_INVOCATIONS;          return (float)val / STAT_INVOCATIONS;
 }  }
   
 static void  static void
 print_stats(void)  print_stats(void)
 {  {
     struct rusage ru;          struct rusage ru;
   
     if (getrusage(RUSAGE_SELF, &ru) != -1) {          if (getrusage(RUSAGE_SELF, &ru) != -1) {
         STAT_USER_SECONDS += ru.ru_utime.tv_sec;                  STAT_USER_SECONDS += ru.ru_utime.tv_sec;
         STAT_USER_MS += ru.ru_utime.tv_usec;                  STAT_USER_MS += ru.ru_utime.tv_usec;
         if (STAT_USER_MS > 1000000) {                  if (STAT_USER_MS > 1000000) {
             STAT_USER_MS -= 1000000;                          STAT_USER_MS -= 1000000;
             STAT_USER_SECONDS++;                          STAT_USER_SECONDS++;
                   }
                   STAT_SYS_SECONDS += ru.ru_stime.tv_sec;
                   STAT_SYS_MS += ru.ru_stime.tv_usec;
                   if (STAT_SYS_MS > 1000000) {
                           STAT_SYS_MS -= 1000000;
                           STAT_SYS_SECONDS++;
                   }
         }          }
         STAT_SYS_SECONDS += ru.ru_stime.tv_sec;          fprintf(stderr, "Make runs: %lu\n", STAT_INVOCATIONS);
         STAT_SYS_MS += ru.ru_stime.tv_usec;          fprintf(stderr, "Time user: %lu.%06lu, sys %lu.%06lu\n",
         if (STAT_SYS_MS > 1000000) {              STAT_USER_SECONDS, STAT_USER_MS,
             STAT_SYS_MS -= 1000000;              STAT_SYS_SECONDS, STAT_SYS_MS);
             STAT_SYS_SECONDS++;  
         }  
     }  
     fprintf(stderr, "Make runs: %lu\n", STAT_INVOCATIONS);  
     fprintf(stderr, "Time user: %lu.%06lu, sys %lu.%06lu\n",  
         STAT_USER_SECONDS, STAT_USER_MS,  
         STAT_SYS_SECONDS, STAT_SYS_MS);  
 #ifdef STATS_VAR_LOOKUP  #ifdef STATS_VAR_LOOKUP
         /* to get the average total of MAXSIZE, we need this value */          /* to get the average total of MAXSIZE, we need this value */
     STAT_VAR_POWER +=          STAT_VAR_POWER +=
         STAT_VAR_HASH_MAXSIZE * STAT_VAR_HASH_CREATION;              STAT_VAR_HASH_MAXSIZE * STAT_VAR_HASH_CREATION;
     fprintf(stderr, "Var finds: %f, lookups: %f, average: %f, max: %lu\n",          fprintf(stderr, "Var finds: %f, lookups: %f, average: %f, max: %lu\n",
         average_runs(STAT_VAR_FIND),              average_runs(STAT_VAR_FIND),
         average_runs(STAT_VAR_SEARCHES),              average_runs(STAT_VAR_SEARCHES),
         (float)STAT_VAR_COUNT/STAT_VAR_SEARCHES,              (float)STAT_VAR_COUNT/STAT_VAR_SEARCHES,
         STAT_VAR_MAXCOUNT);              STAT_VAR_MAXCOUNT);
     fprintf(stderr, "Average hash: %f, creation: %f, from env %f\n",          fprintf(stderr, "Average hash: %f, creation: %f, from env %f\n",
         average_runs(STAT_VAR_HASH_CREATION),              average_runs(STAT_VAR_HASH_CREATION),
         average_runs(STAT_VAR_CREATION),              average_runs(STAT_VAR_CREATION),
         average_runs(STAT_VAR_FROM_ENV));              average_runs(STAT_VAR_FROM_ENV));
     fprintf(stderr, "Local hash max: %lu, global hash max: %lu, average local: %f\n",          fprintf(stderr, "Local hash max: %lu, global hash max: %lu, average local: %f\n",
         STAT_VAR_HASH_MAXSIZE,              STAT_VAR_HASH_MAXSIZE,
         STAT_VAR_GHASH_MAXSIZE,              STAT_VAR_GHASH_MAXSIZE,
         (float)STAT_VAR_POWER/STAT_VAR_HASH_CREATION);              (float)STAT_VAR_POWER/STAT_VAR_HASH_CREATION);
 #endif  #endif
 #ifdef STATS_GN_CREATION  #ifdef STATS_GN_CREATION
     fprintf(stderr, "Average GN: %f\n", average_runs(STAT_GN_COUNT));          fprintf(stderr, "Average GN: %f\n", average_runs(STAT_GN_COUNT));
 #endif  #endif
 #ifdef STATS_SUFF  #ifdef STATS_SUFF
     fprintf(stderr, "Average Suffix lookup: %f, transforms: %f\n",          fprintf(stderr, "Average Suffix lookup: %f, transforms: %f\n",
         average_runs(STAT_SUFF_LOOKUP_NAME),              average_runs(STAT_SUFF_LOOKUP_NAME),
         average_runs(STAT_TRANSFORM_LOOKUP_NAME));              average_runs(STAT_TRANSFORM_LOOKUP_NAME));
 #endif  #endif
 #ifdef STATS_BUF  #ifdef STATS_BUF
     fprintf(stderr, "Buf tot: %f, def: %f, exp %f, weird %f, bad %f\n",          fprintf(stderr, "Buf tot: %f, def: %f, exp %f, weird %f, bad %f\n",
         average_runs(STAT_TOTAL_BUFS),              average_runs(STAT_TOTAL_BUFS),
         average_runs(STAT_DEFAULT_BUFS),              average_runs(STAT_DEFAULT_BUFS),
         average_runs(STAT_BUFS_EXPANSION),              average_runs(STAT_BUFS_EXPANSION),
         average_runs(STAT_WEIRD_BUFS),              average_runs(STAT_WEIRD_BUFS),
         average_runs(STAT_WEIRD_INEFFICIENT));              average_runs(STAT_WEIRD_INEFFICIENT));
 #endif  #endif
 #ifdef STATS_HASH  #ifdef STATS_HASH
     fprintf(stderr, "Hashes new: %f, exp: %f, lookup %f, l: %f, +: %f, ent : %f\n",          fprintf(stderr, "Hashes new: %f, exp: %f, lookup %f, l: %f, +: %f, ent : %f\n",
         average_runs(STAT_HASH_CREATION),              average_runs(STAT_HASH_CREATION),
         average_runs(STAT_HASH_EXPAND),              average_runs(STAT_HASH_EXPAND),
         average_runs(STAT_HASH_LOOKUP),              average_runs(STAT_HASH_LOOKUP),
         (float)STAT_HASH_LENGTH/STAT_HASH_LOOKUP,              (float)STAT_HASH_LENGTH/STAT_HASH_LOOKUP,
         (float)STAT_HASH_POSITIVE/STAT_HASH_LOOKUP,              (float)STAT_HASH_POSITIVE/STAT_HASH_LOOKUP,
         (float)STAT_HASH_ENTRIES/STAT_HASH_SIZE);              (float)STAT_HASH_ENTRIES/STAT_HASH_SIZE);
 #endif  #endif
 #ifdef STATS_GROW  #ifdef STATS_GROW
     fprintf(stderr, "Grow: %f\n", average_runs(STAT_GROWARRAY));          fprintf(stderr, "Grow: %f\n", average_runs(STAT_GROWARRAY));
 #endif  #endif
     if (mmapped)          if (mmapped)
         munmap(statarray, STAT_NUMBER * sizeof(unsigned long));                  munmap(statarray, STAT_NUMBER * sizeof(unsigned long));
 }  }
   
 void  void
 Init_Stats(void)  Init_Stats(void)
 {  {
     char *name;          char *name;
     int fd;          int fd;
   
         /* try to get ahold of a stats collecting file */          /* try to get ahold of a stats collecting file */
     name = getenv("MAKESTATS");          name = getenv("MAKESTATS");
     if (name) {          if (name) {
         while ((fd = open(name, O_RDWR)) == -1) {                  while ((fd = open(name, O_RDWR)) == -1) {
                 /* if collecting file does not already exist, fill it with                          /* if collecting file does not already exist, fill it with
                  * zeros (so all stats starting values should be 0) */                           * zeros (so all stats starting values should be 0) */
             unsigned long n;                          unsigned long n;
             int i;                          int i;
             FILE *f;                          FILE *f;
   
             f = fopen(name, "w");                          f = fopen(name, "w");
   
             n = 0;                          n = 0;
             for (i = 0; i < STAT_NUMBER; i++)                          for (i = 0; i < STAT_NUMBER; i++)
                 fwrite(&n, sizeof(unsigned long), 1, f);                                  fwrite(&n, sizeof(unsigned long), 1, f);
             fclose(f);                          fclose(f);
         }                  }
   
     /* either we've got the file -> share it across makes */                  /* either we've got the file -> share it across makes */
         if (fd) {                  if (fd) {
             statarray = mmap(0, STAT_NUMBER * sizeof(unsigned long),                          statarray = mmap(0, STAT_NUMBER * sizeof(unsigned long),
                 PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);                              PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
             if (statarray == MAP_FAILED)                          if (statarray == MAP_FAILED)
                 exit(1);                                  exit(1);
             mmapped = true;                          mmapped = true;
         }                  }
     } else          } else
     /* or we don't -> simple stats gathering */                  /* or we don't -> simple stats gathering */
         statarray = ecalloc(STAT_NUMBER, sizeof(unsigned long));                  statarray = ecalloc(STAT_NUMBER, sizeof(unsigned long));
     STAT_INVOCATIONS++;          STAT_INVOCATIONS++;
     atexit(print_stats);          atexit(print_stats);
 }  }
   
 #endif  #endif
   

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11