* by clock name.
*/
clock_b = g_hash_table_lookup(match->clocks,
- (gpointer) (unsigned long) clock_a->name);
+ GUINT_TO_POINTER(clock_a->name));
if (clock_b) {
match->clock_match = clock_b;
return;
* clocks.
*/
clock_b = g_hash_table_lookup(match->clocks,
- (gpointer) (unsigned long) clock_a->uuid);
+ GUINT_TO_POINTER(clock_a->uuid));
if (clock_b) {
match->clock_match = clock_b;
return;
}
}
-/*
- * Note: if using a frequency different from 1GHz for clock->offset, it
- * is recommended to express the seconds in offset_s, otherwise there
- * will be a loss of precision caused by the limited size of the double
- * mantissa.
- */
-static
-uint64_t clock_offset_ns(struct ctf_clock *clock)
-{
- return clock->offset_s * 1000000000ULL
- + clock_cycles_to_ns(clock, clock->offset);
-}
-
static void clock_add(gpointer key, gpointer value, gpointer user_data)
{
struct clock_match *clock_match = user_data;
struct ctf_clock *tc_clock;
tc_clock = g_hash_table_lookup(tc_clocks,
- (gpointer) (unsigned long) v);
+ GUINT_TO_POINTER(v));
if (!tc_clock) {
/*
* For now we only support CTF that has one
clock_match->tc->offset_first;
}
g_hash_table_insert(tc_clocks,
- (gpointer) (unsigned long) v,
+ GUINT_TO_POINTER(v),
value);
} else if (!t_clock->absolute) {
int64_t diff_ns;
* correlate this trace with at least one other clock in the trace and
* convert the index from cycles to real time.
*/
-int trace_collection_add(struct trace_collection *tc,
- struct trace_descriptor *td)
+int bt_trace_collection_add(struct trace_collection *tc,
+ struct bt_trace_descriptor *trace)
{
- struct ctf_trace *trace;
-
- if (!tc || !td)
+ if (!tc || !trace)
return -EINVAL;
- trace = container_of(td, struct ctf_trace, parent);
- g_ptr_array_add(tc->array, td);
- trace->collection = tc;
+ if (!trace->clocks)
+ return 0;
if (tc->array->len > 1) {
struct clock_match clock_match = {
}
}
+ g_ptr_array_add(tc->array, trace);
+ trace->collection = tc;
+
{
struct clock_match clock_match = {
.clocks = tc->clocks,
return -EPERM;
}
-int trace_collection_remove(struct trace_collection *tc,
- struct trace_descriptor *td)
+int bt_trace_collection_remove(struct trace_collection *tc,
+ struct bt_trace_descriptor *td)
{
if (!tc || !td)
return -EINVAL;
}
-void init_trace_collection(struct trace_collection *tc)
+void bt_init_trace_collection(struct trace_collection *tc)
{
assert(tc);
tc->array = g_ptr_array_new();
}
/*
- * finalize_trace_collection() closes the opened traces for read
+ * bt_finalize_trace_collection() closes the opened traces for read
* and free the memory allocated for trace collection
*/
-void finalize_trace_collection(struct trace_collection *tc)
+void bt_finalize_trace_collection(struct trace_collection *tc)
{
assert(tc);
g_ptr_array_free(tc->array, TRUE);