X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=d344c1c0ce7d193532165bec1cd02456a9cdb57c;hp=4f46427be5ec38bb5fce23e4a905267486fa12a4;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=f133896d405417ba90ac250d243d4b8e539e98f1

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 4f46427b..d344c1c0 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/format.h>
@@ -78,11 +86,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 +128,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 +418,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 +554,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 +591,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 +616,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);
+}