/*
- * 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
#include "cputop.h"
void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
- int next_pid, char *prev_comm, char *next_comm)
+ int next_pid, char *prev_comm, char *next_comm, char *hostname)
{
struct cputime *tmpcpu;
unsigned long elapsed;
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;
}
if (next_pid != 0)
- tmpcpu->current_task = get_proc(<tngtop, next_pid, next_comm, timestamp);
+ tmpcpu->current_task = get_proc(<tngtop, next_pid, next_comm,
+ timestamp, hostname);
else
tmpcpu->current_task = NULL;
enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
void *private_data)
{
- const struct definition *scope;
+ const struct bt_definition *scope;
unsigned long timestamp;
uint64_t cpu_id;
char *prev_comm, *next_comm;
int prev_tid, next_tid;
+ char *hostname = NULL;
timestamp = bt_ctf_get_timestamp(call_data);
if (timestamp == -1ULL)
cpu_id = get_cpu_id(call_data);
update_cputop_data(timestamp, cpu_id, prev_tid, next_tid,
- prev_comm, next_comm);
+ prev_comm, next_comm, hostname);
return BT_CB_OK;
enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
void *private_data)
{
- const struct definition *scope;
+ const struct bt_definition *scope;
unsigned long timestamp;
char *comm;
int tid;
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(<tngtop, tid, comm, timestamp);
return BT_CB_OK;