#define _GNU_SOURCE
#include <stdio.h>
+#include <stdlib.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
+#include <urcu/uatomic_arch.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
continue;
}
if(result == 0) {
+ int res;
DBG("PRODUCER END");
- close(bc->fd_producer);
+ res = close(bc->fd_producer);
+ if(res == -1) {
+ PERROR("close");
+ }
list_del(&bc->list);
if(trace == NULL) {
int result;
- WARN("Cannot find trace. It was likely destroyed by the user.");
+ 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");
/* Being here is the proof the daemon has mapped the buffer in its
* memory. We may now decrement buffers_to_export.
*/
- if(atomic_long_read(&buf->consumed) == 0) {
+ if(uatomic_read(&buf->consumed) == 0) {
DBG("decrementing buffers_to_export");
buffers_to_export--;
}
trace = _ltt_trace_find(trace_name);
if(trace == NULL) {
- WARN("Cannot find trace. It was likely destroyed by the user.");
+ 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");
return retval;
}
+static void listener_cleanup(void *ptr)
+{
+ ustcomm_fini_app(&ustcomm_app, 0);
+}
+
void *listener_main(void *p)
{
int result;
DBG("LISTENER");
+ pthread_cleanup_push(listener_cleanup, NULL);
+
for(;;) {
char trace_name[] = "auto";
char trace_type[] = "ustrelay";
next_cmd:
free(recvbuf);
}
+
+ pthread_cleanup_pop(1);
}
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;
-#else
- pthread_t thread;
#endif
if(have_listener) {
}
#else
- pthread_create(&thread, NULL, listener_main, NULL);
+ pthread_create(&listener_thread, NULL, listener_main, NULL);
#endif
have_listener = 1;
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
destroy_traces();
- ustcomm_fini_app(&ustcomm_app);
+ /* Ask the listener to stop and clean up. */
+ stop_listener();
}
void ust_potential_exec(void)
list_del(&bc->list);
}
- ustcomm_free_app(&ustcomm_app);
+ /* free app, keeping socket file */
+ ustcomm_fini_app(&ustcomm_app, 1);
buffers_to_export = 0;
have_listener = 0;