X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttngtop.c;h=5ab8e947f150544a5cf134792fb0a22fde5da30a;hb=6153ec123e4ad29d2b44521e46d80aaf9a07ed69;hp=092ebdf99d17e1bd9af2ff31c57bf6e3414bb741;hpb=0d567cf1f52936e1fbabfd5f180072711163a82d;p=lttngtop.git

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 092ebdf..5ab8e94 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -88,6 +88,10 @@ void *ncurses_display(void *p)
 	unsigned int current_display_index = 0;
 
 	sem_wait(&bootstrap);
+	/*
+	 * Prevent the 1 second delay when we hit ESC
+	 */
+	ESCDELAY = 0;
 	init_ncurses();
 
 	while (1) {
@@ -165,14 +169,14 @@ struct perfcounter *get_perf_counter(const char *name, struct processtop *proc,
 	ret->visible = 1;
 	g_hash_table_insert(table, (gpointer) strdup(name), ret);
 
-	global = g_hash_table_lookup(lttngtop.perf_list, (gpointer) name);
+	global = g_hash_table_lookup(global_perf_liszt, (gpointer) name);
 	if (!global) {
 		global = g_new0(struct perfcounter, 1);
 		memcpy(global, ret, sizeof(struct perfcounter));
 		/* by default, sort on the first perf context */
-		if (g_hash_table_size(lttngtop.perf_list) == 0)
+		if (g_hash_table_size(global_perf_liszt) == 0)
 			global->sort = 1;
-		g_hash_table_insert(lttngtop.perf_list, (gpointer) strdup(name), global);
+		g_hash_table_insert(global_perf_liszt, (gpointer) strdup(name), global);
 	}
 
 end:
@@ -307,7 +311,7 @@ error:
 void init_lttngtop()
 {
 	copies = g_ptr_array_new();
-	lttngtop.perf_list = g_hash_table_new(g_str_hash, g_str_equal);
+	global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
 
 	sem_init(&goodtodisplay, 0, 0);
 	sem_init(&goodtoupdate, 0, 1);
@@ -509,11 +513,9 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		}
 		metafd = openat(dirfd, "metadata", O_RDONLY);
 		if (metafd < 0) {
-			ret = close(dirfd);
-			if (ret < 0) {
-				perror("close");
-				goto error;
-			}
+			close(dirfd);
+			ret = -1;
+			continue;
 		} else {
 			int trace_id;
 
@@ -671,7 +673,7 @@ int main(int argc, char **argv)
 
 	ret = check_requirements(bt_ctx);
 	if (ret < 0) {
-		fprintf(stderr, "[error] missing mandatory context informations\n");
+		fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
 		goto end;
 	}