X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=e9fd74180dcd9594d7a5a07b35ef6207c67e7ebb;hp=67400f513c7fffad32ac89ea96050679e4df3fa0;hb=0d69b916c5ba44b63a26aa038d416d6ee286306b;hpb=c5ff71a3430f00d29c0c6d133ee38dcfe7e4d20a

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 67400f51..e9fd7418 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,
 };
 
-
-struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-		void (*packet_seek)(struct stream_pos *pos, size_t index,
+static
+struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+		void (*packet_seek)(struct bt_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 bt_trace_descriptor *descriptor);
 
 static
 rw_dispatch write_dispatch_table[] = {
@@ -97,7 +106,7 @@ rw_dispatch write_dispatch_table[] = {
 };
 
 static
-struct format ctf_text_format = {
+struct bt_format ctf_text_format = {
 	.open_trace = ctf_text_open_trace,
 	.close_trace = ctf_text_close_trace,
 };
@@ -126,7 +135,7 @@ struct ctf_callsite_dups *ctf_trace_callsite_lookup(struct ctf_trace *trace,
 			(gpointer) (unsigned long) callsite_name);
 }
 
-int print_field(struct definition *definition)
+int print_field(struct bt_definition *definition)
 {
 	/* Print all fields in verbose mode */
 	if (babeltrace_verbose)
@@ -223,7 +232,7 @@ const char *print_loglevel(int value)
 }
 
 static
-int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
+int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
 			 
 {
 	struct ctf_text_stream_pos *pos =
@@ -427,9 +436,15 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
 			bt_list_for_each_entry(callsite, &cs_dups->head, node) {
 				if (i != 0)
 					fprintf(pos->fp, ",");
-				fprintf(pos->fp, "%s@%s:%" PRIu64 "",
-					callsite->func, callsite->file,
-					callsite->line);
+				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, "]");
@@ -539,9 +554,9 @@ error:
 	return ret;
 }
 
-
-struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
-		void (*packet_seek)(struct stream_pos *pos, size_t index,
+static
+struct bt_trace_descriptor *ctf_text_open_trace(const char *path, int flags,
+		void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
 			int whence), FILE *metadata_fp)
 {
 	struct ctf_text_stream_pos *pos;
@@ -576,14 +591,22 @@ error:
 	return NULL;
 }
 
-void ctf_text_close_trace(struct trace_descriptor *td)
+static
+int ctf_text_close_trace(struct bt_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;
@@ -593,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);
+}