trace-cmd: Add fd versions of some trace.dat writers

Add some verisons of tracecmd_output that allows to pass in an
already opened file descriptor.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

3 files changed, 56 insertions, 9 deletions

diff --git a/trace-cmd.h b/trace-cmd.h
index 3b68db1..1db7303 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -127,6 +127,7 @@ extern __thread struct tracecmd_input *tracecmd_curr_thread_handle;
 struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus);
 struct tracecmd_output *tracecmd_create_file(const char *output_file,
                                              int cpus, char * const *cpu_data_files);
+struct tracecmd_output *tracecmd_create_init_fd(int fd, int cpus);
 void tracecmd_output_close(struct tracecmd_output *handle);
 struct tracecmd_output *tracecmd_copy(struct tracecmd_input *ihandle,
                                       const char *file);
@@ -137,6 +138,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,
 
 void tracecmd_free_recorder(struct tracecmd_recorder *recorder);
 struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu);
+struct tracecmd_recorder *tracecmd_create_recorder_fd(int fd, int cpu);
 int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep);
 void tracecmd_stop_recording(struct tracecmd_recorder *recorder);
 void tracecmd_stat_cpu(struct trace_seq *s, int cpu);
diff --git a/trace-output.c b/trace-output.c
index a59099d..a45265d 100644
--- a/trace-output.c
+++ b/trace-output.c
@@ -520,8 +520,8 @@ static int read_ftrace_printk(struct tracecmd_output *handle)
         return 0;
 }
 
-static struct tracecmd_output *create_file(const char *output_file, int cpus,
-                                           struct tracecmd_input *ihandle)
+static struct tracecmd_output *
+create_file_fd(int fd, int cpus, struct tracecmd_input *ihandle)
 {
         struct tracecmd_output *handle;
         unsigned long long endian8;
@@ -539,9 +539,7 @@ static struct tracecmd_output *create_file(const char *output_file, int cpus,
                 return NULL;
         memset(handle, 0, sizeof(*handle));
 
-        handle->fd = open(output_file, O_RDWR | O_CREAT | O_TRUNC | O_LARGEFILE, 0644);
-        if (handle->fd < 0)
-                goto out_free;
+        handle->fd = fd;
 
         buf[0] = 23;
         buf[1] = 8;
@@ -631,6 +629,25 @@ static struct tracecmd_output *create_file(const char *output_file, int cpus,
         return NULL;
 }
 
+static struct tracecmd_output *create_file(const char *output_file, int cpus,
+                                           struct tracecmd_input *ihandle)
+{
+        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 = create_file_fd(fd, cpus, ihandle);
+        if (!handle) {
+                close(fd);
+                unlink(output_file);
+        }
+
+        return handle;
+}
+
 struct tracecmd_output *tracecmd_create_file_latency(const char *output_file, int cpus)
 {
         struct tracecmd_output *handle;
@@ -760,6 +777,18 @@ struct tracecmd_output *tracecmd_create_file(const char *output_file,
         return handle;
 }
 
+struct tracecmd_output *
+tracecmd_create_init_fd(int fd, int cpus)
+{
+        struct tracecmd_output *handle;
+
+        handle = create_file_fd(fd, cpus, NULL);
+        if (!handle)
+                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/trace-record.c b/trace-record.c
index 8317320..cdfc857 100644
--- a/trace-record.c
+++ b/trace-record.c
@@ -56,7 +56,7 @@ void tracecmd_free_recorder(struct tracecmd_recorder *recorder)
         free(recorder);
 }
 
-struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu)
+struct tracecmd_recorder *tracecmd_create_recorder_fd(int fd, int cpu)
 {
         struct tracecmd_recorder *recorder;
         char *tracing = NULL;
@@ -76,9 +76,7 @@ struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu)
 
         recorder->page_size = getpagesize();
 
-        recorder->fd = open(file, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, 0644);
-        if (recorder->fd < 0)
-                goto out_free;
+        recorder->fd = fd;
 
         tracing = tracecmd_find_tracing_dir();
         if (!tracing) {
@@ -112,6 +110,24 @@ struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu)
         return NULL;
 }
 
+struct tracecmd_recorder *tracecmd_create_recorder(const char *file, int cpu)
+{
+        struct tracecmd_recorder *recorder;
+        int fd;
+
+        fd = open(file, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, 0644);
+        if (recorder->fd < 0)
+                return NULL;
+
+        recorder = tracecmd_create_recorder_fd(fd, cpu);
+        if (!recorder) {
+                close(fd);
+                unlink(file);
+        }
+
+        return recorder;
+}
+
 int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long sleep)
 {
         struct timespec req;