Merge lp:~bryce2/fatrace/filter_option into lp:fatrace

[Bryce Nesbitt]

New option:

-f MASK, --filter Show only the given event types (choose from C,R,O or W)

I use "-f W" to monitor writes, of which Google Chrome seems to be by far the worst culprit, especially if any tab has ever opened Youtube!

[lp:~bryce2/fatrace/filter_option]

64. By Bryce Nesbitt <email address hidden> on 2015-03-04

Fix no flag case

[Martin Pitt (pitti)]

Very nice, thanks for this! I just see some minor issues below. I'll merge this once these get fixed.

review: Needs Fixing

[lp:~bryce2/fatrace/filter_option]

65. By Bryce Nesbitt <email address hidden> on 2015-03-06

fix a few style issues
make --filter case insensitive

[Bryce Nesbitt (bryce2)]

bzr commit
modified fatrace.c
Committed revision 65.

bzr push
Pushed up to revision 65.

review: Needs Resubmitting

[Martin Pitt (pitti)]

Thanks! I added an error message for unknown options, documented the new version in the manpage, and fixed some style issues. I did a new upstream release https://launchpad.net/fatrace/trunk/0.10 with this, and will package this for Debian unstable now (from where it will flow into the next Ubuntu development series).

review: Approve

=== modified file 'fatrace.c'
--- fatrace.c	2014-09-23 13:49:58 +0000
+++ fatrace.c	2015-03-06 02:20:51 +0000
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 #include <sys/fanotify.h>
 #include <sys/time.h>
+#include <ctype.h>
 
 #define BUFSIZE 256*1024
 
@@ -45,6 +46,7 @@
 
 /* command line options */
 static char* option_output = NULL;
+static long option_filter_mask = 0xffffffff;
 static long option_timeout = -1;
 static int option_current_mount = 0;
 static int option_timestamp = 0;
@@ -97,6 +99,10 @@
     static char pathname[PATH_MAX];
     struct stat st;
 
+    if ((data->mask & option_filter_mask) == 0) {
+        return;
+    }
+
     /* read process name */
     snprintf (printbuf, sizeof (printbuf), "/proc/%i/comm", data->pid);
     len = 0;
@@ -212,6 +218,7 @@
 "  -s SECONDS, --seconds=SECONDS\tStop after the given number of seconds.\n"
 "  -t, --timestamp\t\tAdd timestamp to events. Give twice for seconds since the epoch.\n"
 "  -p PID, --ignore-pid PID\tIgnore events for this process ID. Can be specified multiple times.\n"
+"  -f MASK, --filter=MASK\tShow only the given event types (choose from C,R,O,or W).\n"
 "  -h, --help\t\t\tShow help.");
 }
 
@@ -224,6 +231,7 @@
 parse_args (int argc, char** argv)
 {
     int c;
+    int j;
     long pid;
     char *endptr;
 
@@ -233,12 +241,13 @@
         {"seconds",       required_argument, 0, 's'},
         {"timestamp",     no_argument,       0, 't'},
         {"ignore-pid",    required_argument, 0, 'p'},
+        {"filter",        required_argument, 0, 'f'},
         {"help",          no_argument,       0, 'h'},
         {0,               0,                 0,  0 }
     };
 
     while (1) {
-        c = getopt_long (argc, argv, "co:s:tp:h", long_options, NULL);
+        c = getopt_long (argc, argv, "co:s:tpf:h", long_options, NULL);
 
         if (c == -1)
             break;
@@ -252,6 +261,32 @@
                 option_output = strdup (optarg);
                 break;
 
+            case 'f':
+                j = 0;
+                option_filter_mask = 0x00000000;
+                while(optarg[j] != '\0') {
+                    switch(toupper(optarg[j])) {
+                        case 'R':
+                            option_filter_mask |= FAN_ACCESS;
+                            break;
+                        case 'C':
+                            option_filter_mask |= FAN_CLOSE_WRITE;
+                            option_filter_mask |= FAN_CLOSE_NOWRITE;
+                            break;
+                        case 'W':
+                            option_filter_mask |= FAN_CLOSE_WRITE;
+                            option_filter_mask |= FAN_MODIFY;
+                            break;
+                        case 'O':
+                            option_filter_mask |= FAN_OPEN;
+                            break;
+                        default:
+                            ; /* ignore unkown values for backwards compatibility */
+                    }
+                    j++;
+                }
+                break;
+
             case 's':
                 option_timeout = strtol (optarg, &endptr, 10);
                 if (*endptr != '\0' || option_timeout <= 0) {