Messages in this thread Patch in this message | | | From | Jim Cromie <> | Subject | [PATCH 04/21] dynamic_debug: warn when >1 of each type of match-spec is given | Date | Mon, 11 Jul 2011 01:46:39 -0600 |
| |
Issue warning when a match-spec is given multiple times in a rule. Previous code kept last one, but was silent about it. Docs imply only one is allowed by saying match-specs are ANDed together, given that module M cannot match both A and B.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com> --- lib/dynamic_debug.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index ae72402..0575113 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -281,6 +281,14 @@ static char *unescape(char *str) return str; } +static inline void check_set(const char **dest, char *src, char *name) +{ + if (*dest) + pr_warn("match-spec:%s val:%s overridden by %s", + name, *dest, src); + *dest = src; +} + /* * Parse words[] as a ddebug query specification, which is a series * of (keyword, value) pairs chosen from these possibilities: @@ -292,6 +300,9 @@ static char *unescape(char *str) * format <escaped-string-to-find-in-format> * line <lineno> * line <first-lineno>-<last-lineno> // where either may be empty + * + * only 1 pair of each type is expected, subsequent ones elicit a + * warning, and override the setting. */ static int ddebug_parse_query(char *words[], int nwords, struct ddebug_query *query) @@ -305,13 +316,14 @@ static int ddebug_parse_query(char *words[], int nwords, for (i = 0 ; i < nwords ; i += 2) { if (!strcmp(words[i], "func")) - query->function = words[i+1]; + check_set(&query->function, words[i+1], "func"); else if (!strcmp(words[i], "file")) - query->filename = words[i+1]; + check_set(&query->filename, words[i+1], "file"); else if (!strcmp(words[i], "module")) - query->module = words[i+1]; + check_set(&query->module, words[i+1], "module"); else if (!strcmp(words[i], "format")) - query->format = unescape(words[i+1]); + check_set(&query->format, unescape(words[i+1]), + "format"); else if (!strcmp(words[i], "line")) { char *first = words[i+1]; char *last = strchr(first, '-'); -- 1.7.4.1
| |