X-Git-Url: http://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fiostreamtop.c;h=367fdee6ef2e281c2cbcbde3bc0019b74872ac08;hp=62b926ecb76de51934a864292153d19d582217d8;hb=de847ed22a50f8fb3a4d9732b49562f6f0f73895;hpb=59288610ca44efca4b68b954b7ffccd06fecd2b7 diff --git a/src/iostreamtop.c b/src/iostreamtop.c index 62b926e..367fdee 100644 --- a/src/iostreamtop.c +++ b/src/iostreamtop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Mathieu Bain + * Copyright (C) 2011-2012 Mathieu Bain * * 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 @@ -31,13 +31,17 @@ void add_file(struct processtop *proc, struct files *file, int fd) struct files *tmp_file; struct processtop *parent; int size; + int i; size = proc->process_files_table->len; parent = proc->threadparent; if (parent) insert_file(parent, fd); if (size <= fd) { - g_ptr_array_set_size(proc->process_files_table, fd); + /* Add NULL file structures for undefined FDs */ + for (i = size; i < fd; i++) { + g_ptr_array_add(proc->process_files_table, NULL); + } g_ptr_array_add(proc->process_files_table, file); } else { tmp_file = g_ptr_array_index(proc->process_files_table, fd); @@ -185,27 +189,34 @@ void show_history(struct file_history *history) } int update_iostream_ret(struct lttngtop *ctx, int tid, char *comm, - unsigned long timestamp, uint64_t cpu_id, int ret) + unsigned long timestamp, uint64_t cpu_id, int ret, + char *hostname) { struct processtop *tmp; struct files *tmpfile; int err = 0; - tmp = get_proc(ctx, tid, comm, timestamp); + tmp = get_proc(ctx, tid, comm, timestamp, hostname); + if (!tmp) { + err = -1; + goto end; + } if (tmp->syscall_info != NULL) { if (tmp->syscall_info->type == __NR_read && ret > 0) { tmp->totalfileread += ret; tmp->fileread += ret; tmpfile = get_file(tmp, tmp->syscall_info->fd); - tmpfile->read += ret; + if (tmpfile) + tmpfile->read += ret; } else if (tmp->syscall_info->type == __NR_write && ret > 0) { tmp->totalfilewrite += ret; tmp->filewrite += ret; tmpfile = get_file(tmp, tmp->syscall_info->fd); - tmpfile->write += ret; + if (tmpfile) + tmpfile->write += ret; } else if (tmp->syscall_info->type == __NR_open && ret > 0) { tmpfile = tmp->files_history->file; @@ -217,6 +228,8 @@ int update_iostream_ret(struct lttngtop *ctx, int tid, char *comm, g_free(tmp->syscall_info); tmp->syscall_info = NULL; } + +end: return err; } @@ -254,11 +267,12 @@ struct file_history *create_file(struct file_history *history, char *file_name) enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data, void *private_data) { - const struct definition *scope; + const struct bt_definition *scope; unsigned long timestamp; char *comm; uint64_t ret, tid; uint64_t cpu_id; + char *hostname; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) @@ -277,13 +291,15 @@ enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data, } cpu_id = get_cpu_id(call_data); + hostname = get_context_hostname(call_data); /* * if we encounter an exit_syscall and * it is not for a syscall read or write * we just abort the execution of this callback */ - if ((update_iostream_ret(<tngtop, tid, comm, timestamp, cpu_id, ret)) < 0) + if ((update_iostream_ret(<tngtop, tid, comm, timestamp, cpu_id, + ret, hostname)) < 0) return BT_CB_ERROR_CONTINUE; return BT_CB_OK; @@ -296,11 +312,12 @@ error: enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data, void *private_data) { - const struct definition *scope; + const struct bt_definition *scope; struct processtop *tmp; unsigned long timestamp; uint64_t cpu_id; - int64_t tid, pid; + int64_t tid; + char *procname, *hostname; int fd; timestamp = bt_ctf_get_timestamp(call_data); @@ -310,7 +327,8 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data, tid = get_context_tid(call_data); cpu_id = get_cpu_id(call_data); - pid = get_context_pid(call_data); + procname = get_context_comm(call_data); + hostname = get_context_hostname(call_data); scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); @@ -321,11 +339,15 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc_pid(<tngtop, tid, pid, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp, hostname); + if (!tmp) + goto end; + tmp->syscall_info = create_syscall_info(__NR_write, cpu_id, tid, fd); insert_file(tmp, fd); +end: return BT_CB_OK; error: @@ -336,11 +358,13 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data, void *private_data) { struct processtop *tmp; - const struct definition *scope; + const struct bt_definition *scope; unsigned long timestamp; uint64_t cpu_id; - int64_t tid, pid; + int64_t tid; + char *procname; int fd; + char *hostname; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) @@ -349,7 +373,8 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data, tid = get_context_tid(call_data); cpu_id = get_cpu_id(call_data); - pid = get_context_pid(call_data); + procname = get_context_comm(call_data); + hostname = get_context_hostname(call_data); scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); @@ -360,11 +385,15 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc_pid(<tngtop, tid, pid, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp, hostname); + if (!tmp) + goto end; + tmp->syscall_info = create_syscall_info(__NR_read, cpu_id, tid, fd); insert_file(tmp, fd); +end: return BT_CB_OK; error: @@ -377,10 +406,11 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data, { struct processtop *tmp; - const struct definition *scope; + const struct bt_definition *scope; unsigned long timestamp; uint64_t cpu_id; - int64_t tid, pid; + int64_t tid; + char *procname, *hostname; char *file; timestamp = bt_ctf_get_timestamp(call_data); @@ -390,7 +420,8 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data, tid = get_context_tid(call_data); cpu_id = get_cpu_id(call_data); - pid = get_context_pid(call_data); + procname = get_context_comm(call_data); + hostname = get_context_hostname(call_data); scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); @@ -401,11 +432,15 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc_pid(<tngtop, tid, pid, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp, hostname); + if (!tmp) + goto end; + tmp->syscall_info = create_syscall_info(__NR_open, cpu_id, tid, -1); tmp->files_history = create_file(tmp->files_history, file); +end: return BT_CB_OK; error: @@ -416,11 +451,13 @@ error: enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, void *private_data) { - const struct definition *scope; - unsigned long timestamp; - int64_t tid, pid; + const struct bt_definition *scope; struct processtop *tmp; + unsigned long timestamp; + int64_t tid; + char *procname; int fd; + char *hostname; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) @@ -428,7 +465,8 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, tid = get_context_tid(call_data); - pid = get_context_pid(call_data); + procname = get_context_comm(call_data); + hostname = get_context_hostname(call_data); scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); @@ -439,10 +477,13 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc_pid(<tngtop, tid, pid, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp, hostname); + if (!tmp) + goto end; close_file(tmp, fd); +end: return BT_CB_OK; error: @@ -452,12 +493,12 @@ error: enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data, void *private_data) { - const struct definition *scope; + const struct bt_definition *scope; struct processtop *parent; struct files *file; unsigned long timestamp; int64_t pid; - char *file_name; + char *file_name, *hostname; int fd; timestamp = bt_ctf_get_timestamp(call_data); @@ -490,12 +531,17 @@ enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data, fprintf(stderr, "Missing file name context info\n"); goto error; } + hostname = get_context_hostname(call_data); + + parent = get_proc_pid(<tngtop, pid, pid, timestamp, hostname); + if (!parent) + goto end; - parent = get_proc_pid(<tngtop, pid, pid, timestamp); parent->files_history = create_file(parent->files_history, file_name); file = parent->files_history->file; edit_file(parent, file, fd); +end: return BT_CB_OK; error: