Move clock to bt_trace_descriptor

[babeltrace.git] / lib / trace-collection.c

diff --git a/lib/trace-collection.c b/lib/trace-collection.c
index 9b60986f5018e98c54e870c471cf498d36d79839..b854c97440422b009ce12111d54f136f94431515 100644 (file)
--- a/lib/trace-collection.c
+++ b/lib/trace-collection.c
@@ -16,6 +16,14 @@
  *
  * 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/babeltrace.h>
 #include <babeltrace/format.h>
@@ -147,18 +155,12 @@ 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.
  */
-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 (tc->array->len > 1) {
                struct clock_match clock_match = {
                        .clocks = tc->clocks,
@@ -179,6 +181,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,
@@ -200,8 +205,8 @@ error:
        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;
@@ -214,7 +219,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();
@@ -226,10 +231,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
  */
-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);