flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-08 16:36:14 +00:00
Code Issues Releases Wiki Activity

lib: add optional log domain filtering

Browse Source 
v2: add an "application" filter for the default domain (used by
    applications)

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2014-12-02 11:37:26 +00:00
parent 8161a21762
commit 5fe9c88bda
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/intel-gpu-tools/igt_test_programs.xml
View File

@ -35,9 +35,11 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--debug</option></term> <term><option>--debug[=log-domain]</option></term>
<listitem><para> <listitem><para>
print extra debugging information when running tests print extra debugging information when running tests and
optionaly only show the messages from the specified log domain
(use "application" to specifiy the default application domain)
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>

17
lib/igt_core.c
View File

@ -228,6 +228,8 @@ enum {
OPT_HELP = 'h' OPT_HELP = 'h'
}; };
static char* igt_log_domain_filter;
__attribute__((format(printf, 1, 2))) __attribute__((format(printf, 1, 2)))
static void kmsg(const char *format, ...) static void kmsg(const char *format, ...)
#define KERN_EMER "<0>" #define KERN_EMER "<0>"
@ -390,7 +392,7 @@ static void print_usage(const char *help_str, bool output_on_stderr)
fprintf(f, "Usage: %s [OPTIONS]\n", command_str); fprintf(f, "Usage: %s [OPTIONS]\n", command_str);
fprintf(f, " --list-subtests\n" fprintf(f, " --list-subtests\n"
" --run-subtest <pattern>\n" " --run-subtest <pattern>\n"
" --debug\n" " --debug[=log-domain]\n"
" --help-description\n" " --help-description\n"
" --help\n"); " --help\n");
if (help_str) if (help_str)
@ -422,7 +424,7 @@ static int common_init(int argc, char **argv,
{"list-subtests", 0, 0, OPT_LIST_SUBTESTS}, {"list-subtests", 0, 0, OPT_LIST_SUBTESTS},
{"run-subtest", 1, 0, OPT_RUN_SUBTEST}, {"run-subtest", 1, 0, OPT_RUN_SUBTEST},
{"help-description", 0, 0, OPT_DESCRIPTION}, {"help-description", 0, 0, OPT_DESCRIPTION},
{"debug", 0, 0, OPT_DEBUG}, {"debug", optional_argument, 0, OPT_DEBUG},
{"help", 0, 0, OPT_HELP}, {"help", 0, 0, OPT_HELP},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@ -510,6 +512,8 @@ static int common_init(int argc, char **argv,
switch(c) { switch(c) {
case OPT_DEBUG: case OPT_DEBUG:
igt_log_level = IGT_LOG_DEBUG; igt_log_level = IGT_LOG_DEBUG;
if (optarg && strlen(optarg) > 0)
igt_log_domain_filter = strdup(optarg);
break; break;
case OPT_LIST_SUBTESTS: case OPT_LIST_SUBTESTS:
if (!run_single_subtest) if (!run_single_subtest)
@ -1476,6 +1480,15 @@ void igt_vlog(const char *domain, enum igt_log_level level, const char *format,
if (igt_log_level > level) if (igt_log_level > level)
return; return;
if (igt_log_domain_filter) {
/* if null domain and filter is not "application", return */
if (!domain && strcmp(igt_log_domain_filter, "application"))
return;
/* else if domain and filter do not match, return */
else if (domain && strcmp(igt_log_domain_filter, domain))
return;
}
if (level == IGT_LOG_WARN) { if (level == IGT_LOG_WARN) {
file = stderr; file = stderr;
fflush(stdout); fflush(stdout);