projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix FSF address in license headers
[lttngtop.git]
/
src
/
lttngtop.c
diff --git
a/src/lttngtop.c
b/src/lttngtop.c
index 924864b32fb9f50710717ee7ed07642a8c0ffca6..c4dc4ced60fc0098f307bf5d490c13ff24dec61d 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
@@
-227,17
+226,10
@@
end:
void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
{
void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
{
- struct definition *scope;
- uint64_t cpu_id;
struct cputime *cpu;
struct cputime *cpu;
+ struct definition *scope;
- scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT);
- cpu_id = bt_ctf_get_uint64(bt_ctf_get_field(event, scope, "cpu_id"));
- if (bt_ctf_field_get_error()) {
- fprintf(stderr, "[error] get cpu_id\n");
- goto end;
- }
- cpu = get_cpu(cpu_id);
+ cpu = get_cpu(get_cpu_id(event));
scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
extract_perf_counter_scope(event, scope, proc, cpu);
scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
extract_perf_counter_scope(event, scope, proc, cpu);
@@
-247,9
+239,6
@@
void update_perf_counter(struct processtop *proc, struct bt_ctf_event *event)
scope = bt_ctf_get_top_level_scope(event, BT_EVENT_CONTEXT);
extract_perf_counter_scope(event, scope, proc, cpu);
scope = bt_ctf_get_top_level_scope(event, BT_EVENT_CONTEXT);
extract_perf_counter_scope(event, scope, proc, cpu);
-
-end:
- return;
}
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
}
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
@@
-258,7
+247,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 */
@@
-267,25
+255,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;
}
@@
-334,9
+320,10
@@
void init_lttngtop()
lttngtop.cpu_table = g_ptr_array_new();
}
lttngtop.cpu_table = g_ptr_array_new();
}
-void usage(FILE *f
d
)
+void usage(FILE *f
p
)
{
{
-
+ fprintf(fp, "LTTngTop %s\n\n", VERSION);
+ fprintf(fp, "Usage : lttngtop /path/to/trace\n");
}
/*
}
/*
@@
-430,6
+417,13
@@
void iter_trace(struct bt_context *bt_ctx)
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_read"),
NULL, 0, handle_sys_read, NULL, NULL, NULL);
bt_ctf_iter_add_callback(iter,
g_quark_from_static_string("sys_read"),
NULL, 0, handle_sys_read, 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);
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)
This page took
0.024902 seconds
and
4
git commands to generate.