Merge pull request #904 from lntuition/master

Setup filters properly when options are set using the default
option file.  There was a annoying message when it's used
by the info command.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>

Author: namhyung

cmds/info.c

@@ -1234,7 +1234,7 @@ int command_info(int argc, char *argv[], struct opts *opts)
 		goto out;
 	}
 
-	fstack_setup_filters(opts, &handle);
+	fstack_setup_task(opts->tid, &handle);
 	if (opts->show_task) {
 		/* ignore errors */
 		read_task_txt_file(&handle.sessions, opts->dirname,

utils/fstack.c

@@ -140,14 +140,14 @@ static void update_first_timestamp(struct uftrace_data *handle,
 }
 
 /**
- * setup_task_filter - setup task filters using tid
+ * fstack_setup_task - setup task filters using tid
  * @tid_filter - CSV of tid (or possibly separated by  ':')
  * @handle     - file handle
  *
  * This function sets up task filters using @tid_filter.
  * Tasks not listed will be ignored.
  */
-static void setup_task_filter(char *tid_filter, struct uftrace_data *handle)
+void fstack_setup_task(char *tid_filter, struct uftrace_data *handle)
 {
 	int i, k;
 	int nr_filters = 0;
@@ -432,15 +432,15 @@ int fstack_setup_filters(struct opts *opts, struct uftrace_data *handle)
 			       opts->filter ?: "",
 			       (opts->filter && opts->trigger) ? " or " : "",
 			       opts->trigger ?: "",
-			       (opts->filter || opts->trigger) ? " or " : "",
+			       ((opts->filter || opts->trigger) && opts->caller) ? " or " : "",
 			       opts->caller ?: "");
 		}
 	}
 
 	if (opts->disabled)
 		fstack_enabled = false;
 
-	setup_task_filter(opts->tid, handle);
+	fstack_setup_task(opts->tid, handle);
 
 	fstack_prepare_fixup(handle);
 	return 0;
@@ -2308,7 +2308,7 @@ static int fstack_test_setup_file(struct uftrace_data *handle, int nr_tid)
 
 		test_tasks[i].tid = handle->info.tids[i];
 	}
-	setup_task_filter(NULL, handle);
+	fstack_setup_task(NULL, handle);
 
 	/* for fstack_entry not to crash */
 	for (i = 0; i < handle->info.nr_tid; i++)

utils/fstack.h

@@ -105,6 +105,8 @@ struct uftrace_task_reader *get_task_handle(struct uftrace_data *handle,
 					   int tid);
 void reset_task_handle(struct uftrace_data *handle);
 
+void fstack_setup_task(char *tid_filter, struct uftrace_data *handle);
+
 int read_rstack(struct uftrace_data *handle,
 		struct uftrace_task_reader **task);
 int peek_rstack(struct uftrace_data *handle,