From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: Sameeruddin shaik <sameeruddin.shaik8@gmail.com>
Subject: [PATCH 2/7] libtracefs: Move opening of file out of controlled_write()
Date: Mon, 22 Mar 2021 21:27:57 -0400 [thread overview]
Message-ID: <20210323013224.877520803@goodmis.org> (raw)
In-Reply-To: 20210323012755.155237800@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
In order to try multiple methods of writing to the filter file, the opening
of the filter file needs to be in the tracefs_function_filter() call, and
allow that to be passed to multiple ways of writing to the filter.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
src/tracefs-tools.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/tracefs-tools.c b/src/tracefs-tools.c
index 4f8bcdc299df..02e43168a810 100644
--- a/src/tracefs-tools.c
+++ b/src/tracefs-tools.c
@@ -389,24 +389,18 @@ void tracefs_option_clear(struct tracefs_options_mask *options, enum tracefs_opt
options->mask &= ~(1ULL << (id - 1));
}
-static int controlled_write(const char *filter_path, const char **filters,
- const char *module, bool reset, const char ***errs)
+static int controlled_write(int fd, const char **filters,
+ const char *module, const char ***errs)
{
- int flags = reset ? O_TRUNC : O_APPEND;
const char **temp = NULL;
const char **e = NULL;
char *each_str = NULL;
int write_size = 0;
int size = 0;
- int fd = -1;
int ret = 0;
int j = 0;
int i;
- fd = open(filter_path, O_WRONLY | flags);
- if (fd < 0)
- return 1;
-
for (i = 0; filters[i]; i++) {
if (module)
write_size = asprintf(&each_str, "%s:mod:%s ", filters[i], module);
@@ -449,7 +443,6 @@ static int controlled_write(const char *filter_path, const char **filters,
error:
if (each_str)
free(each_str);
- close(fd);
return ret;
}
@@ -486,6 +479,8 @@ int tracefs_function_filter(struct tracefs_instance *instance, const char **filt
{
char *ftrace_filter_path;
int ret = 0;
+ int flags;
+ int fd;
if (!filters)
return 1;
@@ -494,7 +489,16 @@ int tracefs_function_filter(struct tracefs_instance *instance, const char **filt
if (!ftrace_filter_path)
return 1;
- ret = controlled_write(ftrace_filter_path, filters, module, reset, errs);
+ flags = reset ? O_TRUNC : O_APPEND;
+
+ fd = open(ftrace_filter_path, O_WRONLY | flags);
tracefs_put_tracing_file(ftrace_filter_path);
+ if (fd < 0)
+ return 1;
+
+ ret = controlled_write(fd, filters, module, errs);
+
+ close(fd);
+
return ret;
}
--
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 ` Steven Rostedt [this message]
2021-03-23 1:27 ` [PATCH 3/7] libtracefs: Add add_errors() helper function for control_write() Steven Rostedt
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=20210323013224.877520803@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).