Reactivate header counters

[lttngtop.git] / src / cputop.c

diff --git a/src/cputop.c b/src/cputop.c
index 2ade0db7cbeff18c58348ec77645e620891de94c..1b9a129c2e34c399048a3005e5264362912f6dee 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.
  *
  * 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>
  */
 
 #include <babeltrace/babeltrace.h>


@@ -49,7 +48,7 @@ void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
 enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
                void *private_data)
 {
 enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
                void *private_data)
 {

-       struct definition *scope;
+       const struct definition *scope;

        unsigned long timestamp;
        uint64_t cpu_id;
        char *prev_comm, *next_comm;
        unsigned long timestamp;
        uint64_t cpu_id;
        char *prev_comm, *next_comm;


@@ -89,14 +88,7 @@ enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
                goto error;
        }
 
                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);
 
        update_cputop_data(timestamp, cpu_id, prev_tid, next_tid,
                        prev_comm, next_comm);


@@ -110,7 +102,7 @@ error:
 enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
                void *private_data)
 {
 enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
                void *private_data)
 {

-       struct definition *scope;
+       const struct definition *scope;

        unsigned long timestamp;
        char *comm;
        int tid;
        unsigned long timestamp;
        char *comm;
        int tid;


@@ -131,7 +123,7 @@ enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
        tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
                                scope, "_tid"));
        if (bt_ctf_field_get_error()) {
        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;
        }
 
                goto error;
        }