Merge branch '1.0'

.travis.yml

@@ -169,7 +169,7 @@ before_install:
     fi
 
 install:
-  - pip install --user urllib3[secure] cpp-coveralls
+  - pip2 install --user urllib3[secure] cpp-coveralls
   - >
     case "${TRAVIS_OS_NAME:-linux}" in
     osx)

src/sb_counter.c

@@ -28,6 +28,9 @@
 static sb_counters_t last_intermediate_counters;
 static sb_counters_t last_cumulative_counters;
 
+extern inline uint64_t sb_counter_val(int thread_id, sb_counter_type_t type);
+extern inline void sb_counter_inc(int thread_id, sb_counter_type_t type);
+
 /* Initialize per-thread stats */
 
 int sb_counters_init(void)

src/sb_counter.h

@@ -59,7 +59,7 @@ int sb_counters_init(void);
 void sb_counters_done(void);
 
 /* Return the current value for a given counter */
-static inline uint64_t sb_counter_val(int thread_id, sb_counter_type_t type)
+inline uint64_t sb_counter_val(int thread_id, sb_counter_type_t type)
 {
   return ck_pr_load_64(&sb_counters[thread_id][type]);
 }
@@ -73,7 +73,7 @@ static inline void sb_counter_add(int thread_id, sb_counter_type_t type,
 }
 
 /* Increment a given stat counter for a given thread  */
-static inline void sb_counter_inc(int thread_id, sb_counter_type_t type)
+inline void sb_counter_inc(int thread_id, sb_counter_type_t type)
 {
   sb_counter_add(thread_id, type, 1);
 }

src/tests/fileio/sb_fileio.c

@@ -1729,8 +1729,11 @@ int parse_arguments(void)
   {
     if (mode == NULL)
     {
-      log_text(LOG_FATAL, "Missing required argument: --file-test-mode");
+      log_text(LOG_FATAL, "Missing required argument: --file-test-mode\n");
+
+      log_text(LOG_NOTICE, "fileio options:");
       sb_print_options(fileio_args);
+
       return 1;
     }
     if (!strcmp(mode, "seqwr"))