projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libmallocwrap: fix warning
[lttng-ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index b3dd4c207ab731953036f8c2f09518b39e93c40c..abd796203d19e0c0d098b6ea5f5302a77f1ad56a 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-1,3
+1,4
@@
+#define _GNU_SOURCE
#include <stdio.h>
#include <stdint.h>
#include <signal.h>
#include <stdio.h>
#include <stdint.h>
#include <signal.h>
@@
-113,7
+114,7
@@
void notif_cb(void)
}
}
}
}
-static
int
inform_consumer_daemon(void)
+static
void
inform_consumer_daemon(void)
{
ustcomm_request_consumer(getpid(), "metadata");
ustcomm_request_consumer(getpid(), "ust");
{
ustcomm_request_consumer(getpid(), "metadata");
ustcomm_request_consumer(getpid(), "ust");
@@
-148,7
+149,7
@@
void process_blocked_consumers(void)
result = poll(fds, n_fds, 0);
if(result == -1) {
PERROR("poll");
result = poll(fds, n_fds, 0);
if(result == -1) {
PERROR("poll");
- return
-1
;
+ return;
}
list_for_each_entry(bc, &blocked_consumers, list) {
}
list_for_each_entry(bc, &blocked_consumers, list) {
@@
-166,7
+167,7
@@
void process_blocked_consumers(void)
close(bc->fd_producer);
close(bc->fd_producer);
-
__list_del(bc->list.prev, bc->list.nex
t);
+
list_del(&bc->lis
t);
result = ustcomm_send_reply(&bc->server, "END", &bc->src);
if(result < 0) {
result = ustcomm_send_reply(&bc->server, "END", &bc->src);
if(result < 0) {
@@
-194,13
+195,13
@@
void process_blocked_consumers(void)
}
free(reply);
}
free(reply);
-
__list_del(bc->list.prev, bc->list.nex
t);
+
list_del(&bc->lis
t);
}
}
}
}
}
}
-
int
listener_main(void *p)
+
void *
listener_main(void *p)
{
int result;
{
int result;
@@
-252,19
+253,19
@@
int listener_main(void *p)
result = ltt_trace_setup(trace_name);
if(result < 0) {
ERR("ltt_trace_setup failed");
result = ltt_trace_setup(trace_name);
if(result < 0) {
ERR("ltt_trace_setup failed");
- return;
+ return
(void *)1
;
}
result = ltt_trace_set_type(trace_name, trace_type);
if(result < 0) {
ERR("ltt_trace_set_type failed");
}
result = ltt_trace_set_type(trace_name, trace_type);
if(result < 0) {
ERR("ltt_trace_set_type failed");
- return;
+ return
(void *)1
;
}
result = ltt_trace_alloc(trace_name);
if(result < 0) {
ERR("ltt_trace_alloc failed");
}
result = ltt_trace_alloc(trace_name);
if(result < 0) {
ERR("ltt_trace_alloc failed");
- return;
+ return
(void *)1
;
}
inform_consumer_daemon();
}
inform_consumer_daemon();
@@
-281,13
+282,13
@@
int listener_main(void *p)
result = ltt_trace_setup(trace_name);
if(result < 0) {
ERR("ltt_trace_setup failed");
result = ltt_trace_setup(trace_name);
if(result < 0) {
ERR("ltt_trace_setup failed");
- return;
+ return
(void *)1
;
}
result = ltt_trace_set_type(trace_name, trace_type);
if(result < 0) {
ERR("ltt_trace_set_type failed");
}
result = ltt_trace_set_type(trace_name, trace_type);
if(result < 0) {
ERR("ltt_trace_set_type failed");
- return;
+ return
(void *)1
;
}
}
else if(!strcmp(recvbuf, "trace_alloc")) {
}
}
else if(!strcmp(recvbuf, "trace_alloc")) {
@@
-296,7
+297,7
@@
int listener_main(void *p)
result = ltt_trace_alloc(trace_name);
if(result < 0) {
ERR("ltt_trace_alloc failed");
result = ltt_trace_alloc(trace_name);
if(result < 0) {
ERR("ltt_trace_alloc failed");
- return;
+ return
(void *)1
;
}
}
else if(!strcmp(recvbuf, "trace_start")) {
}
}
else if(!strcmp(recvbuf, "trace_start")) {
@@
-314,7
+315,7
@@
int listener_main(void *p)
result = ltt_trace_stop(trace_name);
if(result < 0) {
ERR("ltt_trace_stop failed");
result = ltt_trace_stop(trace_name);
if(result < 0) {
ERR("ltt_trace_stop failed");
- return;
+ return
(void *)1
;
}
}
else if(!strcmp(recvbuf, "trace_destroy")) {
}
}
else if(!strcmp(recvbuf, "trace_destroy")) {
@@
-324,7
+325,7
@@
int listener_main(void *p)
result = ltt_trace_destroy(trace_name);
if(result < 0) {
ERR("ltt_trace_destroy failed");
result = ltt_trace_destroy(trace_name);
if(result < 0) {
ERR("ltt_trace_destroy failed");
- return;
+ return
(void *)1
;
}
}
else if(nth_token_is(recvbuf, "get_shmid", 0) == 1) {
}
}
else if(nth_token_is(recvbuf, "get_shmid", 0) == 1) {
@@
-346,8
+347,8
@@
int listener_main(void *p)
ltt_unlock_traces();
if(trace == NULL) {
ltt_unlock_traces();
if(trace == NULL) {
-
CPRINTF
("cannot find trace!");
- return 1;
+
ERR
("cannot find trace!");
+ return
(void *)
1;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-394,8
+395,8
@@
int listener_main(void *p)
ltt_unlock_traces();
if(trace == NULL) {
ltt_unlock_traces();
if(trace == NULL) {
-
CPRINTF
("cannot find trace!");
- return 1;
+
ERR
("cannot find trace!");
+ return
(void *)
1;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-404,8
+405,8
@@
int listener_main(void *p)
if(!strcmp(trace->channels[i].channel_name, channel_name)) {
char *reply;
if(!strcmp(trace->channels[i].channel_name, channel_name)) {
char *reply;
- DBG("the n_subbufs for the requested channel is %d", rchan->n_subbufs);
- asprintf(&reply, "%d", rchan->n_subbufs);
+ DBG("the n_subbufs for the requested channel is %
z
d", rchan->n_subbufs);
+ asprintf(&reply, "%
z
d", rchan->n_subbufs);
result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
if(result) {
result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
if(result) {
@@
-438,8
+439,8
@@
int listener_main(void *p)
ltt_unlock_traces();
if(trace == NULL) {
ltt_unlock_traces();
if(trace == NULL) {
-
CPRINTF
("cannot find trace!");
- return 1;
+
ERR
("cannot find trace!");
+ return
(void *)
1;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-448,8
+449,8
@@
int listener_main(void *p)
if(!strcmp(trace->channels[i].channel_name, channel_name)) {
char *reply;
if(!strcmp(trace->channels[i].channel_name, channel_name)) {
char *reply;
- DBG("the subbuf_size for the requested channel is %d", rchan->subbuf_size);
- asprintf(&reply, "%d", rchan->subbuf_size);
+ DBG("the subbuf_size for the requested channel is %
z
d", rchan->subbuf_size);
+ asprintf(&reply, "%
z
d", rchan->subbuf_size);
result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
if(result) {
result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
if(result) {
@@
-489,8
+490,8
@@
int listener_main(void *p)
ltt_unlock_traces();
if(trace == NULL) {
ltt_unlock_traces();
if(trace == NULL) {
-
CPRINTF
("cannot find trace!");
- return 1;
+
ERR
("cannot find trace!");
+ return
(void *)
1;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-555,8
+556,8
@@
int listener_main(void *p)
ltt_unlock_traces();
if(trace == NULL) {
ltt_unlock_traces();
if(trace == NULL) {
-
CPRINTF
("cannot find trace!");
- return 1;
+
ERR
("cannot find trace!");
+ return
(void *)
1;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-570,12
+571,13
@@
int listener_main(void *p)
result = ltt_do_put_subbuf(rbuf, lttbuf, consumed_old);
if(result < 0) {
result = ltt_do_put_subbuf(rbuf, lttbuf, consumed_old);
if(result < 0) {
- WARN("ltt_do_put_subbuf: error");
+ WARN("ltt_do_put_subbuf: error (subbuf=%s)", channel_name);
+ asprintf(&reply, "%s", "ERROR");
}
else {
}
else {
- DBG("ltt_do_put_subbuf: success");
+ DBG("ltt_do_put_subbuf: success (subbuf=%s)", channel_name);
+ asprintf(&reply, "%s", "OK");
}
}
- asprintf(&reply, "%s", "OK", consumed_old);
result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
if(result) {
result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
if(result) {
@@
-647,8
+649,8
@@
int listener_main(void *p)
// ltt_unlock_traces();
//
// if(trace == NULL) {
// ltt_unlock_traces();
//
// if(trace == NULL) {
-//
CPRINTF
("cannot find trace!");
-// return 1;
+//
ERR
("cannot find trace!");
+// return
(void *)
1;
// }
//
// for(i=0; i<trace->nr_channels; i++) {
// }
//
// for(i=0; i<trace->nr_channels; i++) {
@@
-870,6
+872,8
@@
static void __attribute__((constructor(1000))) init()
/* This is only called if we terminate normally, not with an unhandled signal,
* so we cannot rely on it. */
/* This is only called if we terminate normally, not with an unhandled signal,
* so we cannot rely on it. */
+/* This destructor probably isn't needed, because ustd can do crash recovery. */
+#if 0
static void __attribute__((destructor)) fini()
{
int result;
static void __attribute__((destructor)) fini()
{
int result;
@@
-888,9
+892,6
@@
static void __attribute__((destructor)) fini()
ERR("ltt_trace_destroy error");
}
ERR("ltt_trace_destroy error");
}
- /* FIXME: wait for the consumer to be done */
- //DBG("waiting 5 sec for consume");
- //sleep(5);
-
destroy_socket();
}
destroy_socket();
}
+#endif
This page took
0.031379 seconds
and
4
git commands to generate.