Merge pull request #2 from snonux/bugfix-release0.4.2

Bugfix release

6 files changed, 15 insertions, 7 deletions

diff --git a/docs/doxygen.conf b/docs/doxygen.conf
index 8f014b6..0627fff 100644
--- a/docs/doxygen.conf
+++ b/docs/doxygen.conf
@@ -38,7 +38,7 @@ PROJECT_NAME           = "I/O Riot"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.1-BETA
+PROJECT_NUMBER         = 0.4.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/ioriot/src/capture/capture.c b/ioriot/src/capture/capture.c
index 5e8771d..249066d 100644
--- a/ioriot/src/capture/capture.c
+++ b/ioriot/src/capture/capture.c
@@ -88,8 +88,9 @@ status_e capture_run(options_s *opts)
     if ((fp = popen(staprun_command, "r")) == NULL) {
         Errno("Unable to invoke staprun command!");
     }
-    while (fgets(buf, 1024, fp) != NULL)
+    while (fgets(buf, 1024, fp) != NULL) {
         Out("stapio: %s", buf);
+    }
 
     if (0 != pclose(fp)) {
         Error("Problems invoking staprun command!");
diff --git a/ioriot/src/datas/btree.c b/ioriot/src/datas/btree.c
index b09ea1c..1fe356a 100644
--- a/ioriot/src/datas/btree.c
+++ b/ioriot/src/datas/btree.c
@@ -250,8 +250,9 @@ void btreelem_print_r(btreelem_s* e, int depth)
     if (!e)
         return;
 
-    for (int i = 0; i < depth; ++i)
+    for (int i = 0; i < depth; ++i) {
         Out(" ");
+    }
     Put("key:%ld data:%ld", e->key, (long) e->data);
 
     if (e->left)
diff --git a/ioriot/src/defaults.h b/ioriot/src/defaults.h
index b0e9de7..24399a9 100644
--- a/ioriot/src/defaults.h
+++ b/ioriot/src/defaults.h
@@ -28,7 +28,7 @@
 /** Controls how many tasks can be queued and buffered per worker thread */
 #define TASK_BUFFER_PER_THREAD 512
 /** Version of I/O Riot */
-#define IORIOT_VERSION "0.4.1"
+#define IORIOT_VERSION "0.4.2"
 /** Copyright information */
 #define IORIOT_COPYRIGHT "(c) Mimecast 2018"
 /** Max open files resource user limit */
diff --git a/ioriot/src/main.c b/ioriot/src/main.c
index d7c6204..2b91e46 100644
--- a/ioriot/src/main.c
+++ b/ioriot/src/main.c
@@ -126,6 +126,7 @@ int main(int argc, char **argv)
     status_e ret = UNKNOWN;
 
     bool dont_drop_caches = false;
+    bool module_chosen = false;
     options_s *opts = options_new();
     int opt = 0;
 
@@ -195,6 +196,7 @@ int main(int argc, char **argv)
         case 'm':
             opts->module = Clone(optarg);
             Put("Module: %s", opts->module);
+            module_chosen = true;
             break;
         case 'n':
             opts->name = optarg;
@@ -229,6 +231,10 @@ int main(int argc, char **argv)
         }
     }
 
+    // Use targeted module if we target a PID!
+    if (opts->pid != -1 && !module_chosen)
+        opts->module = "targetedioriot.ko";
+
     if (opts->purge || opts->trash) {
         // Clean up all temp data of previous test runs
         Cleanup(cleanup_run(opts));
diff --git a/ioriot/src/utests.c b/ioriot/src/utests.c
index 7cae7e8..8a54f42 100644
--- a/ioriot/src/utests.c
+++ b/ioriot/src/utests.c
@@ -26,9 +26,6 @@ void utests_run()
     fprintf(stderr, "Running btree_test()\n");
     btree_test();
 
-    fprintf(stderr, "Running amap_test()\n");
-    amap_test();
-
     fprintf(stderr, "Running hmap_test()\n");
     hmap_test();
 
@@ -41,5 +38,8 @@ void utests_run()
     fprintf(stderr, "Running utils_test()\n");
     utils_test();
 
+    fprintf(stderr, "Running amap_test()\n");
+    amap_test();
+
     fprintf(stderr, "Great success, run all unit tests without any errors!\n");
 }