projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reuse previously allocated string when setting value
[babeltrace.git]
/
lib
/
trace-collection.c
diff --git
a/lib/trace-collection.c
b/lib/trace-collection.c
index 4f1379c5a43d73cb4e0bcae9053339bf533f7802..fa1497acbfc34897924b3e58fafda0a59c0cb6e9 100644
(file)
--- a/
lib/trace-collection.c
+++ b/
lib/trace-collection.c
@@
-155,17
+155,14
@@
static void clock_add(gpointer key, gpointer value, gpointer user_data)
* correlate this trace with at least one other clock in the trace and
* convert the index from cycles to real time.
*/
* 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;
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 = {
if (tc->array->len > 1) {
struct clock_match clock_match = {
@@
-187,6
+184,9
@@
int trace_collection_add(struct trace_collection *tc,
}
}
}
}
+ g_ptr_array_add(tc->array, trace);
+ trace->collection = tc;
+
{
struct clock_match clock_match = {
.clocks = tc->clocks,
{
struct clock_match clock_match = {
.clocks = tc->clocks,
@@
-208,8
+208,8
@@
error:
return -EPERM;
}
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;
{
if (!tc || !td)
return -EINVAL;
@@
-222,7
+222,7
@@
int trace_collection_remove(struct trace_collection *tc,
}
}
-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();
{
assert(tc);
tc->array = g_ptr_array_new();
@@
-234,10
+234,10
@@
void init_trace_collection(struct trace_collection *tc)
}
/*
}
/*
- * 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
*/
* 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);
{
assert(tc);
g_ptr_array_free(tc->array, TRUE);
This page took
0.024998 seconds
and
4
git commands to generate.