projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doc
[lttngtop.git]
/
src
/
lttngtop.c
diff --git
a/src/lttngtop.c
b/src/lttngtop.c
index ad1e7137c5ab5f9a1c7d46de7b8b02622dadc2b0..52bf6e98bf77e7cd9a9d484f442db94e9afbb9ad 100644
(file)
--- a/
src/lttngtop.c
+++ b/
src/lttngtop.c
@@
-36,6
+36,7
@@
#include <errno.h>
#include <sys/types.h>
#include <fts.h>
#include <errno.h>
#include <sys/types.h>
#include <fts.h>
+#include <assert.h>
#include "lttngtoptypes.h"
#include "cputop.h"
#include "lttngtoptypes.h"
#include "cputop.h"
@@
-73,6
+74,8
@@
static struct poptOption long_options[] = {
void *refresh_thread(void *p)
{
while (1) {
void *refresh_thread(void *p)
{
while (1) {
+ if (quit)
+ return NULL;
sem_wait(&pause_sem);
sem_post(&pause_sem);
sem_post(&timer);
sem_wait(&pause_sem);
sem_post(&pause_sem);
sem_post(&timer);
@@
-93,8
+96,8
@@
void *ncurses_display(void *p)
sem_wait(&pause_sem);
copy = g_ptr_array_index(copies, current_display_index);
sem_wait(&pause_sem);
copy = g_ptr_array_index(copies, current_display_index);
- if (copy)
-
display(current_display_index++);
+ assert(copy);
+ display(current_display_index++);
sem_post(&goodtoupdate);
sem_post(&pause_sem);
sem_post(&goodtoupdate);
sem_post(&pause_sem);
@@
-160,7
+163,7
@@
struct perfcounter *get_perf_counter(const char *name, struct processtop *proc,
ret = g_new0(struct perfcounter, 1);
/* by default, make it visible in the UI */
ret->visible = 1;
ret = g_new0(struct perfcounter, 1);
/* by default, make it visible in the UI */
ret->visible = 1;
- g_hash_table_insert(table, (gpointer)
name
, ret);
+ g_hash_table_insert(table, (gpointer)
strdup(name)
, ret);
global = g_hash_table_lookup(lttngtop.perf_list, (gpointer) name);
if (!global) {
global = g_hash_table_lookup(lttngtop.perf_list, (gpointer) name);
if (!global) {
@@
-169,7
+172,7
@@
struct perfcounter *get_perf_counter(const char *name, struct processtop *proc,
/* by default, sort on the first perf context */
if (g_hash_table_size(lttngtop.perf_list) == 0)
global->sort = 1;
/* by default, sort on the first perf context */
if (g_hash_table_size(lttngtop.perf_list) == 0)
global->sort = 1;
- g_hash_table_insert(lttngtop.perf_list, (gpointer)
name
, global);
+ g_hash_table_insert(lttngtop.perf_list, (gpointer)
strdup(name)
, global);
}
end:
}
end:
@@
-258,7
+261,7
@@
enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
struct definition *scope;
unsigned long timestamp;
struct definition *scope;
unsigned long timestamp;
- /* FIXME :
check
context pid, tid, ppid and comm */
+ /* FIXME :
display nice error when missing
context pid, tid, ppid and comm */
timestamp = bt_ctf_get_timestamp(call_data);
if (timestamp == -1ULL)
timestamp = bt_ctf_get_timestamp(call_data);
if (timestamp == -1ULL)
@@
-317,7
+320,7
@@
error:
void init_lttngtop()
{
copies = g_ptr_array_new();
void init_lttngtop()
{
copies = g_ptr_array_new();
- lttngtop.perf_list = g_hash_table_new(g_
direct_hash, g_direct
_equal);
+ lttngtop.perf_list = g_hash_table_new(g_
str_hash, g_str
_equal);
sem_init(&goodtodisplay, 0, 0);
sem_init(&goodtoupdate, 0, 1);
sem_init(&goodtodisplay, 0, 0);
sem_init(&goodtoupdate, 0, 1);
@@
-331,9
+334,10
@@
void init_lttngtop()
lttngtop.cpu_table = g_ptr_array_new();
}
lttngtop.cpu_table = g_ptr_array_new();
}
-void usage(FILE *f
d
)
+void usage(FILE *f
p
)
{
{
-
+ fprintf(fp, "LTTngTop %s\n\n", VERSION);
+ fprintf(fp, "Usage : lttngtop /path/to/trace\n");
}
/*
}
/*
@@
-564,7
+568,9
@@
int main(int argc, char **argv)
quit = 1;
pthread_join(display_thread, NULL);
quit = 1;
pthread_join(display_thread, NULL);
+ pthread_join(timer_thread, NULL);
end:
end:
+ bt_context_put(bt_ctx);
return 0;
}
return 0;
}
This page took
0.024166 seconds
and
4
git commands to generate.