From: Jim Cromie <jim.cromie@gmail.com>
To: jbaron@akamai.com, linux-kernel@vger.kernel.org,
akpm@linuxfoundation.org
Cc: gregkh@linuxfoundation.org, linux@rasmusvillemoes.dk,
Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH v4 07/16] dyndbg: refactor parse_linerange out of ddebug_parse_query
Date: Mon, 9 Dec 2019 19:27:33 -0700 [thread overview]
Message-ID: <20191210022742.822686-8-jim.cromie@gmail.com> (raw)
In-Reply-To: <20191210022742.822686-1-jim.cromie@gmail.com>
make the code-block reusable to later handle "file foo.c:101-200" etc.
This should be a 90%+ code-move, with minimal adaptations; reindent,
and maybe fixes for compile, behavior.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
lib/dynamic_debug.c | 61 +++++++++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 27 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 49cb24948e12..f0cf90e672b8 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -292,6 +292,39 @@ static inline int parse_lineno(const char *str, unsigned int *val)
return 0;
}
+static int parse_linerange(struct ddebug_query *query, const char *first)
+{
+ char *last = strchr(first, '-');
+
+ if (query->first_lineno || query->last_lineno) {
+ pr_err("match-spec: line used 2x\n");
+ return -EINVAL;
+ }
+ if (last)
+ *last++ = '\0';
+ if (parse_lineno(first, &query->first_lineno) < 0)
+ return -EINVAL;
+ if (last) {
+ /* 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,
+ query->first_lineno);
+ return -EINVAL;
+ }
+ } else {
+ query->last_lineno = query->first_lineno;
+ }
+ return 0;
+}
+
static int check_set(const char **dest, char *src, char *name)
{
int rc = 0;
@@ -350,34 +383,8 @@ static int ddebug_parse_query(char *words[], int nwords,
UNESCAPE_SPECIAL);
rc = check_set(&query->format, words[i+1], "format");
} else if (!strcmp(words[i], "line")) {
- char *first = words[i+1];
- char *last = strchr(first, '-');
- if (query->first_lineno || query->last_lineno) {
- pr_err("match-spec: line used 2x\n");
- return -EINVAL;
- }
- if (last)
- *last++ = '\0';
- if (parse_lineno(first, &query->first_lineno) < 0)
+ if (parse_linerange(query, words[i+1]))
return -EINVAL;
- if (last) {
- /* 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,
- query->first_lineno);
- return -EINVAL;
- }
- } else {
- query->last_lineno = query->first_lineno;
- }
} else {
pr_err("unknown keyword \"%s\"\n", words[i]);
return -EINVAL;
--
2.23.0
next prev parent reply other threads:[~2019-12-10 2:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 2:27 [PATCH v4 00/16] dynamic-debug cleanups, 2 new features Jim Cromie
2019-12-10 2:27 ` [PATCH v4 01/16] dyndbg-docs: eschew file /full/path query in docs Jim Cromie
2019-12-10 2:27 ` [PATCH v4 02/16] dyndbg: drop obsolete comment on ddebug_proc_open Jim Cromie
2019-12-10 2:27 ` [PATCH v4 03/16] dyndbg: raise verbosity needed to enable ddebug_proc_* logging Jim Cromie
2019-12-10 2:27 ` [PATCH v4 04/16] dyndbg: rename __verbose section to __dyndbg Jim Cromie
2019-12-10 2:27 ` [PATCH v4 05/16] dyndbg: fix overcounting of ram used by dyndbg Jim Cromie
2019-12-10 2:27 ` [PATCH v4 06/16] dyndbg: fix a BUG_ON in ddebug_describe_flags Jim Cromie
2019-12-10 19:58 ` Jason Baron
2019-12-13 1:35 ` jim.cromie
2019-12-10 2:27 ` Jim Cromie [this message]
2019-12-10 2:27 ` [PATCH v4 08/16] dyndbg: accept 'file foo.c:func1' and 'file foo.c:10-100' Jim Cromie
2019-12-10 2:27 ` [PATCH v4 09/16] dyndbg: refactor ddebug_read_flags out of ddebug_parse_flags Jim Cromie
2019-12-10 2:27 ` [PATCH v4 10/16] dyndbg: combine flags & mask into a struct, use that Jim Cromie
2019-12-10 2:27 ` [PATCH v4 11/16] dyndbg: add filter parameter to ddebug_parse_flags Jim Cromie
2019-12-10 2:27 ` [PATCH v4 12/16] dyndbg: extend ddebug_parse_flags to accept optional filter-flags Jim Cromie
2019-12-10 2:27 ` [PATCH v4 13/16] dyndbg: prefer declarative init in caller, to memset in callee Jim Cromie
2019-12-10 2:27 ` [PATCH v4 14/16] dyndbg: add user-flag, negating-flags, and filtering on flags Jim Cromie
2019-12-10 2:27 ` [PATCH v4 15/16] dyndbg: allow negating flag-chars in modflags Jim Cromie
2019-12-10 2:27 ` [PATCH v4 16/16] dyndbg: make ddebug_tables list LIFO for add/remove_module Jim Cromie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210022742.822686-8-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=akpm@linuxfoundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).