ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

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

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index f981adda410ab19266c2213c6ce50cae09a0b73d..4c41d2fdf8876cde8c4482c7c7d215fe369ce130 100644 (file)
--- a/lib/trace-handle.c
+++ b/lib/trace-handle.c
@@ -17,6 +17,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 <stdint.h>
@@ -44,14 +52,6 @@ void bt_trace_handle_destroy(struct bt_trace_handle *th)
        g_free(th);
 }
 
-int bt_trace_handle_get_id(struct bt_trace_handle *th)
-{
-       if (!th)
-               return -1;
-
-       return th->id;
-}
-
 const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
 {
        struct bt_trace_handle *handle;
@@ -60,60 +60,62 @@ const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
                return NULL;
 
        handle = g_hash_table_lookup(ctx->trace_handles,
-                       (gpointer) (unsigned long) handle_id);
+                       GUINT_TO_POINTER(handle_id));
        if (!handle)
                return NULL;
        return handle->path;
 }
 
-uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
-               int handle_id, enum bt_clock_type type)
+int bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
+               int handle_id, enum bt_clock_type type,
+               int64_t *timestamp)
 {
        struct bt_trace_handle *handle;
-       uint64_t ret;
+       int ret = 0;
 
-       if (!ctx)
-               return -1ULL;
+       if (!ctx || !timestamp)
+               return -1;
 
        handle = g_hash_table_lookup(ctx->trace_handles,
-                       (gpointer) (unsigned long) handle_id);
+                       GUINT_TO_POINTER(handle_id));
        if (!handle) {
-               ret = -1ULL;
+               ret = -1;
                goto end;
        }
        if (type == BT_CLOCK_REAL) {
-               ret = handle->real_timestamp_begin;
+               *timestamp = handle->real_timestamp_begin;
        } else if (type == BT_CLOCK_CYCLES) {
-               ret = handle->cycles_timestamp_begin;
+               *timestamp = handle->cycles_timestamp_begin;
        } else {
-               ret = -1ULL;
+               ret = -1;
        }
 
 end:
        return ret;
 }
 
-uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
-               int handle_id, enum bt_clock_type type)
+int bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
+               int handle_id, enum bt_clock_type type,
+               int64_t *timestamp)
 {
        struct bt_trace_handle *handle;
-       uint64_t ret;
+       int ret = 0;
 
-       if (!ctx)
-               return -1ULL;
+       if (!ctx || !timestamp)
+               return -1;
 
        handle = g_hash_table_lookup(ctx->trace_handles,
-                       (gpointer) (unsigned long) handle_id);
+                       GUINT_TO_POINTER(handle_id));
        if (!handle) {
-               ret = -1ULL;
+               ret = -1;
                goto end;
        }
        if (type == BT_CLOCK_REAL) {
-               ret = handle->real_timestamp_end;
+               *timestamp = handle->real_timestamp_end;
        } else if (type == BT_CLOCK_CYCLES) {
-               ret = handle->cycles_timestamp_end;
+               *timestamp = handle->cycles_timestamp_end;
        } else {
-               ret = -1ULL;
+               ret = -1;
        }
 
 end: