trace-cmd library: Remove APIs for create and init output handle
These APIs are redundant, their functionality can be replaced by
existing library APIs. Removed them, to simplify the API set:
tracecmd_create_init_fd()
tracecmd_create_init_file()
Link: https://lore.kernel.org/linux-trace-devel/20211202121949.43084-5-tz.stoyanov@gmail.com
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index 7919614..069283c 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -281,9 +281,7 @@
struct tracecmd_output *tracecmd_output_create(const char *output_file);
struct tracecmd_output *tracecmd_output_create_fd(int fd);
struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus);
-struct tracecmd_output *tracecmd_create_init_fd(int fd);
-struct tracecmd_output *tracecmd_create_init_file(const char *output_file);
struct tracecmd_option *tracecmd_add_option(struct tracecmd_output *handle,
unsigned short id, int size,
const void *data);
diff --git a/lib/trace-cmd/trace-output.c b/lib/trace-cmd/trace-output.c
index 067deae..a20e42d 100644
--- a/lib/trace-cmd/trace-output.c
+++ b/lib/trace-cmd/trace-output.c
@@ -1828,42 +1828,6 @@
return out;
}
-struct tracecmd_output *tracecmd_create_init_fd(int fd)
-{
- struct tracecmd_output *out;
-
- out = tracecmd_output_create_fd(fd);
- if (!out)
- return NULL;
- if (tracecmd_output_write_init(out))
- goto error;
- if (tracecmd_output_write_headers(out, NULL))
- goto error;
-
- return out;
-error:
- tracecmd_output_close(out);
- return NULL;
-}
-
-struct tracecmd_output *tracecmd_create_init_file(const char *output_file)
-{
- struct tracecmd_output *handle;
- int fd;
-
- fd = open(output_file, O_RDWR | O_CREAT | O_TRUNC | O_LARGEFILE, 0644);
- if (fd < 0)
- return NULL;
- handle = tracecmd_create_init_fd(fd);
- if (!handle) {
- close(fd);
- unlink(output_file);
- return NULL;
- }
-
- return handle;
-}
-
/**
* tracecmd_copy - copy the headers of one trace.dat file for another
* @ihandle: input handle of the trace.dat file to copy
diff --git a/tracecmd/trace-stream.c b/tracecmd/trace-stream.c
index b47b208..ee310f3 100644
--- a/tracecmd/trace-stream.c
+++ b/tracecmd/trace-stream.c
@@ -43,11 +43,12 @@
tfd = fileno(fp);
ofd = dup(tfd);
- trace_output = tracecmd_create_init_fd(ofd);
+ trace_output = tracecmd_output_create_fd(ofd);
if (!trace_output) {
fclose(fp);
return NULL;
}
+ tracecmd_output_write_headers(trace_output, NULL);
tracecmd_output_free(trace_output);
}
