miscellaneous fixes

Author: calccrypto

CMakeLists.txt

@@ -359,7 +359,7 @@ if (RPMBUILD)
 
   # get the architecture of this machine
   # assumes that we are not cross compiling
-  find_program(UNAME uname)
+  find_program(UNAME uname) # REQUIRED option was not added until 3.18
   if (NOT UNAME)
     message(FATAL_ERROR "uname not found. Cannot build RPMs.")
   endif()

contrib/gendir.c

@@ -265,7 +265,7 @@ int main(int argc, char * argv[]) {
 
     clock_gettime(CLOCK_MONOTONIC, &generation.end);
 
-    const long double gen_time = elapsed(&generation);
+    const long double gen_time = sec(nsec(&generation));
 
     printf("Time Spent Generating: %.2Lfs\n", gen_time);
     printf("Dirs/Sec:              %.2Lf\n",  total_dirs / gen_time);

include/BottomUp.h

@@ -74,11 +74,13 @@ OF SUCH DAMAGE.
 
 #include <pthread.h>
 
-#include "debug.h"
 #include "SinglyLinkedList.h"
+#include "bf.h"
+#include "debug.h"
 
 /* extra AscendFunc_t argments */
 #if defined(DEBUG) && defined(PER_THREAD_STATS)
+    #include "OutputBuffers.h"
     #define timestamp_sig  , struct OutputBuffers *timestamp_buffers
     #define timestamp_args , timestamp_buffers
 #else

include/debug.h

@@ -105,10 +105,10 @@ struct start_end {
 /* nanoseconds since an unspecified epoch */
 uint64_t since_epoch(struct timespec * ts);
 
-/* Get number of seconds between two events recorded in struct timespecs */
-uint64_t elapsed(struct start_end * se);
+/* Get number of nanoseconds between two events recorded in struct timespecs */
+uint64_t nsec(struct start_end * se);
 
-long double sec(uint64_t nsec);
+long double sec(uint64_t ns);
 
 int print_timer(struct OutputBuffers * obufs, const size_t id, char * str, const size_t size, const char * name, struct start_end * se);
 
@@ -166,7 +166,7 @@ int print_timer(struct OutputBuffers * obufs, const size_t id, char * str, const
 #endif /* PER_THREAD_STATS */
 
 #define timestamp_elapsed(name)                             \
-    elapsed(&timestamp_get_name(name))
+    nsec(&timestamp_get_name(name))
 
 #define timestamp_destroy(obs)                              \
     OutputBuffers_flush_to_single(obs, stderr);             \

include/trace.h

@@ -74,10 +74,10 @@ extern "C" {
 #endif
 
 /* write a work struct to a file */
-int worktofile(FILE *file, char *delim, struct work *work);
+int worktofile(FILE *file, const char *delim, struct work *work);
 
 /* convert a formatted string to a work struct */
-int linetowork(char *line, const size_t len, char *delim, struct work *work);
+int linetowork(char *line, const size_t len, const char *delim, struct work *work);
 
 #ifdef __cplusplus
 }

src/BottomUp.c

@@ -78,12 +78,11 @@ processed before processing the current one
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "bf.h"
 #include "BottomUp.h"
-#include "dbutils.h"
-#include "debug.h"
 #include "QueuePerThreadPool.h"
 #include "SinglyLinkedList.h"
+#include "dbutils.h"
+#include "debug.h"
 #include "utils.h"
 
 
@@ -178,7 +177,7 @@ static struct BottomUp *track(const char *name, const size_t name_len,
                               const size_t level) {
     struct BottomUp *copy = malloc(user_struct_size);
 
-    memcpy(copy->name, name, name_len + 1);
+    memcpy(copy->name, name, name_len + 1); /* NULL terminate */
     copy->name_len = name_len;
 
     copy->level = level;
@@ -229,13 +228,19 @@ int descend_to_bottom(struct QPTPool *ctx, const size_t id, void *data, void *ar
             break;
         }
 
-        if ((strncmp(entry->d_name, ".",  2) == 0) ||
-            (strncmp(entry->d_name, "..", 3) == 0)) {
-            continue;
+        const size_t name_len = strlen(entry->d_name);
+        if (name_len < 3) {
+            if ((strncmp(entry->d_name, ".",  1) == 0) ||
+                (strncmp(entry->d_name, "..", 2) == 0)) {
+                continue;
+            }
         }
 
         struct BottomUp new_work;
-        new_work.name_len = SNPRINTF(new_work.name, MAXPATH, "%s/%s", bu->name, entry->d_name);
+        new_work.name_len = SNFORMAT_S(new_work.name, MAXPATH, 3,
+                                       bu->name, bu->name_len,
+                                       "/", (size_t) 1,
+                                       entry->d_name, name_len);
 
         timestamp_start(lstat_entry);
         struct stat st;
@@ -335,9 +340,9 @@ int parallel_bottomup(char **root_names, size_t root_count,
     #endif
 
     struct QPTPool *pool = QPTPool_init(thread_count
-                                         #if defined(DEBUG) && defined(PER_THREAD_STATS)
-                                         , timestamp_buffers
-                                         #endif
+                                        #if defined(DEBUG) && defined(PER_THREAD_STATS)
+                                        , timestamp_buffers
+                                        #endif
     );
 
     if (!pool) {

src/debug.c

@@ -83,14 +83,14 @@ uint64_t since_epoch(struct timespec * ts) {
     return ns;
 }
 
-uint64_t elapsed(struct start_end * se) {
+uint64_t nsec(struct start_end * se) {
     const uint64_t s = (se->start.tv_sec * 1000000000ULL) + se->start.tv_nsec;
     const uint64_t e = (se->end.tv_sec   * 1000000000ULL) + se->end.tv_nsec;
     return e - s;
 }
 
-long double sec(uint64_t nsec) {
-    return ((long double) nsec) / 1e9L;
+long double sec(uint64_t ns) {
+    return ((long double) ns) / 1e9L;
 }
 
 int print_timer(struct OutputBuffers * obufs, const size_t id, char * str, const size_t size, const char * name, struct start_end * se) {

src/gufi_query.c

@@ -197,7 +197,7 @@ uint64_t buffer_sum(struct sll * timers) {
     uint64_t sum = 0;
     sll_loop(timers, node) {
         struct start_end * timer = (struct start_end *) sll_node_data(node);
-        sum += elapsed(timer);
+        sum += nsec(timer);
     }
 
     return sum;
@@ -213,7 +213,7 @@ uint64_t buffer_sum(struct sll * timers) {
 
 #endif
 #else
-struct sll * descend_timers_init() {}
+struct sll *descend_timers_init() { return NULL; }
 void descend_timers_destroy(struct sll * dt) {}
 #define buffered_start(name)
 #define buffered_end(name)

src/gufi_trace2index.c

@@ -591,7 +591,7 @@ int scout_function(struct QPTPool *ctx, const size_t id, void *data, void *args)
     clock_gettime(CLOCK_MONOTONIC, &scouting.end);
 
     pthread_mutex_lock(&print_mutex);
-    fprintf(stdout, "Scout finished in %.2Lf seconds\n", sec(elapsed(&scouting)));
+    fprintf(stdout, "Scout finished in %.2Lf seconds\n", sec(nsec(&scouting)));
     fprintf(stdout, "Files: %zu\n", file_count);
     fprintf(stdout, "Dirs:  %zu (%zu empty)\n", dir_count, empty);
     fprintf(stdout, "Total: %zu\n", file_count + dir_count);
@@ -738,7 +738,7 @@ int main(int argc, char *argv[]) {
     fprintf(stderr, "Files inserted:            %zu\n", total_files);
     #endif
 
-    fprintf(stderr, "main completed in %.2Lf seconds\n", sec(elapsed(&main_func)));
+    fprintf(stderr, "main completed in %.2Lf seconds\n", sec(nsec(&main_func)));
 
     return 0;
 }

src/querydb.c

@@ -90,8 +90,8 @@ struct DirStats {
     size_t subdir_count;    /* unrolled up count from readdir, not summary */
     size_t subnondir_count; /* rolled up count from entries and subdir.pentries */
 
-    int too_many_before;    /* current directory is too big to roll up */
-    int too_many_after;     /* rolling up would result in too many rows in pentries */
+    size_t too_many_before; /* current directory is too big to roll up */
+    size_t too_many_after;  /* rolling up would result in too many rows in pentries */
     int score;              /* roll up score regardless of success or failure */
     int success;            /* whether or not the roll up succeeded */
 };
@@ -214,8 +214,8 @@ do {                                                                     \
 
 void print_stanza(const char * name, struct sll * stats) {
     fprintf(stdout, "%s %*zu\n", name, (int) (29 - strlen(name)), sll_get_size(stats));
-    sll_dir_stats("Subdirectories", stats, subdir_count,    10);
-    sll_dir_stats("Files/Links",    stats, subnondir_count, 10);
+    sll_dir_stats("Subdirectories", stats, subdir_count,    (size_t) 10);
+    sll_dir_stats("Files/Links",    stats, subnondir_count, (size_t) 10);
     sll_dir_stats("Level",          stats, level,           10);
 }
 
@@ -842,7 +842,7 @@ int main(int argc, char * argv[]) {
     free(stats);
 
     timestamp_set_end_raw(runtime);
-    fprintf(stderr, "Took %.2Lf seconds\n", sec(elapsed(&runtime)));
+    fprintf(stderr, "Took %.2Lf seconds\n", sec(nsec(&runtime)));
 
     return rc;
 }