From: Nikolay Marchuk Date: Tue, 27 Jun 2017 04:33:29 +0000 (+0700) Subject: Split qualify.c into basic_filters.c and filter_qualify.c X-Git-Tag: v4.19~172 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b75c5b14e779f68a7aec261a72bb87de944e73dc;p=strace Split qualify.c into basic_filters.c and filter_qualify.c This change also exports add_number_to_set, qualify_tokens, and qualify_syscall_tokens. * basic_filters.c: New file, part of qualify.c. * filter_qualify.c: Likewise. * filter.h: New file. * qualify.c: Remove. * Makefile.am (strace_SOURCES): Add new files, remove qualify.c. --- diff --git a/Makefile.am b/Makefile.am index 78379e5b..9b8818ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,7 @@ strace_SOURCES = \ affinity.c \ aio.c \ alpha.c \ + basic_filters.c \ bind.c \ bjm.c \ block.c \ @@ -130,6 +131,8 @@ strace_SOURCES = \ fetch_struct_statfs.c \ file_handle.c \ file_ioctl.c \ + filter_qualify.c \ + filter.h \ flock.c \ flock.h \ fs_x_ioctl.c \ @@ -230,7 +233,6 @@ strace_SOURCES = \ process_vm.c \ ptp.c \ ptrace.h \ - qualify.c \ quota.c \ readahead.c \ readlink.c \ diff --git a/qualify.c b/basic_filters.c similarity index 56% rename from qualify.c rename to basic_filters.c index 3df4805a..1dbdeac8 100644 --- a/qualify.c +++ b/basic_filters.c @@ -27,7 +27,7 @@ */ #include "defs.h" -#include "nsig.h" +#include "filter.h" #include typedef unsigned int number_slot_t; @@ -39,16 +39,6 @@ struct number_set { bool not; }; -struct number_set read_set; -struct number_set write_set; -struct number_set signal_set; - -static struct number_set abbrev_set[SUPPORTED_PERSONALITIES]; -static struct number_set inject_set[SUPPORTED_PERSONALITIES]; -static struct number_set raw_set[SUPPORTED_PERSONALITIES]; -static struct number_set trace_set[SUPPORTED_PERSONALITIES]; -static struct number_set verbose_set[SUPPORTED_PERSONALITIES]; - static void number_setbit(const unsigned int i, number_slot_t *const vec) { @@ -72,7 +62,7 @@ reallocate_number_set(struct number_set *const set, const unsigned int new_nslot set->nslots = new_nslots; } -static void +void add_number_to_set(const unsigned int number, struct number_set *const set) { reallocate_number_set(set, number / BITS_PER_SLOT + 1); @@ -86,99 +76,6 @@ is_number_in_set(const unsigned int number, const struct number_set *const set) && number_isset(number, set->vec)) ^ set->not; } -typedef int (*string_to_uint_func)(const char *); - -/* - * Add numbers to SET according to STR specification. - */ -static void -qualify_tokens(const char *const str, struct number_set *const set, - string_to_uint_func func, const char *const name) -{ - /* Clear the set. */ - if (set->nslots) - memset(set->vec, 0, sizeof(*set->vec) * set->nslots); - set->not = false; - - /* - * Each leading ! character means inversion - * of the remaining specification. - */ - const char *s = str; -handle_inversion: - while (*s == '!') { - set->not = !set->not; - ++s; - } - - if (strcmp(s, "none") == 0) { - /* - * No numbers are added to the set. - * Subsequent is_number_in_set invocations will return set->not. - */ - return; - } else if (strcmp(s, "all") == 0) { - s = "!none"; - goto handle_inversion; - } - - /* - * Split the string into comma separated tokens. - * For each token, find out the corresponding number - * by calling FUNC, and add that number to the set. - * The absence of tokens or a negative answer - * from FUNC is a fatal error. - */ - char *copy = xstrdup(s); - char *saveptr = NULL; - const char *token; - int number = -1; - - for (token = strtok_r(copy, ",", &saveptr); token; - token = strtok_r(NULL, ",", &saveptr)) { - number = func(token); - if (number < 0) { - error_msg_and_die("invalid %s '%s'", name, token); - } - - add_number_to_set(number, set); - } - - free(copy); - - if (number < 0) { - error_msg_and_die("invalid %s '%s'", name, str); - } -} - -static int -sigstr_to_uint(const char *s) -{ - int i; - - if (*s >= '0' && *s <= '9') - return string_to_uint_upto(s, 255); - - if (strncasecmp(s, "SIG", 3) == 0) - s += 3; - - for (i = 0; i <= 255; ++i) { - const char *name = signame(i); - - if (strncasecmp(name, "SIG", 3) != 0) - continue; - - name += 3; - - if (strcasecmp(name, s) != 0) - continue; - - return i; - } - - return -1; -} - static bool qualify_syscall_number(const char *s, struct number_set *set) { @@ -349,7 +246,7 @@ qualify_syscall(const char *token, struct number_set *set) * Add syscall numbers to SETs for each supported personality * according to STR specification. */ -static void +void qualify_syscall_tokens(const char *const str, struct number_set *const set, const char *const name) { @@ -414,284 +311,65 @@ handle_inversion: } } -static int -find_errno_by_name(const char *name) +/* + * Add numbers to SET according to STR specification. + */ +void +qualify_tokens(const char *const str, struct number_set *const set, + string_to_uint_func func, const char *const name) { - unsigned int i; + /* Clear the set. */ + if (set->nslots) + memset(set->vec, 0, sizeof(*set->vec) * set->nslots); + set->not = false; - for (i = 1; i < nerrnos; ++i) { - if (errnoent[i] && (strcasecmp(name, errnoent[i]) == 0)) - return i; + /* + * Each leading ! character means inversion + * of the remaining specification. + */ + const char *s = str; +handle_inversion: + while (*s == '!') { + set->not = !set->not; + ++s; } - return -1; -} - -static bool -parse_inject_token(const char *const token, struct inject_opts *const fopts, - const bool fault_tokens_only) -{ - const char *val; - int intval; - - if ((val = STR_STRIP_PREFIX(token, "when=")) != token) { + if (strcmp(s, "none") == 0) { /* - * == 1+1 - * F == F+0 - * F+ == F+1 - * F+S + * No numbers are added to the set. + * Subsequent is_number_in_set invocations will return set->not. */ - char *end; - intval = string_to_uint_ex(val, &end, 0xffff, "+"); - if (intval < 1) - return false; - - fopts->first = intval; - - if (*end) { - val = end + 1; - if (*val) { - /* F+S */ - intval = string_to_uint_upto(val, 0xffff); - if (intval < 1) - return false; - fopts->step = intval; - } else { - /* F+ == F+1 */ - fopts->step = 1; - } - } else { - /* F == F+0 */ - fopts->step = 0; - } - } else if ((val = STR_STRIP_PREFIX(token, "error=")) != token) { - if (fopts->rval != INJECT_OPTS_RVAL_DEFAULT) - return false; - intval = string_to_uint_upto(val, MAX_ERRNO_VALUE); - if (intval < 0) - intval = find_errno_by_name(val); - if (intval < 1) - return false; - fopts->rval = -intval; - } else if (!fault_tokens_only - && (val = STR_STRIP_PREFIX(token, "retval=")) != token) { - if (fopts->rval != INJECT_OPTS_RVAL_DEFAULT) - return false; - intval = string_to_uint(val); - if (intval < 0) - return false; - fopts->rval = intval; - } else if (!fault_tokens_only - && (val = STR_STRIP_PREFIX(token, "signal=")) != token) { - intval = sigstr_to_uint(val); - if (intval < 1 || intval > NSIG_BYTES * 8) - return false; - fopts->signo = intval; - } else { - return false; - } - - return true; -} - -static char * -parse_inject_expression(const char *const s, char **buf, - struct inject_opts *const fopts, - const bool fault_tokens_only) -{ - char *saveptr = NULL; - char *name = NULL; - char *token; - - *buf = xstrdup(s); - for (token = strtok_r(*buf, ":", &saveptr); token; - token = strtok_r(NULL, ":", &saveptr)) { - if (!name) - name = token; - else if (!parse_inject_token(token, fopts, fault_tokens_only)) - goto parse_error; - } - - if (name) - return name; - -parse_error: - free(*buf); - return *buf = NULL; -} - -static void -qualify_read(const char *const str) -{ - qualify_tokens(str, &read_set, string_to_uint, "descriptor"); -} - -static void -qualify_write(const char *const str) -{ - qualify_tokens(str, &write_set, string_to_uint, "descriptor"); -} - -static void -qualify_signals(const char *const str) -{ - qualify_tokens(str, &signal_set, sigstr_to_uint, "signal"); -} - -static void -qualify_trace(const char *const str) -{ - qualify_syscall_tokens(str, trace_set, "system call"); -} - -static void -qualify_abbrev(const char *const str) -{ - qualify_syscall_tokens(str, abbrev_set, "system call"); -} - -static void -qualify_verbose(const char *const str) -{ - qualify_syscall_tokens(str, verbose_set, "system call"); -} - -static void -qualify_raw(const char *const str) -{ - qualify_syscall_tokens(str, raw_set, "system call"); -} - -static void -qualify_inject_common(const char *const str, - const bool fault_tokens_only, - const char *const description) -{ - struct inject_opts opts = { - .first = 1, - .step = 1, - .rval = INJECT_OPTS_RVAL_DEFAULT, - .signo = 0 - }; - char *buf = NULL; - char *name = parse_inject_expression(str, &buf, &opts, fault_tokens_only); - if (!name) { - error_msg_and_die("invalid %s '%s'", description, str); - } - - /* If neither of retval, error, or signal is specified, then ... */ - if (opts.rval == INJECT_OPTS_RVAL_DEFAULT && !opts.signo) { - if (fault_tokens_only) { - /* in fault= syntax the default error code is ENOSYS. */ - opts.rval = -ENOSYS; - } else { - /* in inject= syntax this is not allowed. */ - error_msg_and_die("invalid %s '%s'", description, str); - } + return; + } else if (strcmp(s, "all") == 0) { + s = "!none"; + goto handle_inversion; } - struct number_set tmp_set[SUPPORTED_PERSONALITIES]; - memset(tmp_set, 0, sizeof(tmp_set)); - qualify_syscall_tokens(name, tmp_set, description); - - free(buf); - /* - * Initialize inject_vec accourding to tmp_set. - * Merge tmp_set into inject_set. + * Split the string into comma separated tokens. + * For each token, find out the corresponding number + * by calling FUNC, and add that number to the set. + * The absence of tokens or a negative answer + * from FUNC is a fatal error. */ - unsigned int p; - for (p = 0; p < SUPPORTED_PERSONALITIES; ++p) { - if (!tmp_set[p].nslots && !tmp_set[p].not) { - continue; - } - - if (!inject_vec[p]) { - inject_vec[p] = xcalloc(nsyscall_vec[p], - sizeof(*inject_vec[p])); - } + char *copy = xstrdup(s); + char *saveptr = NULL; + const char *token; + int number = -1; - unsigned int i; - for (i = 0; i < nsyscall_vec[p]; ++i) { - if (is_number_in_set(i, &tmp_set[p])) { - add_number_to_set(i, &inject_set[p]); - inject_vec[p][i] = opts; - } + for (token = strtok_r(copy, ",", &saveptr); token; + token = strtok_r(NULL, ",", &saveptr)) { + number = func(token); + if (number < 0) { + error_msg_and_die("invalid %s '%s'", name, token); } - free(tmp_set[p].vec); + add_number_to_set(number, set); } -} - -static void -qualify_fault(const char *const str) -{ - qualify_inject_common(str, true, "fault argument"); -} - -static void -qualify_inject(const char *const str) -{ - qualify_inject_common(str, false, "inject argument"); -} - -static const struct qual_options { - const char *name; - void (*qualify)(const char *); -} qual_options[] = { - { "trace", qualify_trace }, - { "t", qualify_trace }, - { "abbrev", qualify_abbrev }, - { "a", qualify_abbrev }, - { "verbose", qualify_verbose }, - { "v", qualify_verbose }, - { "raw", qualify_raw }, - { "x", qualify_raw }, - { "signal", qualify_signals }, - { "signals", qualify_signals }, - { "s", qualify_signals }, - { "read", qualify_read }, - { "reads", qualify_read }, - { "r", qualify_read }, - { "write", qualify_write }, - { "writes", qualify_write }, - { "w", qualify_write }, - { "fault", qualify_fault }, - { "inject", qualify_inject }, -}; -void -qualify(const char *str) -{ - const struct qual_options *opt = qual_options; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(qual_options); ++i) { - const char *name = qual_options[i].name; - const size_t len = strlen(name); - const char *val = str_strip_prefix_len(str, name, len); + free(copy); - if (val == str || *val != '=') - continue; - str = val + 1; - opt = &qual_options[i]; - break; + if (number < 0) { + error_msg_and_die("invalid %s '%s'", name, str); } - - opt->qualify(str); -} - -unsigned int -qual_flags(const unsigned int scno) -{ - return (is_number_in_set(scno, &trace_set[current_personality]) - ? QUAL_TRACE : 0) - | (is_number_in_set(scno, &abbrev_set[current_personality]) - ? QUAL_ABBREV : 0) - | (is_number_in_set(scno, &verbose_set[current_personality]) - ? QUAL_VERBOSE : 0) - | (is_number_in_set(scno, &raw_set[current_personality]) - ? QUAL_RAW : 0) - | (is_number_in_set(scno, &inject_set[current_personality]) - ? QUAL_INJECT : 0); } diff --git a/filter.h b/filter.h new file mode 100644 index 00000000..eefbd3cb --- /dev/null +++ b/filter.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2017 Nikolay Marchuk + * Copyright (c) 2017 The strace developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef STRACE_FILTER_H +#define STRACE_FILTER_H + +struct number_set; +typedef int (*string_to_uint_func)(const char *); + +void add_number_to_set(unsigned int number, struct number_set *set); +void qualify_tokens(const char *str, struct number_set *set, + string_to_uint_func func, const char *name); +void qualify_syscall_tokens(const char *str, struct number_set *set, + const char *name); + +#endif /* !STRACE_FILTER_H */ diff --git a/filter_qualify.c b/filter_qualify.c new file mode 100644 index 00000000..4283e769 --- /dev/null +++ b/filter_qualify.c @@ -0,0 +1,359 @@ +/* + * Copyright (c) 2016 Dmitry V. Levin + * Copyright (c) 2016-2017 The strace developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "defs.h" +#include "nsig.h" +#include "filter.h" + +typedef unsigned int number_slot_t; + +struct number_set { + number_slot_t *vec; + unsigned int nslots; + bool not; +}; + +struct number_set read_set; +struct number_set write_set; +struct number_set signal_set; + +static struct number_set abbrev_set[SUPPORTED_PERSONALITIES]; +static struct number_set inject_set[SUPPORTED_PERSONALITIES]; +static struct number_set raw_set[SUPPORTED_PERSONALITIES]; +static struct number_set trace_set[SUPPORTED_PERSONALITIES]; +static struct number_set verbose_set[SUPPORTED_PERSONALITIES]; + +static int +sigstr_to_uint(const char *s) +{ + int i; + + if (*s >= '0' && *s <= '9') + return string_to_uint_upto(s, 255); + + if (strncasecmp(s, "SIG", 3) == 0) + s += 3; + + for (i = 0; i <= 255; ++i) { + const char *name = signame(i); + + if (strncasecmp(name, "SIG", 3) != 0) + continue; + + name += 3; + + if (strcasecmp(name, s) != 0) + continue; + + return i; + } + + return -1; +} + +static int +find_errno_by_name(const char *name) +{ + unsigned int i; + + for (i = 1; i < nerrnos; ++i) { + if (errnoent[i] && (strcasecmp(name, errnoent[i]) == 0)) + return i; + } + + return -1; +} + +static bool +parse_inject_token(const char *const token, struct inject_opts *const fopts, + const bool fault_tokens_only) +{ + const char *val; + int intval; + + if ((val = STR_STRIP_PREFIX(token, "when=")) != token) { + /* + * == 1+1 + * F == F+0 + * F+ == F+1 + * F+S + */ + char *end; + intval = string_to_uint_ex(val, &end, 0xffff, "+"); + if (intval < 1) + return false; + + fopts->first = intval; + + if (*end) { + val = end + 1; + if (*val) { + /* F+S */ + intval = string_to_uint_upto(val, 0xffff); + if (intval < 1) + return false; + fopts->step = intval; + } else { + /* F+ == F+1 */ + fopts->step = 1; + } + } else { + /* F == F+0 */ + fopts->step = 0; + } + } else if ((val = STR_STRIP_PREFIX(token, "error=")) != token) { + if (fopts->rval != INJECT_OPTS_RVAL_DEFAULT) + return false; + intval = string_to_uint_upto(val, MAX_ERRNO_VALUE); + if (intval < 0) + intval = find_errno_by_name(val); + if (intval < 1) + return false; + fopts->rval = -intval; + } else if (!fault_tokens_only + && (val = STR_STRIP_PREFIX(token, "retval=")) != token) { + if (fopts->rval != INJECT_OPTS_RVAL_DEFAULT) + return false; + intval = string_to_uint(val); + if (intval < 0) + return false; + fopts->rval = intval; + } else if (!fault_tokens_only + && (val = STR_STRIP_PREFIX(token, "signal=")) != token) { + intval = sigstr_to_uint(val); + if (intval < 1 || intval > NSIG_BYTES * 8) + return false; + fopts->signo = intval; + } else { + return false; + } + + return true; +} + +static char * +parse_inject_expression(const char *const s, char **buf, + struct inject_opts *const fopts, + const bool fault_tokens_only) +{ + char *saveptr = NULL; + char *name = NULL; + char *token; + + *buf = xstrdup(s); + for (token = strtok_r(*buf, ":", &saveptr); token; + token = strtok_r(NULL, ":", &saveptr)) { + if (!name) + name = token; + else if (!parse_inject_token(token, fopts, fault_tokens_only)) + goto parse_error; + } + + if (name) + return name; + +parse_error: + free(*buf); + return *buf = NULL; +} + +static void +qualify_read(const char *const str) +{ + qualify_tokens(str, &read_set, string_to_uint, "descriptor"); +} + +static void +qualify_write(const char *const str) +{ + qualify_tokens(str, &write_set, string_to_uint, "descriptor"); +} + +static void +qualify_signals(const char *const str) +{ + qualify_tokens(str, &signal_set, sigstr_to_uint, "signal"); +} + +static void +qualify_trace(const char *const str) +{ + qualify_syscall_tokens(str, trace_set, "system call"); +} + +static void +qualify_abbrev(const char *const str) +{ + qualify_syscall_tokens(str, abbrev_set, "system call"); +} + +static void +qualify_verbose(const char *const str) +{ + qualify_syscall_tokens(str, verbose_set, "system call"); +} + +static void +qualify_raw(const char *const str) +{ + qualify_syscall_tokens(str, raw_set, "system call"); +} + +static void +qualify_inject_common(const char *const str, + const bool fault_tokens_only, + const char *const description) +{ + struct inject_opts opts = { + .first = 1, + .step = 1, + .rval = INJECT_OPTS_RVAL_DEFAULT, + .signo = 0 + }; + char *buf = NULL; + char *name = parse_inject_expression(str, &buf, &opts, fault_tokens_only); + if (!name) { + error_msg_and_die("invalid %s '%s'", description, str); + } + + /* If neither of retval, error, or signal is specified, then ... */ + if (opts.rval == INJECT_OPTS_RVAL_DEFAULT && !opts.signo) { + if (fault_tokens_only) { + /* in fault= syntax the default error code is ENOSYS. */ + opts.rval = -ENOSYS; + } else { + /* in inject= syntax this is not allowed. */ + error_msg_and_die("invalid %s '%s'", description, str); + } + } + + struct number_set tmp_set[SUPPORTED_PERSONALITIES]; + memset(tmp_set, 0, sizeof(tmp_set)); + qualify_syscall_tokens(name, tmp_set, description); + + free(buf); + + /* + * Initialize inject_vec accourding to tmp_set. + * Merge tmp_set into inject_set. + */ + unsigned int p; + for (p = 0; p < SUPPORTED_PERSONALITIES; ++p) { + if (!tmp_set[p].nslots && !tmp_set[p].not) { + continue; + } + + if (!inject_vec[p]) { + inject_vec[p] = xcalloc(nsyscall_vec[p], + sizeof(*inject_vec[p])); + } + + unsigned int i; + for (i = 0; i < nsyscall_vec[p]; ++i) { + if (is_number_in_set(i, &tmp_set[p])) { + add_number_to_set(i, &inject_set[p]); + inject_vec[p][i] = opts; + } + } + + free(tmp_set[p].vec); + } +} + +static void +qualify_fault(const char *const str) +{ + qualify_inject_common(str, true, "fault argument"); +} + +static void +qualify_inject(const char *const str) +{ + qualify_inject_common(str, false, "inject argument"); +} + +static const struct qual_options { + const char *name; + void (*qualify)(const char *); +} qual_options[] = { + { "trace", qualify_trace }, + { "t", qualify_trace }, + { "abbrev", qualify_abbrev }, + { "a", qualify_abbrev }, + { "verbose", qualify_verbose }, + { "v", qualify_verbose }, + { "raw", qualify_raw }, + { "x", qualify_raw }, + { "signal", qualify_signals }, + { "signals", qualify_signals }, + { "s", qualify_signals }, + { "read", qualify_read }, + { "reads", qualify_read }, + { "r", qualify_read }, + { "write", qualify_write }, + { "writes", qualify_write }, + { "w", qualify_write }, + { "fault", qualify_fault }, + { "inject", qualify_inject }, +}; + +void +qualify(const char *str) +{ + const struct qual_options *opt = qual_options; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(qual_options); ++i) { + const char *name = qual_options[i].name; + const size_t len = strlen(name); + const char *val = str_strip_prefix_len(str, name, len); + + if (val == str || *val != '=') + continue; + str = val + 1; + opt = &qual_options[i]; + break; + } + + opt->qualify(str); +} + +unsigned int +qual_flags(const unsigned int scno) +{ + return (is_number_in_set(scno, &trace_set[current_personality]) + ? QUAL_TRACE : 0) + | (is_number_in_set(scno, &abbrev_set[current_personality]) + ? QUAL_ABBREV : 0) + | (is_number_in_set(scno, &verbose_set[current_personality]) + ? QUAL_VERBOSE : 0) + | (is_number_in_set(scno, &raw_set[current_personality]) + ? QUAL_RAW : 0) + | (is_number_in_set(scno, &inject_set[current_personality]) + ? QUAL_INJECT : 0); +}