*
* 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>
#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-debuginfo.h>
#include <inttypes.h>
#include <sys/mman.h>
#include <errno.h>
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[] = {
};
static
-struct format ctf_text_format = {
+struct bt_format ctf_text_format = {
.open_trace = ctf_text_open_trace,
.close_trace = ctf_text_close_trace,
};
Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
- Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+ Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+ Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
static
void __attribute__((constructor)) init_quarks(void)
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_static_string("stream.packet.context.events_discarded");
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_static_string("stream.packet.context.content_size");
Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
+ Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM = g_quark_from_static_string("stream.packet.context.packet_seq_num");
}
static
(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)
return 0;
if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
return 0;
+ if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+ return 0;
return 1;
}
}
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 =
container_of(ppos, struct ctf_text_stream_pos, parent);
return -EINVAL;
}
- /* Print events discarded */
- if (stream->events_discarded) {
- fflush(pos->fp);
- fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
- stream->events_discarded);
- if (opt_clock_cycles) {
- ctf_print_timestamp(stderr, stream,
- stream->prev_cycles_timestamp);
- fprintf(stderr, "] and [");
- ctf_print_timestamp(stderr, stream,
- stream->prev_cycles_timestamp_end);
- } else {
- ctf_print_timestamp(stderr, stream,
- stream->prev_real_timestamp);
- fprintf(stderr, "] and [");
- ctf_print_timestamp(stderr, stream,
- stream->prev_real_timestamp_end);
- }
- fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
- fflush(stderr);
- stream->events_discarded = 0;
- }
+ handle_debug_info_event(stream_class, event);
if (stream->has_timestamp) {
set_field_names_print(pos, ITEM_HEADER);
else
fprintf(pos->fp, " ");
}
- if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) {
+ if (opt_delta_field && stream->has_timestamp) {
uint64_t delta, delta_sec, delta_nsec;
set_field_names_print(pos, ITEM_HEADER);
pos->last_cycles_timestamp = stream->cycles_timestamp;
}
- if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+ if ((opt_trace_field || opt_all_fields) && stream_class->trace->parent.path[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace = ");
}
- fprintf(pos->fp, "%s", stream_class->trace->path);
+ fprintf(pos->fp, "%s", stream_class->trace->parent.path);
if (pos->print_names)
fprintf(pos->fp, ", ");
else
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;
pos->fp = fp;
pos->parent.rw_table = write_dispatch_table;
pos->parent.event_cb = ctf_text_write_event;
+ pos->parent.trace = &pos->trace_descriptor;
pos->print_names = 0;
+ babeltrace_ctf_console_output++;
break;
case O_RDONLY:
default:
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);
+
+ babeltrace_ctf_console_output--;
+ if (pos->fp != stdout) {
+ 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;
assert(!ret);
}
-/* TODO: finalize */
+static
+void __attribute__((destructor)) ctf_text_exit(void)
+{
+ bt_unregister_format(&ctf_text_format);
+}
projects / babeltrace.git / blobdiff