#include <poll.h>
#include <regex.h>
-#include <urcu.h>
+#include <urcu-bp.h>
#include "marker.h"
#include "tracer.h"
marker_iter_start(&iter);
while(iter.marker) {
- fprintf(fp, "marker: %s_%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format);
+ fprintf(fp, "marker: %s/%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format);
marker_iter_next(&iter);
}
unlock_markers();
}
}
-int have_listener = 0;
+volatile sig_atomic_t have_listener = 0;
void create_listener(void)
{
void sighandler(int sig)
{
- static char have_listener = 0;
DBG("sighandler");
if(!have_listener) {
create_listener();
- have_listener = 1;
}
}
return;
}
- inform_consumer_daemon(trace_name);
-
result = ltt_trace_start(trace_name);
if(result < 0) {
ERR("ltt_trace_start failed");
return;
}
+
+ /* Do this after the trace is started in order to avoid creating confusion
+ * if the trace fails to start. */
+ inform_consumer_daemon(trace_name);
}
ustcomm_fini_app(&ustcomm_app);
}
-void ust_potential_exec(void)
+noinline void ust_potential_exec(void)
{
trace_mark(ust, potential_exec, MARK_NOARGS);
* of the new process will not be collected.
*/
-void ust_fork(void)
+noinline void ust_fork(void)
{
struct blocked_consumer *bc;
struct blocked_consumer *deletable_bc = NULL;
/* Delete all blocked consumers */
list_for_each_entry(bc, &blocked_consumers, list) {
+ close(bc->fd_producer);
+ close(bc->fd_consumer);
free(deletable_bc);
deletable_bc = bc;
list_del(&bc->list);