X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fiostreamtop.c;h=f455e78a20ec0e345c66a713e1ddde3be92f8b43;hp=71843cb900137a2adb706a5124800c221724f391;hb=3439955e838cd626b61ca36e37f80a104966a8fe;hpb=ceb3a2216fed5f405aa77c358328f71f44ed3303

diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index 71843cb..f455e78 100644
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.c
@@ -29,10 +29,13 @@
 void add_file(struct processtop *proc, struct files *file, int fd)
 {
 	struct files *tmp_file;
+	struct processtop *parent;
 	int size;
 
 	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);
 		g_ptr_array_add(proc->process_files_table, file);
@@ -44,7 +47,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,39 +56,55 @@ void add_file(struct processtop *proc, struct files *file, int fd)
 				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->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);
@@ -93,7 +112,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);
+			}
 		}
 	}
 }
@@ -102,10 +131,12 @@ void close_file(struct processtop *proc, int fd)
 {
 	struct files *file;
 
-
 	file = get_file(proc, fd);
-	if (file != NULL)
+	if (file != NULL) {
 		file->flag = __NR_close;
+		lttngtop.nbfiles--;
+	}
+	lttngtop.nbclosedfiles++;
 }
 
 struct files *get_file(struct processtop *proc, int fd)
@@ -168,13 +199,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;
@@ -213,13 +246,14 @@ 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;
 
 	return new_history;
 }
 
-enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_exit_syscall(struct ctf_event_definition *call_data,
 		void *private_data)
 {
 	const struct definition *scope;
@@ -261,25 +295,25 @@ error:
 }
 
 
-enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_sys_write(struct ctf_event_definition *call_data,
 		void *private_data)
 {
 	const struct definition *scope;
 	struct processtop *tmp;
 	unsigned long timestamp;
 	uint64_t cpu_id;
-	char *comm;
-	int64_t tid;
+	int64_t tid, pid;
 	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);
 
+	pid = get_context_pid(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,
@@ -289,7 +323,7 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
 		goto error;
 	}
 
-	tmp = get_proc(&lttngtop, tid, comm, timestamp);
+	tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
 	tmp->syscall_info = create_syscall_info(__NR_write, cpu_id, tid, fd);
 
 	insert_file(tmp, fd);
@@ -300,25 +334,25 @@ error:
 	return BT_CB_ERROR_STOP;
 }
 
-enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_sys_read(struct ctf_event_definition *call_data,
 		void *private_data)
 {
 	struct processtop *tmp;
 	const struct definition *scope;
 	unsigned long timestamp;
 	uint64_t cpu_id;
-	char *comm;
-	int64_t tid;
+	int64_t tid, pid;
 	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);
 
+	pid = get_context_pid(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,
@@ -328,7 +362,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
 		goto error;
 	}
 
-	tmp = get_proc(&lttngtop, tid, comm, timestamp);
+	tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
 	tmp->syscall_info = create_syscall_info(__NR_read, cpu_id, tid, fd);
 
 	insert_file(tmp, fd);
@@ -340,7 +374,7 @@ error:
 }
 
 
-enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_sys_open(struct ctf_event_definition *call_data,
 		void *private_data)
 {
 
@@ -348,18 +382,18 @@ 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;
+	int64_t tid, pid;
 	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);
 
+	pid = get_context_pid(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,
@@ -369,7 +403,7 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
 		goto error;
 	}
 
-	tmp = get_proc(&lttngtop, tid, comm, timestamp);
+	tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
 	tmp->syscall_info = create_syscall_info(__NR_open, cpu_id, tid, -1);
 
 	tmp->files_history = create_file(tmp->files_history, file);
@@ -381,23 +415,23 @@ error:
 }
 
 
-enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
+enum bt_cb_ret handle_sys_close(struct ctf_event_definition *call_data,
 		void *private_data)
 {
 	const struct definition *scope;
 	unsigned long timestamp;
-	int64_t tid;
+	int64_t tid, pid;
 	struct processtop *tmp;
-	char *comm;
 	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);
 
+	pid = get_context_pid(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,
@@ -407,7 +441,7 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
 		goto error;
 	}
 
-	tmp = get_proc(&lttngtop, tid, comm, timestamp);
+	tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
 
 	close_file(tmp, fd);
 
@@ -416,28 +450,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,
+
+enum bt_cb_ret handle_statedump_file_descriptor(struct ctf_event_definition *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);
 	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;
@@ -445,7 +477,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");
@@ -461,17 +493,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(&lttngtop, tid, comm);
-	edit_file(tmp, file, fd);
-
-	fprintf(stderr, "%lu %s\n", tmp->tid, file_name);
+	parent = get_proc_pid(&lttngtop, 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;
 }
-*/