Revert "fix compat with babeltrace API change at commit 03798a93f959f6c694fe98f564748...

This reverts commit 094632060f50c0a268794c70e0650167c5c51fb8.

diff --git a/src/common.c b/src/common.c
index 5cc9bca14aff3342fa33baefb88f26599acaafb0..c939847466282bfccc84c0cc4e6fb71e0ce78d04 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -470,7 +470,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
        int64_t pid, tid;
        char *procname;
 
        int64_t pid, tid;
        char *procname;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 

diff --git a/src/cputop.c b/src/cputop.c
index 6adbacdb122cafd4532e2a2d5106cef077ea084e..eb7afb3e76a799f758b3d2b99ad00dceccf162a7 100644 (file)
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -54,7 +54,7 @@ enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
        char *prev_comm, *next_comm;
        int prev_tid, next_tid;
 
        char *prev_comm, *next_comm;
        int prev_tid, next_tid;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -107,7 +107,7 @@ enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
        char *comm;
        int tid;
 
        char *comm;
        int tid;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 

diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index 30797c529bd3dd8a3315ff4fe8996bde3850c891..bda9c7ce9d8c098b86b6116ba85385e92b084c00 100644 (file)
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.c
@@ -266,7 +266,7 @@ enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data,
        uint64_t ret, tid;
        uint64_t cpu_id;
 
        uint64_t ret, tid;
        uint64_t cpu_id;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -310,7 +310,7 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
        char *procname;
        int fd;
 
        char *procname;
        int fd;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -350,7 +350,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
        char *procname;
        int fd;
 
        char *procname;
        int fd;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -392,7 +392,7 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
        char *procname;
        char *file;
 
        char *procname;
        char *file;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -432,7 +432,7 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
        char *procname;
        int fd;
 
        char *procname;
        int fd;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -470,7 +470,7 @@ enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data,
        char *file_name;
        int fd;
 
        char *file_name;
        int fd;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 521e085ebd6dbd8996072de9a20cc907aa54089a..2ee303a318dccd6028b9994193e3174a1eec377e 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -121,7 +121,7 @@ enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_dat
 {
        unsigned long timestamp;
 
 {
        unsigned long timestamp;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;
 


@@ -252,7 +252,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
        struct processtop *parent, *child;
        unsigned long timestamp;
 
        struct processtop *parent, *child;
        unsigned long timestamp;
 

-       timestamp = bt_ctf_get_real_timestamp(call_data);
+       timestamp = bt_ctf_get_timestamp(call_data);

        if (timestamp == -1ULL)
                goto error;
 
        if (timestamp == -1ULL)
                goto error;