Clean-up: coding style adjustments

[babeltrace.git] / plugins / ctf / fs-sink / write.c

diff --git a/plugins/ctf/fs-sink/write.c b/plugins/ctf/fs-sink/write.c
index f6dff143a41a4b5fc6da241bc8688182e223db23..b3ad7462eb4f43caeb3a46471b25238833f4304a 100644 (file)
--- a/plugins/ctf/fs-sink/write.c
+++ b/plugins/ctf/fs-sink/write.c
@@ -53,11 +53,13 @@ void unref_stream(struct bt_ctf_stream_class *writer_stream)
        bt_put(writer_stream);
 }
 
+static
 gboolean empty_ht(gpointer key, gpointer value, gpointer user_data)
 {
        return TRUE;
 }
 
+static
 gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
 {
        struct bt_ctf_stream *writer_stream = value;
@@ -67,11 +69,13 @@ gboolean empty_streams_ht(gpointer key, gpointer value, gpointer user_data)
        return TRUE;
 }
 
+static
 void destroy_stream_state_key(gpointer key)
 {
        g_free((enum fs_writer_stream_state *) key);
 }
 
+static
 void check_completed_trace(gpointer key, gpointer value, gpointer user_data)
 {
        enum fs_writer_stream_state *state = value;
@@ -177,6 +181,49 @@ enum fs_writer_stream_state *insert_new_stream_state(
        return v;
 }
 
+/*
+ * Make sure the output path is valid for a single trace: either it does
+ * not exists or it is empty.
+ *
+ * Return 0 if the path is valid, -1 otherwise.
+ */
+static
+bool valid_single_trace_path(const char *path)
+{
+       int n = 0;
+       struct dirent *d;
+       DIR *dir = opendir(path);
+       int ret;
+
+       /* Non-existent directory. */
+       if (!dir) {
+               ret = 0;
+               goto end;
+       }
+
+       while ((d = readdir(dir)) != NULL) {
+               /* Ignore "." and ".." directories. */
+               if (++n > 2) {
+                       break;
+               }
+       }
+
+       ret = closedir(dir);
+       if (ret) {
+               perror("closedir");
+               goto end;
+       }
+
+       if (n <= 2) {
+               ret = 0;
+       } else {
+               ret = -1;
+       }
+
+end:
+       return ret;
+}
+
 static
 int make_trace_path(struct writer_component *writer_component,
                struct bt_ctf_trace *trace, char *trace_path)
@@ -184,11 +231,14 @@ int make_trace_path(struct writer_component *writer_component,
        int ret;
        const char *trace_name;
 
-       trace_name = bt_ctf_trace_get_name(trace);
-       if (!trace_name) {
-               trace_name = writer_component->trace_name_base->str;
+       if (writer_component->single_trace) {
+               trace_name = "\0";
+       } else {
+               trace_name = bt_ctf_trace_get_name(trace);
+               if (!trace_name) {
+                       trace_name = writer_component->trace_name_base->str;
+               }
        }
-       /* XXX: we might have to skip the first level, TBD. */
 
        /* Sanitize the trace name. */
        if (strlen(trace_name) == 2 && !strcmp(trace_name, "..")) {
@@ -208,22 +258,34 @@ int make_trace_path(struct writer_component *writer_component,
        snprintf(trace_path, PATH_MAX, "%s/%s",
                        writer_component->base_path->str,
                        trace_name);
-       if (g_file_test(trace_path, G_FILE_TEST_EXISTS)) {
-               int i = 0;
-               do {
-                       snprintf(trace_path, PATH_MAX, "%s/%s-%d",
-                                       writer_component->base_path->str,
-                                       trace_name, ++i);
-               } while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX);
-               if (i == INT_MAX) {
-                       fprintf(writer_component->err, "[error] Unable to find "
-                                       "a unique trace path\n");
+       /*
+        * Append a suffix if the trace_path exists and we are not in
+        * single-trace mode.
+        */
+       if (writer_component->single_trace) {
+               if (valid_single_trace_path(trace_path) != 0) {
+                       fprintf(writer_component->err,
+                                       "[error] Invalid output directory\n");
                        goto error;
                }
+       } else {
+               if (g_file_test(trace_path, G_FILE_TEST_EXISTS)) {
+                       int i = 0;
+
+                       do {
+                               snprintf(trace_path, PATH_MAX, "%s/%s-%d",
+                                               writer_component->base_path->str,
+                                               trace_name, ++i);
+                       } while (g_file_test(trace_path, G_FILE_TEST_EXISTS) && i < INT_MAX);
+                       if (i == INT_MAX) {
+                               fprintf(writer_component->err, "[error] Unable to find "
+                                               "a unique trace path\n");
+                               goto error;
+                       }
+               }
        }
 
        ret = 0;
-
        goto end;
 
 error:
@@ -245,6 +307,13 @@ struct fs_writer *insert_new_writer(
        struct fs_writer *fs_writer = NULL;
        int nr_stream, i;
 
+       if (writer_component->single_trace && writer_component->nr_traces > 0) {
+               fprintf(writer_component->err, "[error] Trying to process more "
+                               "than one trace but --single-trace mode "
+                               "enabled\n");
+               goto error;
+       }
+
        ret = make_trace_path(writer_component, trace, trace_path);
        if (ret) {
                fprintf(writer_component->err, "[error] %s in %s:%d\n",
@@ -327,6 +396,7 @@ struct fs_writer *insert_new_writer(
                fs_writer->static_listener_id = ret;
        }
 
+       writer_component->nr_traces++;
        g_hash_table_insert(writer_component->trace_map, (gpointer) trace,
                        fs_writer);
 
@@ -500,7 +570,7 @@ BT_HIDDEN
 void writer_close(struct writer_component *writer_component,
                struct fs_writer *fs_writer)
 {
-       if (fs_writer->static_listener_id > 0) {
+       if (fs_writer->static_listener_id >= 0) {
                bt_ctf_trace_remove_is_static_listener(fs_writer->trace,
                                fs_writer->static_listener_id);
        }
@@ -644,7 +714,6 @@ enum bt_component_status writer_new_packet(
                struct bt_ctf_packet *packet)
 {
        struct bt_ctf_stream *stream = NULL, *writer_stream = NULL;
-       struct bt_ctf_field *writer_packet_context = NULL;
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        int int_ret;
 
@@ -663,23 +732,21 @@ enum bt_component_status writer_new_packet(
        }
        BT_PUT(stream);
 
-       writer_packet_context = ctf_copy_packet_context(writer_component->err,
-                       packet, writer_stream);
-       if (!writer_packet_context) {
+       int_ret = ctf_stream_copy_packet_context(
+                       writer_component->err, packet, writer_stream);
+       if (int_ret < 0) {
                fprintf(writer_component->err, "[error] %s in %s:%d\n",
                                __func__, __FILE__, __LINE__);
                goto error;
        }
 
-       int_ret = bt_ctf_stream_set_packet_context(writer_stream,
-                       writer_packet_context);
-       if (int_ret < 0) {
-               fprintf(writer_component->err, "[error] %s in %s:%d\n", __func__,
-                               __FILE__, __LINE__);
+       ret = ctf_stream_copy_packet_header(writer_component->err,
+                       packet, writer_stream);
+       if (ret != 0) {
+               fprintf(writer_component->err, "[error] %s in %s:%d\n",
+                               __func__, __FILE__, __LINE__);
                goto error;
        }
-       BT_PUT(writer_stream);
-       BT_PUT(writer_packet_context);
 
        goto end;
 
@@ -687,7 +754,6 @@ error:
        ret = BT_COMPONENT_STATUS_ERROR;
 end:
        bt_put(writer_stream);
-       bt_put(writer_packet_context);
        bt_put(stream);
        return ret;
 }