*
* 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/types.h>
#include <babeltrace/format.h>
+#include <babeltrace/format-internal.h>
#include <babeltrace/ctf/types.h>
#include <sys/types.h>
#include <dirent.h>
uint64_t prev_real_timestamp_end; /* End-of-last-packet timestamp in ns */
uint64_t prev_cycles_timestamp; /* Start-of-last-packet timestamp in cycles */
uint64_t prev_cycles_timestamp_end; /* End-of-last-packet timestamp in cycles */
+ char path[PATH_MAX]; /* Path to stream. '\0' for mmap traces */
};
struct ctf_event_definition {
char *func;
char *file;
uint64_t line;
+ uint64_t ip;
struct bt_list_head node;
enum { /* Fields populated mask */
CTF_CALLSITE_name = (1U << 0),
CTF_CALLSITE_func = (1U << 1),
CTF_CALLSITE_file = (1U << 2),
CTF_CALLSITE_line = (1U << 3),
+ CTF_CALLSITE_ip = (1U << 4),
} field_mask;
};
};
struct ctf_trace {
- struct trace_descriptor parent;
+ struct bt_trace_descriptor parent;
+
/* root scope */
struct declaration_scope *root_declaration_scope;
struct definition_scope *definition_scope;
GPtrArray *streams; /* Array of struct ctf_stream_declaration pointers */
struct ctf_stream_definition *metadata;
+ char *metadata_string;
+ int metadata_packetized;
GHashTable *clocks;
GHashTable *callsites;
struct ctf_clock *single_clock; /* currently supports only one clock */
- struct trace_collection *collection; /* Container of this trace */
GPtrArray *event_declarations; /* Array of all the struct bt_ctf_event_decl */
struct declaration_struct *packet_header_decl;
int dirfd;
int flags; /* open flags */
- /* Heap of streams, ordered to always get the lowest timestam */
+ /* Heap of streams, ordered to always get the lowest timestamp */
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) \
struct ctf_stream_declaration {
struct ctf_trace *trace;
- /* parent is lexical scope conaining the stream scope */
+ /* parent is lexical scope containing 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_event_declaration {
/* stream mapped by stream_id */
struct ctf_stream_declaration *stream;
- /* parent is lexical scope conaining the event scope */
+ /* parent is lexical scope containing the event scope */
struct declaration_scope *declaration_scope;
struct declaration_struct *context_decl;