X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Ftrace-handle.c;h=d5b906aa961f5639b51f9a7c9114a19c28f58f3a;hp=050268f67fd97af9ba4eadbaab6055dbc3a09875;hb=4a6f6ed3aeb9845dec4b8ec9ca8573ed1c064187;hpb=5d95b2db86d36730ce4b7b5dffcfae32e0c21649

diff --git a/lib/trace-handle.c b/lib/trace-handle.c
index 050268f6..d5b906aa 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,15 +52,13 @@ 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);
 	if (!handle)
@@ -57,24 +66,56 @@ const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id)
 	return handle->path;
 }
 
-uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx, int handle_id)
+uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx,
+		int handle_id, enum bt_clock_type type)
 {
 	struct bt_trace_handle *handle;
+	uint64_t ret;
+
+	if (!ctx)
+		return -1ULL;
 
 	handle = g_hash_table_lookup(ctx->trace_handles,
 			(gpointer) (unsigned long) handle_id);
-	if (!handle)
-		return -1ULL;
-	return handle->timestamp_begin;
+	if (!handle) {
+		ret = -1ULL;
+		goto end;
+	}
+	if (type == BT_CLOCK_REAL) {
+		ret = handle->real_timestamp_begin;
+	} else if (type == BT_CLOCK_CYCLES) {
+		ret = handle->cycles_timestamp_begin;
+	} else {
+		ret = -1ULL;
+	}
+
+end:
+	return ret;
 }
 
-uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx, int handle_id)
+uint64_t bt_trace_handle_get_timestamp_end(struct bt_context *ctx,
+		int handle_id, enum bt_clock_type type)
 {
 	struct bt_trace_handle *handle;
+	uint64_t ret;
+
+	if (!ctx)
+		return -1ULL;
 
 	handle = g_hash_table_lookup(ctx->trace_handles,
 			(gpointer) (unsigned long) handle_id);
-	if (!handle)
-		return -1ULL;
-	return handle->timestamp_end;
+	if (!handle) {
+		ret = -1ULL;
+		goto end;
+	}
+	if (type == BT_CLOCK_REAL) {
+		ret = handle->real_timestamp_end;
+	} else if (type == BT_CLOCK_CYCLES) {
+		ret = handle->cycles_timestamp_end;
+	} else {
+		ret = -1ULL;
+	}
+
+end:
+	return ret;
 }