/*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 Julien Desfossez
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License Version 2 as
* 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>
elapsed = timestamp - tmpcpu->task_start;
tmpcpu->current_task->totalcpunsec += elapsed;
tmpcpu->current_task->threadstotalcpunsec += elapsed;
- if (tmpcpu->current_task->pid != tmpcpu->current_task->tid)
+ if (tmpcpu->current_task->threadparent &&
+ tmpcpu->current_task->pid != tmpcpu->current_task->tid)
tmpcpu->current_task->threadparent->threadstotalcpunsec += elapsed;
}
enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
void *private_data)
{
- struct definition *scope;
+ const struct bt_definition *scope;
unsigned long timestamp;
uint64_t cpu_id;
char *prev_comm, *next_comm;
goto error;
}
- scope = bt_ctf_get_top_level_scope(call_data,
- BT_STREAM_PACKET_CONTEXT);
- cpu_id = bt_ctf_get_uint64(bt_ctf_get_field(call_data,
- scope, "cpu_id"));
- if (bt_ctf_field_get_error()) {
- fprintf(stderr, "Missing cpu_id context info\n");
- goto error;
- }
+ cpu_id = get_cpu_id(call_data);
update_cputop_data(timestamp, cpu_id, prev_tid, next_tid,
prev_comm, next_comm);
enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
void *private_data)
{
- struct definition *scope;
+ const struct bt_definition *scope;
unsigned long timestamp;
char *comm;
int tid;
tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
scope, "_tid"));
if (bt_ctf_field_get_error()) {
- fprintf(stderr, "Missing tid context info\n");
+ fprintf(stderr, "Missing tid field\n");
goto error;
}