/*
- * Copyright (C) 2011 Mathieu Bain <mathieu.bain@polymtl.ca>
+ * Copyright (C) 2011-2012 Mathieu Bain <mathieu.bain@polymtl.ca>
*
* 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
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);
if (tmp_file == NULL)
g_ptr_array_index(proc->process_files_table, fd) = file;
else {
- if (strcmp(tmp_file->name, file->name) != 0) {
+ if (!tmp_file->name ||
+ 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,
tmp_file->flag = __NR_open;
}
}
- file->fd = fd;
- 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++;
+ }
}
-/* 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->name = NULL;
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);
- tmp->name = "Unknown";
+ tmp->name = NULL;
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 && tmp->name && tmp_parent->name &&
+ (strcmp(tmp->name, tmp_parent->name)) != 0)
+ tmp->name = strdup(tmp_parent->name);
+ }
}
}
}
{
struct files *file;
-
file = get_file(proc, fd);
- if (file != NULL)
+ if (file != NULL) {
file->flag = __NR_close;
+ lttngtop.nbfiles--;
+ /*
+ if (file->name) {
+ free(file->name);
+ file->name = NULL;
+ }
+ */
+ }
+ lttngtop.nbclosedfiles++;
}
struct files *get_file(struct processtop *proc, int fd)
}
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;
g_free(tmp->syscall_info);
tmp->syscall_info = NULL;
}
+
+end:
return err;
}
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;
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)
}
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;
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;
- char *comm;
int64_t tid;
+ char *procname, *hostname;
int fd;
timestamp = bt_ctf_get_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);
+ hostname = get_context_hostname(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,
goto error;
}
- tmp = get_proc(<tngtop, tid, comm, 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:
void *private_data)
{
struct processtop *tmp;
- const struct definition *scope;
+ const struct bt_definition *scope;
unsigned long timestamp;
uint64_t cpu_id;
- char *comm;
int64_t tid;
+ char *procname;
int fd;
+ char *hostname;
timestamp = bt_ctf_get_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);
+ hostname = get_context_hostname(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,
goto error;
}
- tmp = get_proc(<tngtop, tid, comm, 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:
return BT_CB_ERROR_STOP;
}
-
enum bt_cb_ret handle_sys_open(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;
- char *comm;
int64_t tid;
+ char *procname, *hostname;
char *file;
timestamp = bt_ctf_get_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);
+ hostname = get_context_hostname(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,
goto error;
}
- tmp = get_proc(<tngtop, tid, comm, 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:
return BT_CB_ERROR_STOP;
}
+enum bt_cb_ret handle_sys_socket(struct bt_ctf_event *call_data,
+ void *private_data)
+{
+
+ struct processtop *tmp;
+ unsigned long timestamp;
+ uint64_t cpu_id;
+ int64_t tid;
+ char *procname, *hostname;
+ char *file;
+
+ timestamp = bt_ctf_get_timestamp(call_data);
+ if (timestamp == -1ULL)
+ goto error;
+
+ tid = get_context_tid(call_data);
+ cpu_id = get_cpu_id(call_data);
+
+ procname = get_context_comm(call_data);
+ hostname = get_context_hostname(call_data);
+
+ file = strdup("socket");
+
+ 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:
+ return BT_CB_ERROR_STOP;
+}
enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
void *private_data)
{
- const 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;
+ char *hostname;
timestamp = bt_ctf_get_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);
+ hostname = get_context_hostname(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,
goto error;
}
- tmp = get_proc(<tngtop, tid, comm, timestamp);
+ tmp = get_proc(<tngtop, tid, procname, timestamp, hostname);
+ if (!tmp)
+ goto end;
close_file(tmp, fd);
+end:
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)
{
- struct definition *scope;
+ const struct bt_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, *hostname;
int fd;
timestamp = bt_ctf_get_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;
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");
fprintf(stderr, "Missing file name context info\n");
goto error;
}
+ hostname = get_context_hostname(call_data);
- 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);
+ parent = get_proc_pid(<tngtop, pid, pid, timestamp, hostname);
+ if (!parent)
+ goto end;
- fprintf(stderr, "%lu %s\n", tmp->tid, file_name);
+ 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:
return BT_CB_ERROR_STOP;
}
-*/
projects / lttngtop.git / blobdiff