dyndbg: refactor ddebug_read_flags out of ddebug_parse_flags
Subsystems (2)
Jim Cromie
maintainerPATCH 10/16 dyndbg: refactor ddebug_read_flags out of ddebug_parse_flags
Currently, ddebug_parse_flags accepts [+-=][pflmt_]+ as flag-spec strings. If we allow [pflmt_]*[+-=][pflmt_]+ instead, the (new) 1st flagset can be used as a filter to select callsites, before applying changes in the 2nd flagset. 1st step is to split out the flags-reader so we can use it again.
The point of this is to allow user to compose an arbitrary set of changes, by marking callsites with [fmlt] flags, and then to activate that composed set in a single query.
#> echo '=_' > control # clear all flags
#> echo 'module usb* +fmlt' > control # build the marked set, repeat
#> echo 'fmlt+p' > control # activate
Signed-off-by Jim Cromie <[email protected]>
--- lib/dynamic_debug.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-)
lib/dynamic_debug.c +26 -17
@@ -293,11 +293,11 @@ static int parse_linerange(struct ddebug_query *query, const char *first)/* range <first>-<last> */ if (parse_lineno (last, &query->last_lineno) <0 )return -EINVAL ; - +/* special case for last lineno not specified */ if (query->last_lineno ==0 ) query->last_lineno =UINT_MAX ; - +if (query->last_lineno < query->first_lineno) { pr_err("last-line:%d < 1st-line:%d\n", query->last_lineno,
@@ -311,7 +311,7 @@ static int parse_linerange(struct ddebug_query *query, const char *first) query->last_lineno);return 0 ; } - +static int check_set (const char **dest,char *src,char *name) {int rc =0 ;
@@ -399,6 +399,26 @@ static int ddebug_parse_query(char *words[], int nwords,return 0 ; } +static int ddebug_read_flags (const char *str,unsigned int *flags) +{ +int i; + +for (; *str ; ++str) { +for (i =ARRAY_SIZE (opt_array) -1 ; i >=0 ; i--) { +if (*str == opt_array[i].opt_char) { + *flags |= opt_array[i].flag; +break ; + } + } +if (i <0 ) { +pr_err ("unknown flag '%c' in \"%s\"\n" , *str, str); +return -EINVAL ; + } + } +vpr_info ("flags=0x%x\n" , *flags); +return 0 ; +} +/* * Parse `str' as a flags specification, format [-+=][p]+. * Sets up *maskp and *flagsp to be used when changing the
@@ -409,7 +429,7 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp, unsigned int *maskp) {unsigned flags =0 ; -int op ='=' , i; +int op;switch (*str) {case '+' :
@@ -423,19 +443,8 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp, }vpr_info ("op='%c'\n" , op); -for (; *str ; ++str) { -for (i =ARRAY_SIZE (opt_array) -1 ; i >=0 ; i--) { -if (*str == opt_array[i].opt_char) { - flags |= opt_array[i].flag; -break ; - } - } -if (i <0 ) { -pr_err ("unknown flag '%c' in \"%s\"\n" , *str, str); -return -EINVAL ; - } - } -vpr_info ("flags=0x%x\n" , flags); +if (ddebug_read_flags (str, &flags)) +return -EINVAL ;/* calculate final *flagsp, *maskp according to mask and op */ switch (op) {
Signature · 1 line
2.21.0