projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove obsolete comments
[lttngtop.git]
/
src
/
lttngtop.c
diff --git
a/src/lttngtop.c
b/src/lttngtop.c
index 11635b47e3df171c1cc91363a1afa53634057ad3..107e228a42178069a087378484af1b9bdc1c459a 100644
(file)
--- 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
*
* 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);
unsigned int current_display_index = 0;
sem_wait(&bootstrap);
+ /*
+ * Prevent the 1 second delay when we hit ESC
+ */
+ ESCDELAY = 0;
init_ncurses();
while (1) {
init_ncurses();
while (1) {
@@
-250,30
+254,24
@@
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
struct processtop *parent, *child;
unsigned long timestamp;
struct processtop *parent, *child;
unsigned long timestamp;
- /* FIXME : display nice error when missing context pid, tid, ppid and comm */
-
timestamp = bt_ctf_get_timestamp(call_data);
if (timestamp == -1ULL)
goto error;
pid = get_context_pid(call_data);
if (pid == -1ULL) {
timestamp = bt_ctf_get_timestamp(call_data);
if (timestamp == -1ULL)
goto error;
pid = get_context_pid(call_data);
if (pid == -1ULL) {
-// fprintf(stderr, "Missing pid context info\n");
goto error;
}
tid = get_context_tid(call_data);
if (tid == -1ULL) {
goto error;
}
tid = get_context_tid(call_data);
if (tid == -1ULL) {
-// fprintf(stderr, "Missing tid context info\n");
goto error;
}
ppid = get_context_ppid(call_data);
if (ppid == -1ULL) {
goto error;
}
ppid = get_context_ppid(call_data);
if (ppid == -1ULL) {
-// fprintf(stderr, "Missing ppid context info\n");
goto error;
}
comm = get_context_comm(call_data);
if (!comm) {
goto error;
}
comm = get_context_comm(call_data);
if (!comm) {
-// fprintf(stderr, "Missing procname context info\n");
goto error;
}
goto error;
}
@@
-355,19
+353,6
@@
static int parse_options(int argc, char **argv)
usage(stdout);
ret = 1; /* exit cleanly */
goto end;
usage(stdout);
ret = 1; /* exit cleanly */
goto end;
- case OPT_LIST:
- // list_formats(stdout);
- ret = 1;
- goto end;
- case OPT_VERBOSE:
-// babeltrace_verbose = 1;
- break;
- case OPT_DEBUG:
-// babeltrace_debug = 1;
- break;
- case OPT_NAMES:
-// opt_field_names = 1;
- break;
default:
ret = -EINVAL;
goto end;
default:
ret = -EINVAL;
goto end;
@@
-509,11
+494,9
@@
int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
}
metafd = openat(dirfd, "metadata", O_RDONLY);
if (metafd < 0) {
}
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;
} else {
int trace_id;
This page took
0.025245 seconds
and
4
git commands to generate.