This patch changes reset_max_latency() to utilize write_instance_file() for
writing set_event_pid instance file, instead of directly opening it. It also
changes the function to work per instance.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@xxxxxxxxxx>
---
tracecmd/trace-record.c | 99 ++++++++++++++++++++---------------------
1 file changed, 49 insertions(+), 50 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index bdf0c02..dfbb0cd 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -814,19 +814,49 @@ static void clear_trace(void)
fclose(fp);
}
-static void reset_max_latency(void)
+static int write_file(const char *file, const char *str, const char *type)
+{
+ char buf[BUFSIZ];
+ int fd;
+ int ret;
+
+ fd = open(file, O_WRONLY | O_TRUNC);
+ if (fd < 0)
+ die("opening to '%s'", file);
+ ret = write(fd, str, strlen(str));
+ close(fd);
+ if (ret < 0 && type) {
+ /* write failed */
+ fd = open(file, O_RDONLY);
+ if (fd < 0)
+ die("writing to '%s'", file);
+ /* the filter has the error */
+ while ((ret = read(fd, buf, BUFSIZ)) > 0)
+ fprintf(stderr, "%.*s", ret, buf);
+ die("Failed %s of %s\n", type, file);
+ close(fd);
+ }
+ return ret;
+}
+
+static int
+write_instance_file(struct buffer_instance *instance,
+ const char *file, const char *str, const char *type)
{
- FILE *fp;
char *path;
+ int ret;
- /* reset the trace */
- path = tracecmd_get_tracing_file("tracing_max_latency");
- fp = fopen(path, "w");
- if (!fp)
- die("writing to '%s'", path);
+ path = get_instance_file(instance, file);
+ ret = write_file(path, str, type);
tracecmd_put_tracing_file(path);
- fwrite("0", 1, 1, fp);
- fclose(fp);
+
+ return ret;
+}
+
+static void reset_max_latency(struct buffer_instance *instance)
+{
+ write_instance_file(instance,
+ "tracing_max_latency", "0", "max_latency");
}
static void add_filter_pid(int pid, int exclude)
@@ -1094,45 +1124,6 @@ static void update_sched_events(struct buffer_instance *instance, int pid)
static int open_instance_fd(struct buffer_instance *instance,
const char *file, int flags);
-static int write_file(const char *file, const char *str, const char *type)
-{
- char buf[BUFSIZ];
- int fd;
- int ret;
-
- fd = open(file, O_WRONLY | O_TRUNC);
- if (fd < 0)
- die("opening to '%s'", file);
- ret = write(fd, str, strlen(str));
- close(fd);
- if (ret < 0 && type) {
- /* write failed */
- fd = open(file, O_RDONLY);
- if (fd < 0)
- die("writing to '%s'", file);
- /* the filter has the error */
- while ((ret = read(fd, buf, BUFSIZ)) > 0)
- fprintf(stderr, "%.*s", ret, buf);
- die("Failed %s of %s\n", type, file);
- close(fd);
- }
- return ret;
-}
-
-static int
-write_instance_file(struct buffer_instance *instance,
- const char *file, const char *str, const char *type)
-{
- char *path;
- int ret;
-
- path = get_instance_file(instance, file);
- ret = write_file(path, str, type);
- tracecmd_put_tracing_file(path);
-
- return ret;
-}
-
static void add_event_pid(const char *buf)
{
struct buffer_instance *instance;
@@ -1931,6 +1922,14 @@ static int read_tracing_on(struct buffer_instance *instance)
return ret;
}
+static void reset_max_latency_instance(void)
+{
+ struct buffer_instance *instance;
+
+ for_all_instances(instance)
+ reset_max_latency(instance);
+}
+
void tracecmd_enable_tracing(void)
{
struct buffer_instance *instance;
@@ -1941,7 +1940,7 @@ void tracecmd_enable_tracing(void)
write_tracing_on(instance, 1);
if (latency)
- reset_max_latency();
+ reset_max_latency_instance();
}
void tracecmd_disable_tracing(void)
@@ -3801,7 +3800,6 @@ static void reset_event_pid(void)
add_event_pid("");
}
-
static void clear_triggers(void)
{
struct buffer_instance *instance;
@@ -4506,6 +4504,7 @@ void trace_reset(int argc, char **argv)
/* set clock to "local" */
reset_clock();
reset_event_pid();
+ reset_max_latency_instance();
tracecmd_remove_instances();
clear_func_filters();
/* restore tracing_on to 1 */
--
2.20.1
|