X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fiostreamtop.c;h=e280a3382e8b382a7d08e18a5d96c470b6af738c;hp=dfffd1d81512e3b993a2ca4201d62a7e6bbde2b1;hb=2e0a1190d76a53891ca22cfd6082d9b45581d83e;hpb=d67167cde319ac9d257f5b59b5a4664e558f4cb4 diff --git a/src/iostreamtop.c b/src/iostreamtop.c index dfffd1d..e280a33 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 @@ -10,10 +10,9 @@ * 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 @@ -29,26 +28,87 @@ void add_file(struct processtop *proc, struct files *file, int fd) { - if (proc->process_files_table->len <= fd) { - g_ptr_array_set_size(proc->process_files_table, 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) { + /* 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 { - g_ptr_array_index(proc->process_files_table, fd) = file; + tmp_file = g_ptr_array_index(proc->process_files_table, fd); + if (tmp_file == NULL) + g_ptr_array_index(proc->process_files_table, fd) = file; + else { + if (strcmp(tmp_file->name, file->name) != 0) { + size = proc->process_files_table->len; + g_ptr_array_set_size(proc->process_files_table, + size+1); + g_ptr_array_index(proc->process_files_table, + size) = tmp_file; + g_ptr_array_index(proc->process_files_table, + fd) = file; + } else + tmp_file->flag = __NR_open; + } + } + /* + * The file may have be created in the parent + */ + if (file->flag == -1) { + file->fd = fd; + file->flag = __NR_open; + lttngtop.nbfiles++; + lttngtop.nbnewfiles++; } - file->fd = fd; } +/* + * Edit the file + * Called by handled_statedump_filename + */ +void edit_file(struct processtop *proc, struct files *file, int fd) +{ + int size = proc->process_files_table->len; + struct files *tmpfile; + + if (fd >= size) { + add_file(proc, file, fd); + } else { + tmpfile = g_ptr_array_index(proc->process_files_table, fd); + if (tmpfile) { + tmpfile->name = strdup(file->name); + free(file); + } else + add_file(proc, file, fd); + } +} void insert_file(struct processtop *proc, int fd) { struct files *tmp; + struct files *tmp_parent; + struct processtop *parent; + if (fd < 0) + return; if (fd >= proc->process_files_table->len) { tmp = g_new0(struct files, 1); tmp->name = "Unknown"; + tmp->read = 0; + tmp->write = 0; + tmp->fd = fd; + tmp->flag = -1; add_file(proc, tmp, fd); } else { - tmp = g_ptr_array_index(proc->process_files_table, fd); if (tmp == NULL) { tmp = g_new0(struct files, 1); @@ -56,14 +116,37 @@ void insert_file(struct processtop *proc, int fd) tmp->read = 0; tmp->write = 0; tmp->fd = fd; + tmp->flag = -1; add_file(proc, tmp, fd); + } else { + parent = proc->threadparent; + if (parent) { + tmp_parent = g_ptr_array_index( + parent->process_files_table, fd); + if (tmp_parent && + (strcmp(tmp->name, tmp_parent->name)) != 0) + tmp->name = strdup(tmp_parent->name); + } } } } void close_file(struct processtop *proc, int fd) +{ + struct files *file; + + file = get_file(proc, fd); + if (file != NULL) { + file->flag = __NR_close; + lttngtop.nbfiles--; + } + lttngtop.nbclosedfiles++; +} + +struct files *get_file(struct processtop *proc, int fd) { int len; + struct files *tmp = NULL; len = proc->process_files_table->len; @@ -72,16 +155,9 @@ void close_file(struct processtop *proc, int fd) * and its fd could be greater than all of the others fd * used by the process */ - if (fd < len) { - g_ptr_array_remove_index_fast(proc->process_files_table, fd); - g_ptr_array_set_size(proc->process_files_table, len + 1); - } -} + if (fd < len && fd >= 0) + tmp = g_ptr_array_index(proc->process_files_table, fd); -struct files *get_file(struct processtop *proc, int fd) -{ - struct files *tmp; - tmp = g_ptr_array_index(proc->process_files_table, fd); return tmp; } @@ -100,6 +176,18 @@ void show_table(GPtrArray *tab) fprintf(stderr, "]\n\n"); } +void show_history(struct file_history *history) +{ + struct file_history *tmp = history; + + while (tmp != NULL) { + fprintf(stderr, "fd = %d, name = %s\n", tmp->file->fd, + tmp->file->name); + tmp = tmp->next; + } + +} + int update_iostream_ret(struct lttngtop *ctx, int tid, char *comm, unsigned long timestamp, uint64_t cpu_id, int ret) { @@ -115,16 +203,20 @@ int update_iostream_ret(struct lttngtop *ctx, int tid, char *comm, 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) { - add_file(tmp, tmp->files_history->file, ret); + tmpfile = tmp->files_history->file; + add_file(tmp, tmpfile, ret); + tmpfile->fd = ret; } else { err = -1; } @@ -158,6 +250,7 @@ struct file_history *create_file(struct file_history *history, char *file_name) new_file->name = strdup(file_name); new_file->read = 0; new_file->write = 0; + new_file->flag = -1; new_history->file = new_file; new_history->next = history; @@ -167,7 +260,7 @@ 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) { - struct definition *scope; + const struct bt_definition *scope; unsigned long timestamp; char *comm; uint64_t ret, tid; @@ -177,21 +270,8 @@ enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data, if (timestamp == -1ULL) goto error; - scope = bt_ctf_get_top_level_scope(call_data, - BT_STREAM_EVENT_CONTEXT); - comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, - scope, "_procname")); - if (bt_ctf_field_get_error()) { - fprintf(stderr, "Missing procname context info\n"); - goto 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"); - goto error; - } + comm = get_context_comm(call_data); + tid = get_context_tid(call_data); scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); @@ -222,36 +302,23 @@ error: enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data, void *private_data) { - struct definition *scope; + const struct bt_definition *scope; struct processtop *tmp; unsigned long timestamp; uint64_t cpu_id; - char *comm; int64_t tid; + char *procname; int fd; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; - scope = bt_ctf_get_top_level_scope(call_data, - BT_STREAM_EVENT_CONTEXT); - comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, - scope, "_procname")); - if (bt_ctf_field_get_error()) { - fprintf(stderr, "Missing procname context info\n"); - goto 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"); - goto error; - } - + tid = get_context_tid(call_data); cpu_id = get_cpu_id(call_data); + procname = get_context_comm(call_data); + scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); fd = bt_ctf_get_uint64(bt_ctf_get_field(call_data, @@ -261,7 +328,7 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc(<tngtop, tid, comm, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp); tmp->syscall_info = create_syscall_info(__NR_write, cpu_id, tid, fd); insert_file(tmp, fd); @@ -276,35 +343,22 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data, void *private_data) { struct processtop *tmp; - struct definition *scope; + const struct bt_definition *scope; unsigned long timestamp; uint64_t cpu_id; - char *comm; int64_t tid; + char *procname; int fd; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; - scope = bt_ctf_get_top_level_scope(call_data, - BT_STREAM_EVENT_CONTEXT); - comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, - scope, "_procname")); - if (bt_ctf_field_get_error()) { - fprintf(stderr, "Missing procname context info\n"); - goto 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"); - goto error; - } - + tid = get_context_tid(call_data); cpu_id = get_cpu_id(call_data); + procname = get_context_comm(call_data); + scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); fd = bt_ctf_get_uint64(bt_ctf_get_field(call_data, @@ -314,7 +368,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc(<tngtop, tid, comm, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp); tmp->syscall_info = create_syscall_info(__NR_read, cpu_id, tid, fd); insert_file(tmp, fd); @@ -331,45 +385,32 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data, { struct processtop *tmp; - struct definition *scope; + const struct bt_definition *scope; unsigned long timestamp; uint64_t cpu_id; - char *comm; int64_t tid; + char *procname; char *file; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; - scope = bt_ctf_get_top_level_scope(call_data, - BT_STREAM_EVENT_CONTEXT); - comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, - scope, "_procname")); - if (bt_ctf_field_get_error()) { - fprintf(stderr, "Missing procname context info\n"); - goto 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"); - goto error; - } - + tid = get_context_tid(call_data); cpu_id = get_cpu_id(call_data); + procname = get_context_comm(call_data); + scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); file = bt_ctf_get_string(bt_ctf_get_field(call_data, scope, "_filename")); if (bt_ctf_field_get_error()) { - fprintf(stderr, "Missing fd context info\n"); + fprintf(stderr, "Missing file name context info\n"); goto error; } - tmp = get_proc(<tngtop, tid, comm, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp); tmp->syscall_info = create_syscall_info(__NR_open, cpu_id, tid, -1); tmp->files_history = create_file(tmp->files_history, file); @@ -384,28 +425,59 @@ error: enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, void *private_data) { - struct definition *scope; + const struct bt_definition *scope; + struct processtop *tmp; unsigned long timestamp; int64_t tid; - struct processtop *tmp; - char *comm; + char *procname; int fd; timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; + tid = get_context_tid(call_data); + + procname = get_context_comm(call_data); + scope = bt_ctf_get_top_level_scope(call_data, - BT_STREAM_EVENT_CONTEXT); - comm = bt_ctf_get_char_array(bt_ctf_get_field(call_data, - scope, "_procname")); + BT_EVENT_FIELDS); + fd = bt_ctf_get_uint64(bt_ctf_get_field(call_data, + scope, "_fd")); if (bt_ctf_field_get_error()) { - fprintf(stderr, "Missing procname context info\n"); + fprintf(stderr, "Missing fd context info\n"); goto error; } - tid = bt_ctf_get_int64(bt_ctf_get_field(call_data, - scope, "_tid")); + tmp = get_proc(<tngtop, tid, procname, timestamp); + + close_file(tmp, fd); + + return BT_CB_OK; + +error: + return BT_CB_ERROR_STOP; +} + +enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data, + void *private_data) +{ + const struct bt_definition *scope; + struct processtop *parent; + struct files *file; + unsigned long timestamp; + int64_t pid; + char *file_name; + int fd; + + timestamp = bt_ctf_get_timestamp(call_data); + if (timestamp == -1ULL) + goto error; + + scope = bt_ctf_get_top_level_scope(call_data, + BT_EVENT_FIELDS); + pid = bt_ctf_get_int64(bt_ctf_get_field(call_data, + scope, "_pid")); if (bt_ctf_field_get_error()) { fprintf(stderr, "Missing tid context info\n"); goto error; @@ -413,15 +485,26 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); - fd = bt_ctf_get_uint64(bt_ctf_get_field(call_data, + fd = bt_ctf_get_int64(bt_ctf_get_field(call_data, scope, "_fd")); if (bt_ctf_field_get_error()) { fprintf(stderr, "Missing fd context info\n"); goto error; } - tmp = get_proc(<tngtop, tid, comm, timestamp); - close_file(tmp, fd); + scope = bt_ctf_get_top_level_scope(call_data, + BT_EVENT_FIELDS); + file_name = bt_ctf_get_string(bt_ctf_get_field(call_data, + scope, "_filename")); + if (bt_ctf_field_get_error()) { + fprintf(stderr, "Missing file name context info\n"); + goto error; + } + + 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); return BT_CB_OK;