X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Ftrace-handle.c;h=4c41d2fdf8876cde8c4482c7c7d215fe369ce130;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=6ba3ec208806540e774c784eef151999c12e1c40;hpb=e3d12cf93f067601df4179ef4b7e2a30aa0065f7;p=babeltrace.git

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index 6ba3ec20..4c41d2fd 100644
--- 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>
@@ -31,6 +39,9 @@ struct bt_trace_handle *bt_trace_handle_create(struct bt_context *ctx)
 {
 	struct bt_trace_handle *th;
 
+	if (!ctx)
+		return NULL;
+
 	th = g_new0(struct bt_trace_handle, 1);
 	th->id = ctx->last_trace_handle_id++;
 	return th;
@@ -41,34 +52,72 @@ void bt_trace_handle_destroy(struct bt_trace_handle *th)
 	g_free(th);
 }
 
-int bt_trace_handle_get_id(struct bt_trace_handle *th)
-{
-	return th->id;
-}
-
 const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
 {
 	struct bt_trace_handle *handle;
 
+	if (!ctx)
+		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)
+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;
+	int ret = 0;
+
+	if (!ctx || !timestamp)
+		return -1;
 
 	handle = g_hash_table_lookup(ctx->trace_handles,
-			(gpointer) (unsigned long) handle_id);
-	return handle->timestamp_begin;
+			GUINT_TO_POINTER(handle_id));
+	if (!handle) {
+		ret = -1;
+		goto end;
+	}
+	if (type == BT_CLOCK_REAL) {
+		*timestamp = handle->real_timestamp_begin;
+	} else if (type == BT_CLOCK_CYCLES) {
+		*timestamp = handle->cycles_timestamp_begin;
+	} else {
+		ret = -1;
+	}
+
+end:
+	return ret;
 }
 
-uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx, int handle_id)
+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;
+	int ret = 0;
+
+	if (!ctx || !timestamp)
+		return -1;
 
 	handle = g_hash_table_lookup(ctx->trace_handles,
-			(gpointer) (unsigned long) handle_id);
-	return handle->timestamp_end;
+			GUINT_TO_POINTER(handle_id));
+	if (!handle) {
+		ret = -1;
+		goto end;
+	}
+	if (type == BT_CLOCK_REAL) {
+		*timestamp = handle->real_timestamp_end;
+	} else if (type == BT_CLOCK_CYCLES) {
+		*timestamp = handle->cycles_timestamp_end;
+	} else {
+		ret = -1;
+	}
+
+end:
+	return ret;
 }