projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ctf_event to ctf_event_declaration
[babeltrace.git]
/
include
/
babeltrace
/
ctf-ir
/
metadata.h
diff --git
a/include/babeltrace/ctf-ir/metadata.h
b/include/babeltrace/ctf-ir/metadata.h
index d445a011c0bc2740a337e721b2e1873a190515d6..bd5288a7088e079e47fc8ae01632350ccdcbd7a1 100644
(file)
--- a/
include/babeltrace/ctf-ir/metadata.h
+++ b/
include/babeltrace/ctf-ir/metadata.h
@@
-24,37
+24,42
@@
#include <babeltrace/ctf/types.h>
#include <sys/types.h>
#include <dirent.h>
#include <babeltrace/ctf/types.h>
#include <sys/types.h>
#include <dirent.h>
-#include <
uuid
/uuid.h>
+#include <
babeltrace
/uuid.h>
#include <assert.h>
#include <glib.h>
struct ctf_trace;
#include <assert.h>
#include <glib.h>
struct ctf_trace;
-struct ctf_stream_class;
-struct ctf_stream;
-struct ctf_event;
-
-struct ctf_stream {
- struct ctf_stream_class *stream_class;
+struct ctf_stream_declaration;
+struct ctf_stream_definition;
+struct ctf_event_declaration;
+struct ctf_stream_definition;
+struct ctf_clock;
+
+struct ctf_stream_definition {
+ struct ctf_stream_declaration *stream_class;
uint64_t timestamp; /* Current timestamp, in ns */
uint64_t event_id; /* Current event ID */
int has_timestamp;
uint64_t stream_id;
uint64_t timestamp; /* Current timestamp, in ns */
uint64_t event_id; /* Current event ID */
int has_timestamp;
uint64_t stream_id;
+ int consumed; /* Last packet used by caller */
struct definition_struct *trace_packet_header;
struct definition_struct *stream_packet_context;
struct definition_struct *stream_event_header;
struct definition_struct *stream_event_context;
struct definition_struct *trace_packet_header;
struct definition_struct *stream_packet_context;
struct definition_struct *stream_event_header;
struct definition_struct *stream_event_context;
- GPtrArray *events_by_id; /* Array of struct ctf_
stream_event
pointers indexed by id */
+ GPtrArray *events_by_id; /* Array of struct ctf_
event_definition
pointers indexed by id */
struct definition_scope *parent_def_scope; /* for initialization */
int stream_definitions_created;
struct definition_scope *parent_def_scope; /* for initialization */
int stream_definitions_created;
+ struct ctf_clock *current_clock;
+
/* Event discarded information */
uint32_t events_discarded;
uint64_t prev_timestamp; /* Last event */
uint64_t prev_timestamp_end; /* End-of-packet timestamp */
};
/* Event discarded information */
uint32_t events_discarded;
uint64_t prev_timestamp; /* Last event */
uint64_t prev_timestamp_end; /* End-of-packet timestamp */
};
-struct ctf_
stream_event
{
+struct ctf_
event_definition
{
struct definition_struct *event_context;
struct definition_struct *event_fields;
};
struct definition_struct *event_context;
struct definition_struct *event_fields;
};
@@
-91,6
+96,7
@@
struct ctf_clock {
enum { /* Fields populated mask */
CTF_CLOCK_name = (1U << 0),
enum { /* Fields populated mask */
CTF_CLOCK_name = (1U << 0),
+ CTF_CLOCK_freq = (1U << 1),
} field_mask;
};
} field_mask;
};
@@
-130,16
+136,17
@@
struct ctf_trace {
struct declaration_scope *declaration_scope;
/* innermost definition scope. to be used as parent of stream. */
struct definition_scope *definition_scope;
struct declaration_scope *declaration_scope;
/* innermost definition scope. to be used as parent of stream. */
struct definition_scope *definition_scope;
- GPtrArray *streams; /* Array of struct ctf_stream_
class
pointers */
- struct ctf_stream *metadata;
+ GPtrArray *streams; /* Array of struct ctf_stream_
declaration
pointers */
+ struct ctf_stream
_definition
*metadata;
GHashTable *clocks;
GHashTable *clocks;
+ struct ctf_clock *single_clock; /* currently supports only one clock */
struct trace_collection *collection; /* Container of this trace */
struct declaration_struct *packet_header_decl;
uint64_t major;
uint64_t minor;
struct trace_collection *collection; /* Container of this trace */
struct declaration_struct *packet_header_decl;
uint64_t major;
uint64_t minor;
- u
uid_t uuid
;
+ u
nsigned char uuid[BABELTRACE_UUID_LEN]
;
int byte_order; /* trace BYTE_ORDER. 0 if unset. */
struct ctf_tracer_env env;
int byte_order; /* trace BYTE_ORDER. 0 if unset. */
struct ctf_tracer_env env;
@@
-159,6
+166,9
@@
struct ctf_trace {
/* Heap of streams, ordered to always get the lowest timestam */
struct ptr_heap *stream_heap;
char path[PATH_MAX];
/* Heap of streams, ordered to always get the lowest timestam */
struct ptr_heap *stream_heap;
char path[PATH_MAX];
+
+ struct bt_context *ctx;
+ struct bt_trace_handle *handle;
};
#define CTF_STREAM_SET_FIELD(ctf_stream, field) \
};
#define CTF_STREAM_SET_FIELD(ctf_stream, field) \
@@
-175,13
+185,13
@@
struct ctf_trace {
(ctf_stream)->(field); \
})
(ctf_stream)->(field); \
})
-struct ctf_stream_
class
{
+struct ctf_stream_
declaration
{
struct ctf_trace *trace;
/* parent is lexical scope conaining the stream scope */
struct declaration_scope *declaration_scope;
/* innermost definition scope. to be used as parent of event. */
struct definition_scope *definition_scope;
struct ctf_trace *trace;
/* parent is lexical scope conaining the stream scope */
struct declaration_scope *declaration_scope;
/* innermost definition scope. to be used as parent of event. */
struct definition_scope *definition_scope;
- GPtrArray *events_by_id; /* Array of struct ctf_event pointers indexed by id */
+ GPtrArray *events_by_id; /* Array of struct ctf_event
_declaration
pointers indexed by id */
GHashTable *event_quark_to_id; /* GQuark to numeric id */
struct declaration_struct *packet_context_decl;
GHashTable *event_quark_to_id; /* GQuark to numeric id */
struct declaration_struct *packet_context_decl;
@@
-194,7
+204,7
@@
struct ctf_stream_class {
CTF_STREAM_stream_id = (1 << 0),
} field_mask;
CTF_STREAM_stream_id = (1 << 0),
} field_mask;
- GPtrArray *streams; /* Array of struct ctf_stream pointers */
+ GPtrArray *streams; /* Array of struct ctf_stream
_definition
pointers */
};
#define CTF_EVENT_SET_FIELD(ctf_event, field) \
};
#define CTF_EVENT_SET_FIELD(ctf_event, field) \
@@
-211,9
+221,9
@@
struct ctf_stream_class {
(ctf_event)->(field); \
})
(ctf_event)->(field); \
})
-struct ctf_event {
+struct ctf_event
_declaration
{
/* stream mapped by stream_id */
/* stream mapped by stream_id */
- struct ctf_stream_
class
*stream;
+ struct ctf_stream_
declaration
*stream;
/* parent is lexical scope conaining the event scope */
struct declaration_scope *declaration_scope;
/* parent is lexical scope conaining the event scope */
struct declaration_scope *declaration_scope;
This page took
0.024961 seconds
and
4
git commands to generate.