Messages in this thread Patch in this message | | | From | jim.cromie@gmail ... | Subject | [PATCH 14/26] dynamic_debug: refactor query_matches_callsite out of ddebug_change | Date | Wed, 21 Sep 2011 15:55:03 -0600 |
| |
From: Jim Cromie <jim.cromie@gmail.com>
This makes no behavioral change, its just a code-move/refactor to encapsulate matching behavior.
If this function is reused, note that it excludes check of the module; that is done once for the table, this code refactors the test inside the loop over the module's ddebug callsites.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com> --- lib/dynamic_debug.c | 54 +++++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 2f39b2f..329e18d 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -125,6 +125,36 @@ do { \ q->first_lineno, q->last_lineno); \ } while (0) +static bool query_matches_callsite(struct _ddebug *dp, + const struct ddebug_query *query) +{ + /* match against the source filename */ + if (query->filename != NULL && + strcmp(query->filename, dp->filename) && + strcmp(query->filename, basename(dp->filename)) && + strcmp(query->filename, trim_prefix(dp->filename))) + return false; + + /* match against the function */ + if (query->function != NULL && + strcmp(query->function, dp->function)) + return false; + + /* match against the format */ + if (query->format != NULL && + strstr(dp->format, query->format) == NULL) + return false; + + /* match against the line number range */ + if (query->first_lineno && dp->lineno < query->first_lineno) + return false; + + if (query->last_lineno && dp->lineno > query->last_lineno) + return false; + + return true; +} + /* * Search the tables for _ddebug's which match the given * `query' and apply the `flags' and `mask' to them. Tells @@ -151,29 +181,7 @@ static void ddebug_change(const struct ddebug_query *query, for (i = 0 ; i < dt->num_ddebugs ; i++) { struct _ddebug *dp = &dt->ddebugs[i]; - /* match against the source filename */ - if (query->filename != NULL && - strcmp(query->filename, dp->filename) && - strcmp(query->filename, basename(dp->filename)) && - strcmp(query->filename, trim_prefix(dp->filename))) - continue; - - /* match against the function */ - if (query->function != NULL && - strcmp(query->function, dp->function)) - continue; - - /* match against the format */ - if (query->format != NULL && - strstr(dp->format, query->format) == NULL) - continue; - - /* match against the line number range */ - if (query->first_lineno && - dp->lineno < query->first_lineno) - continue; - if (query->last_lineno && - dp->lineno > query->last_lineno) + if (!query_matches_callsite(dp, query)) continue; nfound++; -- 1.7.4.4
| |