From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: Sameeruddin shaik <sameeruddin.shaik8@gmail.com>
Subject: [PATCH 3/7] libtracefs: Add add_errors() helper function for control_write()
Date: Mon, 22 Mar 2021 21:27:58 -0400 [thread overview]
Message-ID: <20210323013225.012918584@goodmis.org> (raw)
In-Reply-To: 20210323012755.155237800@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Move the code that manages errors out of control_write() as this will be
used by other methods in setting the filters.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
src/tracefs-tools.c | 61 ++++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 28 deletions(-)
diff --git a/src/tracefs-tools.c b/src/tracefs-tools.c
index 02e43168a810..1348542a3419 100644
--- a/src/tracefs-tools.c
+++ b/src/tracefs-tools.c
@@ -389,16 +389,40 @@ void tracefs_option_clear(struct tracefs_options_mask *options, enum tracefs_opt
options->mask &= ~(1ULL << (id - 1));
}
+static void add_errors(const char ***errs, const char *filter, int ret)
+{
+ const char **e;
+
+ if (!errs)
+ return;
+
+ /* Negative is passed in */
+ ret = -ret;
+ e = *errs;
+
+ /* If this previously failed to allocate stop processing */
+ if (!e && ret)
+ return;
+
+ /* Add 2, one for the new entry, and one for NULL */
+ e = realloc(e, sizeof(*e) * (ret + 2));
+ if (!e) {
+ free(*errs);
+ *errs = NULL;
+ return;
+ }
+ e[ret] = filter;
+ e[ret + 1] = NULL;
+ *errs = e;
+}
+
static int controlled_write(int fd, const char **filters,
const char *module, const char ***errs)
{
- const char **temp = NULL;
- const char **e = NULL;
char *each_str = NULL;
int write_size = 0;
int size = 0;
int ret = 0;
- int j = 0;
int i;
for (i = 0; filters[i]; i++) {
@@ -412,34 +436,11 @@ static int controlled_write(int fd, const char **filters,
}
size = write(fd, each_str, write_size);
/* compare written bytes*/
- if (size < write_size) {
- if (errs) {
- temp = realloc(e, (j + 1) * (sizeof(char *)));
- if (!temp) {
- free(e);
- ret = 1;
- goto error;
- } else
- e = temp;
-
- e[j++] = filters[i];
- ret -= 1;
- }
- }
+ if (size < write_size)
+ add_errors(errs, filters[i], ret--);
free(each_str);
each_str = NULL;
}
- if (errs) {
- temp = realloc(e, (j + 1) * (sizeof(char *)));
- if (!temp) {
- free(e);
- ret = 1;
- goto error;
- } else
- e = temp;
- e[j] = NULL;
- *errs = e;
- }
error:
if (each_str)
free(each_str);
@@ -496,6 +497,10 @@ int tracefs_function_filter(struct tracefs_instance *instance, const char **filt
if (fd < 0)
return 1;
+ /* Make sure errs is NULL to start with, realloc() depends on it. */
+ if (errs)
+ *errs = NULL;
+
ret = controlled_write(fd, filters, module, errs);
close(fd);
--
2.30.1
next prev parent reply other threads:[~2021-03-23 1:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 1:27 [PATCH 0/7] libtracfes: Add tracefs_function_filter() Steven Rostedt
2021-03-23 1:27 ` [PATCH 1/7] libtracefs: An API to set the filtering of functions Steven Rostedt
2021-03-23 1:27 ` [PATCH 2/7] libtracefs: Move opening of file out of controlled_write() Steven Rostedt
2021-03-23 1:27 ` Steven Rostedt [this message]
2021-03-23 1:27 ` [PATCH 4/7] libtracefs: Add checking of available_filter_functions to tracefs_function_filter() Steven Rostedt
2021-03-23 1:28 ` [PATCH 5/7] libtracefs: Add write_filter() helper function Steven Rostedt
2021-03-23 1:28 ` [PATCH 6/7] libtracefs: Allow for setting filters with regex expressions Steven Rostedt
2021-03-23 1:28 ` [PATCH 7/7] libtracefs: Add indexing to set functions in tracefs_function_filter() Steven Rostedt
2021-03-23 12:52 ` [PATCH 0/7] libtracfes: Add tracefs_function_filter() Steven Rostedt
2021-03-24 10:13 ` Sameeruddin Shaik
2021-03-24 14:08 ` Steven Rostedt
2021-03-26 0:25 ` sameeruddin shaik
2021-03-25 0:35 ` Steven Rostedt
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=20210323013225.012918584@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=sameeruddin.shaik8@gmail.com \
/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).