projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
displaying closed files
[lttngtop.git]
/
src
/
lttngtop.c
diff --git
a/src/lttngtop.c
b/src/lttngtop.c
index 6bb03ac760c20c1a3f9daa121475af0c7fd72b70..e98785a8cfe5e3c06cb65affcc2fa7ff1ecaaf0a 100644
(file)
--- a/
src/lttngtop.c
+++ b/
src/lttngtop.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.
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
@@
-23,6
+22,7
@@
#include <babeltrace/babeltrace.h>
#include <babeltrace/ctf/events.h>
#include <babeltrace/ctf/callbacks.h>
#include <babeltrace/babeltrace.h>
#include <babeltrace/ctf/events.h>
#include <babeltrace/ctf/callbacks.h>
+#include <babeltrace/ctf/iterator.h>
#include <fcntl.h>
#include <pthread.h>
#include <popt.h>
#include <fcntl.h>
#include <pthread.h>
#include <popt.h>
@@
-195,8
+195,8
@@
void update_perf_value(struct processtop *proc, struct cputime *cpu,
}
}
}
}
-void extract_perf_counter_scope(struct bt_ctf_event *event,
- struct definition *scope,
+void extract_perf_counter_scope(
const
struct bt_ctf_event *event,
+
const
struct definition *scope,
struct processtop *proc,
struct cputime *cpu)
{
struct processtop *proc,
struct cputime *cpu)
{
@@
-213,7
+213,7
@@
void extract_perf_counter_scope(struct bt_ctf_event *event,
for (i = 0; i < count; i++) {
const char *name = bt_ctf_field_name(list[i]);
for (i = 0; i < count; i++) {
const char *name = bt_ctf_field_name(list[i]);
- if (strncmp(name, "
_perf_", 6
) == 0) {
+ if (strncmp(name, "
perf_", 5
) == 0) {
int value = bt_ctf_get_uint64(list[i]);
if (bt_ctf_field_get_error())
continue;
int value = bt_ctf_get_uint64(list[i]);
if (bt_ctf_field_get_error())
continue;
@@
-225,10
+225,10
@@
end:
return;
}
return;
}
-void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
+void update_perf_counter(struct processtop *proc,
const
struct bt_ctf_event *event)
{
struct cputime *cpu;
{
struct cputime *cpu;
- struct definition *scope;
+
const
struct definition *scope;
cpu = get_cpu(get_cpu_id(event));
cpu = get_cpu(get_cpu_id(event));
@@
-248,7
+248,6
@@
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
int pid, tid, ppid;
char *comm;
struct processtop *parent, *child;
int pid, tid, ppid;
char *comm;
struct processtop *parent, *child;
- struct definition *scope;
unsigned long timestamp;
/* FIXME : display nice error when missing context pid, tid, ppid and comm */
unsigned long timestamp;
/* FIXME : display nice error when missing context pid, tid, ppid and comm */
@@
-257,25
+256,23
@@
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
if (timestamp == -1ULL)
goto error;
if (timestamp == -1ULL)
goto error;
- scope = bt_ctf_get_top_level_scope(call_data, BT_STREAM_EVENT_CONTEXT);
-
- pid = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_pid"));
- if (bt_ctf_field_get_error()) {
+ pid = get_context_pid(call_data);
+ if (pid == -1ULL) {
// fprintf(stderr, "Missing pid context info\n");
goto error;
}
// fprintf(stderr, "Missing pid context info\n");
goto error;
}
- tid =
bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_tid")
);
- if (
bt_ctf_field_get_error()
) {
+ tid =
get_context_tid(call_data
);
+ if (
tid == -1ULL
) {
// fprintf(stderr, "Missing tid context info\n");
goto error;
}
// fprintf(stderr, "Missing tid context info\n");
goto error;
}
- ppid =
bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_ppid")
);
- if (
bt_ctf_field_get_error()
) {
+ ppid =
get_context_ppid(call_data
);
+ if (
ppid == -1ULL
) {
// fprintf(stderr, "Missing ppid context info\n");
goto error;
}
// fprintf(stderr, "Missing ppid context info\n");
goto error;
}
- comm =
bt_ctf_get_char_array(bt_ctf_get_field(call_data, scope, "_procname")
);
- if (
bt_ctf_field_get_error()
) {
+ comm =
get_context_comm(call_data
);
+ if (
!comm
) {
// fprintf(stderr, "Missing procname context info\n");
goto error;
}
// fprintf(stderr, "Missing procname context info\n");
goto error;
}
@@
-388,7
+385,7
@@
void iter_trace(struct bt_context *bt_ctx)
{
struct bt_ctf_iter *iter;
struct bt_iter_pos begin_pos;
{
struct bt_ctf_iter *iter;
struct bt_iter_pos begin_pos;
- struct bt_ctf_event *event;
+
const
struct bt_ctf_event *event;
int ret = 0;
begin_pos.type = BT_SEEK_BEGIN;
int ret = 0;
begin_pos.type = BT_SEEK_BEGIN;
@@
-424,10
+421,16
@@
void iter_trace(struct bt_context *bt_ctx)
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_open"),
NULL, 0, handle_sys_open, NULL, NULL, NULL);
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_open"),
NULL, 0, handle_sys_open, NULL, NULL, NULL);
-
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_close"),
NULL, 0, handle_sys_close, NULL, NULL, NULL);
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_close"),
NULL, 0, handle_sys_close, NULL, NULL, NULL);
+/*
+ bt_ctf_iter_add_callback(iter,
+ g_quark_from_static_string(
+ "lttng_statedump_file_descriptor"),
+ NULL, 0, handle_statedump_file_descriptor,
+ NULL, NULL, NULL);
+*/
while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
ret = bt_iter_next(bt_ctf_get_iter(iter));
if (ret < 0)
while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
ret = bt_iter_next(bt_ctf_get_iter(iter));
if (ret < 0)
@@
-438,7
+441,7
@@
void iter_trace(struct bt_context *bt_ctx)
sem_wait(&end_trace_sem);
end_iter:
sem_wait(&end_trace_sem);
end_iter:
- bt_
iter_destroy(bt_ctf_get_iter(iter)
);
+ bt_
ctf_iter_destroy(iter
);
}
/*
}
/*
This page took
0.032482 seconds
and
4
git commands to generate.