Version 1.0.0-rc6

[babeltrace.git] / formats / ctf-text / ctf-text.c

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 4f46427be5ec38bb5fce23e4a905267486fa12a4..8a8e7c3c104651cfb21ac95e42fa294117a378f2 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -78,11 +78,12 @@ enum bt_loglevel {
         BT_LOGLEVEL_DEBUG                  = 14,
 };
 
-
+static
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
                void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp);
-void ctf_text_close_trace(struct trace_descriptor *descriptor);
+static
+int ctf_text_close_trace(struct trace_descriptor *descriptor);
 
 static
 rw_dispatch write_dispatch_table[] = {
@@ -119,7 +120,7 @@ void __attribute__((constructor)) init_quarks(void)
 }
 
 static
-struct ctf_callsite *ctf_trace_callsite_lookup(struct ctf_trace *trace,
+struct ctf_callsite_dups *ctf_trace_callsite_lookup(struct ctf_trace *trace,
                        GQuark callsite_name)
 {
        return g_hash_table_lookup(trace->callsites,
@@ -409,20 +410,36 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
                dom_print = 1;
        }
        if ((opt_callsite_field || opt_all_fields)) {
+               struct ctf_callsite_dups *cs_dups;
                struct ctf_callsite *callsite;
 
-               callsite = ctf_trace_callsite_lookup(stream_class->trace,
+               cs_dups = ctf_trace_callsite_lookup(stream_class->trace,
                                event_class->name);
-               if (callsite) {
+               if (cs_dups) {
+                       int i = 0;
+
                        set_field_names_print(pos, ITEM_HEADER);
                        if (pos->print_names) {
                                fprintf(pos->fp, "callsite = ");
                        } else if (dom_print) {
                                fprintf(pos->fp, ":");
                        }
-                       fprintf(pos->fp, "[%s@%s:%" PRIu64 "]",
-                               callsite->func, callsite->file,
-                               callsite->line);
+                       fprintf(pos->fp, "[");
+                       bt_list_for_each_entry(callsite, &cs_dups->head, node) {
+                               if (i != 0)
+                                       fprintf(pos->fp, ",");
+                               if (CTF_CALLSITE_FIELD_IS_SET(callsite, ip)) {
+                                       fprintf(pos->fp, "%s@0x%" PRIx64 ":%s:%" PRIu64 "",
+                                               callsite->func, callsite->ip, callsite->file,
+                                               callsite->line);
+                               } else {
+                                       fprintf(pos->fp, "%s:%s:%" PRIu64 "",
+                                               callsite->func, callsite->file,
+                                               callsite->line);
+                               }
+                               i++;
+                       }
+                       fprintf(pos->fp, "]");
                        if (pos->print_names)
                                fprintf(pos->fp, ", ");
                        dom_print = 1;
@@ -529,7 +546,7 @@ error:
        return ret;
 }
 
-
+static
 struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
                void (*packet_seek)(struct stream_pos *pos, size_t index,
                        int whence), FILE *metadata_fp)
@@ -566,14 +583,22 @@ error:
        return NULL;
 }
 
-void ctf_text_close_trace(struct trace_descriptor *td)
+static
+int ctf_text_close_trace(struct trace_descriptor *td)
 {
+       int ret;
        struct ctf_text_stream_pos *pos =
                container_of(td, struct ctf_text_stream_pos, trace_descriptor);
-       fclose(pos->fp);
+       ret = fclose(pos->fp);
+       if (ret) {
+               perror("Error on fclose");
+               return -1;
+       }
        g_free(pos);
+       return 0;
 }
 
+static
 void __attribute__((constructor)) ctf_text_init(void)
 {
        int ret;
@@ -583,4 +608,8 @@ void __attribute__((constructor)) ctf_text_init(void)
        assert(!ret);
 }
 
-/* TODO: finalize */
+static
+void __attribute__((destructor)) ctf_text_exit(void)
+{
+       bt_unregister_format(&ctf_text_format);
+}