API sync babeltrace

[lttngtop.git] / src / cputop.c

diff --git a/src/cputop.c b/src/cputop.c
index cdc1bdf1e0251875e008b231cf0db6b7fb37c328..8d4f03e64e8417afde481cb23365af69de4e3658 100644 (file)
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -10,10 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <babeltrace/babeltrace.h>
@@ -46,10 +45,10 @@ void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
        tmpcpu->task_start = timestamp;
 }
 
-enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_sched_switch(struct ctf_event_definition *call_data,
                void *private_data)
 {
-       struct definition *scope;
+       const struct definition *scope;
        unsigned long timestamp;
        uint64_t cpu_id;
        char *prev_comm, *next_comm;
@@ -100,10 +99,10 @@ error:
        return BT_CB_ERROR_STOP;
 }
 
-enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_sched_process_free(struct ctf_event_definition *call_data,
                void *private_data)
 {
-       struct definition *scope;
+       const struct definition *scope;
        unsigned long timestamp;
        char *comm;
        int tid;
@@ -121,7 +120,13 @@ enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tid = get_context_tid(call_data);
+       tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+                               scope, "_tid"));
+       if (bt_ctf_field_get_error()) {
+               fprintf(stderr, "Missing tid field\n");
+               goto error;
+       }
+
        death_proc(&lttngtop, tid, comm, timestamp);
 
        return BT_CB_OK;