X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fiostreamtop.c;h=30797c529bd3dd8a3315ff4fe8996bde3850c891;hp=35a58a414f8e6274ac7898e9e18d099bb75bb390;hb=094632060f50c0a268794c70e0650167c5c51fb8;hpb=e05a35a69ff03f10bba459a07dc26684049f1bc9 diff --git a/src/iostreamtop.c b/src/iostreamtop.c index 35a58a4..30797c5 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 @@ -29,12 +29,19 @@ 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); @@ -44,7 +51,7 @@ void add_file(struct processtop *proc, struct files *file, int fd) 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); + size+1); g_ptr_array_index(proc->process_files_table, size) = tmp_file; g_ptr_array_index(proc->process_files_table, @@ -53,38 +60,53 @@ void add_file(struct processtop *proc, struct files *file, int fd) tmp_file->flag = __NR_open; } } - file->fd = fd; - file->flag = __NR_open; - lttngtop.nbfiles++; - lttngtop.nbnewfiles++; + /* + * The file may have be created in the parent + */ + if (file->flag == -1) { + file->fd = fd; + file->flag = __NR_open; + lttngtop.nbfiles++; + lttngtop.nbnewfiles++; + } } -/* TODO */ -/* To be done */ +/* + * 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 (size <= fd) - return; - else { + if (fd >= size) { + add_file(proc, file, fd); + } else { tmpfile = g_ptr_array_index(proc->process_files_table, fd); - tmpfile->name = strdup(file->name); - free(file); + 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); @@ -94,7 +116,17 @@ 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); + } } } } @@ -171,13 +203,15 @@ 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) { tmpfile = tmp->files_history->file; @@ -216,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; @@ -231,7 +266,7 @@ enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data, uint64_t ret, tid; uint64_t cpu_id; - timestamp = bt_ctf_get_timestamp(call_data); + timestamp = bt_ctf_get_real_timestamp(call_data); if (timestamp == -1ULL) goto error; @@ -271,18 +306,19 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data, 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); + timestamp = bt_ctf_get_real_timestamp(call_data); if (timestamp == -1ULL) goto error; - comm = get_context_comm(call_data); 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, @@ -292,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); @@ -310,18 +346,19 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data, const struct 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); + timestamp = bt_ctf_get_real_timestamp(call_data); if (timestamp == -1ULL) goto error; - comm = get_context_comm(call_data); 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, @@ -331,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); @@ -351,18 +388,19 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data, const struct 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); + timestamp = bt_ctf_get_real_timestamp(call_data); if (timestamp == -1ULL) goto error; - comm = get_context_comm(call_data); 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, @@ -372,7 +410,7 @@ enum bt_cb_ret handle_sys_open(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_open, cpu_id, tid, -1); tmp->files_history = create_file(tmp->files_history, file); @@ -388,19 +426,20 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, void *private_data) { const struct 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); + timestamp = bt_ctf_get_real_timestamp(call_data); if (timestamp == -1ULL) goto error; - comm = get_context_comm(call_data); tid = get_context_tid(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, @@ -410,7 +449,7 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, goto error; } - tmp = get_proc(<tngtop, tid, comm, timestamp); + tmp = get_proc(<tngtop, tid, procname, timestamp); close_file(tmp, fd); @@ -419,28 +458,26 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data, error: return BT_CB_ERROR_STOP; } -/* + enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data, void *private_data) { - struct definition *scope; + const struct definition *scope; + struct processtop *parent; struct files *file; unsigned long timestamp; - int64_t tid; - struct processtop *tmp; - char *comm, *file_name; + int64_t pid; + char *file_name; int fd; - timestamp = bt_ctf_get_timestamp(call_data); + timestamp = bt_ctf_get_real_timestamp(call_data); if (timestamp == -1ULL) goto error; - comm = get_context_comm(call_data); - scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); - tid = bt_ctf_get_uint64(bt_ctf_get_field(call_data, - scope, "_tid")); + 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; @@ -448,7 +485,7 @@ enum bt_cb_ret handle_statedump_file_descriptor(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"); @@ -464,17 +501,13 @@ enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data, goto error; } - file = g_new0(struct files, 1); - file->name = strdup(file_name); - file->fd = fd; - tmp = find_process_tid(<tngtop, tid, comm); - edit_file(tmp, file, fd); - - fprintf(stderr, "%lu %s\n", tmp->tid, file_name); + 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; error: return BT_CB_ERROR_STOP; } -*/