projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't destroy app communication server in main() destructor
[lttng-ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index d4cb3efbcb7a97b5963106143b37640090b38822..2e9052386c7121131d91c0495522752c96a9b57b 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-17,6
+17,7
@@
#define _GNU_SOURCE
#include <stdio.h>
#define _GNU_SOURCE
#include <stdio.h>
+#include <stdlib.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
@@
-26,8
+27,7
@@
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
-
-#include <urcu-bp.h>
+#include <urcu/uatomic_arch.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
@@
-125,15
+125,6
@@
static void print_markers(FILE *fp)
static int init_socket(void);
static int init_socket(void);
-/* This needs to be called whenever a new thread is created. It notifies
- * liburcu of the new thread.
- */
-
-void ust_register_thread(void)
-{
- rcu_register_thread();
-}
-
int fd_notif = -1;
void notif_cb(void)
{
int fd_notif = -1;
void notif_cb(void)
{
@@
-241,9
+232,13
@@
void process_blocked_consumers(void)
continue;
}
if(result == 0) {
continue;
}
if(result == 0) {
+ int res;
DBG("PRODUCER END");
DBG("PRODUCER END");
- close(bc->fd_producer);
+ res = close(bc->fd_producer);
+ if(res == -1) {
+ PERROR("close");
+ }
list_del(&bc->list);
list_del(&bc->list);
@@
-357,10
+352,7
@@
static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src)
}
}
}
}
- if(found) {
- buffers_to_export--;
- }
- else {
+ if(!found) {
ERR("channel not found (%s)", channel_and_cpu);
}
ERR("channel not found (%s)", channel_and_cpu);
}
@@
-509,7
+501,7
@@
static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
return retval;
}
return retval;
}
-unsigned int poweroftwo(unsigned int x)
+
static
unsigned int poweroftwo(unsigned int x)
{
unsigned int power2 = 1;
unsigned int hardcoded = 2147483648; /* FIX max 2^31 */
{
unsigned int power2 = 1;
unsigned int hardcoded = 2147483648; /* FIX max 2^31 */
@@
-552,7
+544,6
@@
static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
- ltt_unlock_traces();
retval = -1;
goto end;
}
retval = -1;
goto end;
}
@@
-573,9
+564,8
@@
static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
ERR("unable to find channel");
}
ERR("unable to find channel");
}
- ltt_unlock_traces();
-
end:
end:
+ ltt_unlock_traces();
return retval;
}
return retval;
}
@@
-608,7
+598,6
@@
static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
- ltt_unlock_traces();
retval = -1;
goto end;
}
retval = -1;
goto end;
}
@@
-629,9
+618,8
@@
static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src
ERR("unable to find channel");
}
ERR("unable to find channel");
}
- ltt_unlock_traces();
-
end:
end:
+ ltt_unlock_traces();
return retval;
}
return retval;
}
@@
-662,24
+650,19
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
- ltt_unlock_traces();
if(trace == NULL) {
if(trace == NULL) {
- char *reply;
int result;
int result;
- WARN("Cannot find trace. It was likely destroyed by the user.");
- asprintf(&reply, "%s", "NOTFOUND");
- result = ustcomm_send_reply(&ustcomm_app.server, reply, src);
+ DBG("Cannot find trace. It was likely destroyed by the user.");
+ result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
if(result) {
ERR("ustcomm_send_reply failed");
- free(reply);
retval = -1;
retval = -1;
- goto
free_short_chan_name
;
+ goto
unlock_traces
;
}
}
- free(reply);
- goto free_short_chan_name;
+ goto unlock_traces;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-694,7
+677,7
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer));
if(bc == NULL) {
ERR("malloc returned NULL");
bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer));
if(bc == NULL) {
ERR("malloc returned NULL");
- goto
free_short_chan_name
;
+ goto
unlock_traces
;
}
bc->fd_consumer = src->fd;
bc->fd_producer = buf->data_ready_fd_read;
}
bc->fd_consumer = src->fd;
bc->fd_producer = buf->data_ready_fd_read;
@@
-704,6
+687,14
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
list_add(&bc->list, &blocked_consumers);
list_add(&bc->list, &blocked_consumers);
+ /* Being here is the proof the daemon has mapped the buffer in its
+ * memory. We may now decrement buffers_to_export.
+ */
+ if(uatomic_read(&buf->consumed) == 0) {
+ DBG("decrementing buffers_to_export");
+ buffers_to_export--;
+ }
+
break;
}
}
break;
}
}
@@
-711,6
+702,9
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ERR("unable to find channel");
}
ERR("unable to find channel");
}
+ unlock_traces:
+ ltt_unlock_traces();
+
free_short_chan_name:
free(ch_name);
free_short_chan_name:
free(ch_name);
@@
-765,21
+759,17
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
- ltt_unlock_traces();
if(trace == NULL) {
if(trace == NULL) {
- WARN("Cannot find trace. It was likely destroyed by the user.");
- asprintf(&reply, "%s", "NOTFOUND");
- result = ustcomm_send_reply(&ustcomm_app.server, reply, src);
+ DBG("Cannot find trace. It was likely destroyed by the user.");
+ result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
if(result) {
ERR("ustcomm_send_reply failed");
- free(reply);
retval = -1;
retval = -1;
- goto
free_short_chan_name
;
+ goto
unlock_traces
;
}
}
- free(reply);
- goto free_short_chan_name;
+ goto unlock_traces;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-805,7
+795,7
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ERR("ustcomm_send_reply failed");
free(reply);
retval = -1;
ERR("ustcomm_send_reply failed");
free(reply);
retval = -1;
- goto
free_channel_and_cpu
;
+ goto
unlock_traces
;
}
free(reply);
}
free(reply);
@@
-816,6
+806,8
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ERR("unable to find channel");
}
ERR("unable to find channel");
}
+ unlock_traces:
+ ltt_unlock_traces();
free_short_chan_name:
free(ch_name);
free_consumed_old_str:
free_short_chan_name:
free(ch_name);
free_consumed_old_str:
@@
-827,14
+819,19
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
return retval;
}
return retval;
}
+static void listener_cleanup(void *ptr)
+{
+ ustcomm_fini_app(&ustcomm_app, 0);
+}
+
void *listener_main(void *p)
{
int result;
void *listener_main(void *p)
{
int result;
- ust_register_thread();
-
DBG("LISTENER");
DBG("LISTENER");
+ pthread_cleanup_push(listener_cleanup, NULL);
+
for(;;) {
char trace_name[] = "auto";
char trace_type[] = "ustrelay";
for(;;) {
char trace_name[] = "auto";
char trace_type[] = "ustrelay";
@@
-972,7
+969,7
@@
void *listener_main(void *p)
DBG("trace destroy");
DBG("trace destroy");
- result = ltt_trace_destroy(trace_name);
+ result = ltt_trace_destroy(trace_name
, 0
);
if(result < 0) {
ERR("ltt_trace_destroy failed");
return (void *)1;
if(result < 0) {
ERR("ltt_trace_destroy failed");
return (void *)1;
@@
-1109,17
+1106,20
@@
void *listener_main(void *p)
next_cmd:
free(recvbuf);
}
next_cmd:
free(recvbuf);
}
+
+ pthread_cleanup_pop(1);
}
volatile sig_atomic_t have_listener = 0;
}
volatile sig_atomic_t have_listener = 0;
+#ifndef USE_CLONE
+static pthread_t listener_thread;
+#endif
void create_listener(void)
{
#ifdef USE_CLONE
static char listener_stack[16384];
int result;
void create_listener(void)
{
#ifdef USE_CLONE
static char listener_stack[16384];
int result;
-#else
- pthread_t thread;
#endif
if(have_listener) {
#endif
if(have_listener) {
@@
-1135,7
+1135,7
@@
void create_listener(void)
}
#else
}
#else
- pthread_create(&thread, NULL, listener_main, NULL);
+ pthread_create(&
listener_
thread, NULL, listener_main, NULL);
#endif
have_listener = 1;
#endif
have_listener = 1;
@@
-1194,16
+1194,8
@@
static void __attribute__((constructor)) init()
*/
pidunique = make_pidunique();
*/
pidunique = make_pidunique();
- /* Initialize RCU in case the constructor order is not good. */
- rcu_init();
-
- /* It is important to do this before events start to be generated. */
- ust_register_thread();
-
DBG("Tracectl constructor");
DBG("Tracectl constructor");
- /* Must create socket before signal handler to prevent races.
- */
result = init_socket();
if(result == -1) {
ERR("init_socket error");
result = init_socket();
if(result == -1) {
ERR("init_socket error");
@@
-1356,7
+1348,7
@@
static void destroy_traces(void)
ERR("ltt_trace_stop error");
}
ERR("ltt_trace_stop error");
}
- result = ltt_trace_destroy("auto");
+ result = ltt_trace_destroy("auto"
, 0
);
if(result == -1) {
ERR("ltt_trace_destroy error");
}
if(result == -1) {
ERR("ltt_trace_destroy error");
}
@@
-1403,6
+1395,20
@@
int restarting_usleep(useconds_t usecs)
return result;
}
return result;
}
+static void stop_listener()
+{
+ int result;
+
+ result = pthread_cancel(listener_thread);
+ if(result == -1) {
+ PERROR("pthread_cancel");
+ }
+ result = pthread_join(listener_thread, NULL);
+ if(result == -1) {
+ PERROR("pthread_join");
+ }
+}
+
/* This destructor keeps the process alive for a few seconds in order
* to leave time to ustd to connect to its buffers. This is necessary
* for programs whose execution is very short. It is also useful in all
/* This destructor keeps the process alive for a few seconds in order
* to leave time to ustd to connect to its buffers. This is necessary
* for programs whose execution is very short. It is also useful in all
@@
-1433,7
+1439,8
@@
static void __attribute__((destructor)) keepalive()
destroy_traces();
destroy_traces();
- ustcomm_fini_app(&ustcomm_app);
+ /* Ask the listener to stop and clean up. */
+ stop_listener();
}
void ust_potential_exec(void)
}
void ust_potential_exec(void)
@@
-1461,9
+1468,14
@@
static void ust_fork(void)
struct blocked_consumer *deletable_bc = NULL;
int result;
struct blocked_consumer *deletable_bc = NULL;
int result;
+ /* FIXME: technically, the locks could have been taken before the fork */
DBG("ust: forking");
DBG("ust: forking");
+
+ /* break lock if necessary */
+ ltt_unlock_traces();
+
ltt_trace_stop("auto");
ltt_trace_stop("auto");
- ltt_trace_destroy("auto");
+ ltt_trace_destroy("auto"
, 1
);
/* Delete all active connections */
ustcomm_close_all_connections(&ustcomm_app.server);
/* Delete all active connections */
ustcomm_close_all_connections(&ustcomm_app.server);
@@
-1476,9
+1488,13
@@
static void ust_fork(void)
list_del(&bc->list);
}
list_del(&bc->list);
}
+ /* free app, keeping socket file */
+ ustcomm_fini_app(&ustcomm_app, 1);
+
+ buffers_to_export = 0;
have_listener = 0;
have_listener = 0;
- create_listener();
init_socket();
init_socket();
+ create_listener();
ltt_trace_setup("auto");
result = ltt_trace_set_type("auto", "ustrelay");
if(result < 0) {
ltt_trace_setup("auto");
result = ltt_trace_set_type("auto", "ustrelay");
if(result < 0) {
This page took
0.029415 seconds
and
4
git commands to generate.