X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=1da87ea7fba16dfb0de5106d00d12b95bbe3ad34;hp=b3368315ac0d6fb27f13c31c19176c6ddfc3b81d;hb=aa15ac1c699ea5f76f6c26fb14ab22f725ecc293;hpb=0d91c12a62aa85d1d1d8b5478e81d38e06f2cc00

diff --git a/src/lttngtop.c b/src/lttngtop.c
index b336831..1da87ea 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 Julien Desfossez
  *
  * 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
@@ -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) {
@@ -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;
 	}