X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=b87718b58ddecabeaa66f7f6de0cfc3bc3701404;hb=9a3bb76ad636d5b5904e611ee8b4553d900a807c;hp=cbf074e07e76db4f03bfd028803ffbdf94745081;hpb=95febab3a71bc0d64d9ebd0ce08787d96a51d475;p=babeltrace.git diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index cbf074e0..b87718b5 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 @@ -79,11 +87,11 @@ enum bt_loglevel { }; static -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, +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); static -void ctf_text_close_trace(struct trace_descriptor *descriptor); +int ctf_text_close_trace(struct bt_trace_descriptor *descriptor); static rw_dispatch write_dispatch_table[] = { @@ -98,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, }; @@ -127,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) @@ -224,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 = @@ -547,8 +555,8 @@ error: } static -struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, +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; @@ -584,12 +592,20 @@ error: } static -void ctf_text_close_trace(struct trace_descriptor *td) +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); + if (pos->fp != stdout) { + ret = fclose(pos->fp); + if (ret) { + perror("Error on fclose"); + return -1; + } + } g_free(pos); + return 0; } static