+/* Copyright (C) 2009 Pierre-Marc Fournier
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#define _GNU_SOURCE
#include <stdio.h>
#include <stdint.h>
#include <fcntl.h>
#include <poll.h>
+#include <urcu.h>
+
#include "marker.h"
#include "tracer.h"
#include "localerr.h"
#include "ustcomm.h"
#include "relay.h" /* FIXME: remove */
+#include "marker-control.h"
//#define USE_CLONE
unlock_markers();
}
-void do_command(struct tracecmd *cmd)
-{
-}
+static int init_socket(void);
-void receive_commands()
+/* 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;
idx++;
}
- result = poll(fds, n_fds, 0);
+ while((result = poll(fds, n_fds, 0)) == -1 && errno == EINTR)
+ /* nothing */;
if(result == -1) {
PERROR("poll");
return;
{
int result;
+ ust_register_thread();
+
DBG("LISTENER");
for(;;) {
- uint32_t size;
- struct sockaddr_un addr;
- socklen_t addrlen = sizeof(addr);
char trace_name[] = "auto";
char trace_type[] = "ustrelay";
char *recvbuf;
ltt_unlock_traces();
if(trace == NULL) {
- CPRINTF("cannot find trace!");
+ ERR("cannot find trace!");
return (void *)1;
}
struct rchan *rchan = trace->channels[i].trans_channel_data;
struct rchan_buf *rbuf = rchan->buf;
struct ltt_channel_struct *ltt_channel = (struct ltt_channel_struct *)rchan->private_data;
- struct ltt_channel_buf_struct *ltt_buf = ltt_channel->buf;
if(!strcmp(trace->channels[i].channel_name, channel_name)) {
char *reply;
ltt_unlock_traces();
if(trace == NULL) {
- CPRINTF("cannot find trace!");
+ ERR("cannot find trace!");
return (void *)1;
}
ltt_unlock_traces();
if(trace == NULL) {
- CPRINTF("cannot find trace!");
+ ERR("cannot find trace!");
return (void *)1;
}
ltt_unlock_traces();
if(trace == NULL) {
- CPRINTF("cannot find trace!");
+ ERR("cannot find trace!");
return (void *)1;
}
if(!strcmp(trace->channels[i].channel_name, channel_name)) {
struct rchan_buf *rbuf = rchan->buf;
struct ltt_channel_buf_struct *lttbuf = trace->channels[i].buf;
- char *reply;
- long consumed_old=0;
- int fd;
struct blocked_consumer *bc;
bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer));
ltt_unlock_traces();
if(trace == NULL) {
- CPRINTF("cannot find trace!");
+ ERR("cannot find trace!");
return (void *)1;
}
char *channel_slash_name = nth_token(recvbuf, 1);
char channel_name[256]="";
char marker_name[256]="";
- struct marker_iter iter;
result = sscanf(channel_slash_name, "%255[^/]/%255s", channel_name, marker_name);
char *channel_slash_name = nth_token(recvbuf, 1);
char *marker_name;
char *channel_name;
- struct marker_iter iter;
result = sscanf(channel_slash_name, "%a[^/]/%as", &channel_name, &marker_name);
// ltt_unlock_traces();
//
// if(trace == NULL) {
-// CPRINTF("cannot find trace!");
+// ERR("cannot find trace!");
// return (void *)1;
// }
//
}
}
-static char listener_stack[16384];
+int have_listener = 0;
void create_listener(void)
{
- int result;
+#ifdef USE_CLONE
static char listener_stack[16384];
- //char *listener_stack = malloc(16384);
+#else
+ pthread_t thread;
+#endif
+
+ if(have_listener)
+ return;
#ifdef USE_CLONE
result = clone(listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL);
if(result == -1) {
perror("clone");
+ return;
}
#else
- pthread_t thread;
pthread_create(&thread, NULL, listener_main, NULL);
#endif
+
+ have_listener = 1;
}
/* The signal handler itself. Signals must be setup so there cannot be
return ustcomm_init_app(getpid(), &ustcomm_app);
}
+/* FIXME: reenable this to delete socket file. */
+
+#if 0
static void destroy_socket(void)
{
-// int result;
-//
-// if(mysocketfile[0] == '\0')
-// return;
-//
-// result = unlink(mysocketfile);
-// if(result == -1) {
-// PERROR("unlink");
-// }
+ int result;
+
+ if(mysocketfile[0] == '\0')
+ return;
+
+ result = unlink(mysocketfile);
+ if(result == -1) {
+ PERROR("unlink");
+ }
}
+#endif
static int init_signal_handler(void)
{
int result;
result = ltt_marker_connect(m->channel, m->name, "default");
- if(result)
- ERR("ltt_marker_connect");
+ if(result && result != -EEXIST)
+ ERR("ltt_marker_connect (marker = %s/%s, errno = %d)", m->channel, m->name, -result);
DBG("just auto connected marker %s %s to probe default", m->channel, m->name);
}
static void __attribute__((constructor(101))) init0()
{
DBG("UST_AUTOPROBE constructor");
- if(getenv("UST_AUTOPROBE")) {
- marker_set_new_marker_cb(auto_probe_connect);
- }
}
-static void fini(void);
-
static void __attribute__((constructor(1000))) init()
{
int result;
+ /* Initialize RCU in case the constructor order is not good. */
+ urcu_init();
+
+ /* It is important to do this before events start to be generated. */
+ ust_register_thread();
+
DBG("UST_TRACE constructor");
/* Must create socket before signal handler to prevent races.
return;
}
+ if(getenv("UST_AUTOPROBE")) {
+ struct marker_iter iter;
+
+ DBG("IN AUTOPROBE\n");
+
+ /* Ensure markers are initialized */
+ //init_markers();
+
+ /* Ensure marker control is initialized, for the probe */
+ init_marker_control();
+
+ /* first, set the callback that will connect the
+ * probe on new markers
+ */
+ marker_set_new_marker_cb(auto_probe_connect);
+
+ /* Now, connect the probes that were already registered. */
+ marker_iter_reset(&iter);
+ marker_iter_start(&iter);
+
+ DBG("now iterating on markers already registered\n");
+ while(iter.marker) {
+ DBG("now iterating on marker %s\n", iter.marker->name);
+ auto_probe_connect(iter.marker);
+ marker_iter_next(&iter);
+ }
+ }
+
if(getenv("UST_TRACE")) {
char trace_name[] = "auto";
char trace_type[] = "ustrelay";
destroy_socket();
}
#endif
+
+/* Notify ust that there was a fork. This needs to be called inside
+ * the new process, anytime a process whose memory is not shared with
+ * the parent is created. If this function is not called, the events
+ * of the new process will not be collected.
+ */
+
+void ust_fork(void)
+{
+ DBG("ust: forking");
+ ltt_trace_stop("auto");
+ ltt_trace_destroy("auto");
+ ltt_trace_alloc("auto");
+ ltt_trace_start("auto");
+ init_socket();
+ have_listener = 0;
+ create_listener();
+ ustcomm_request_consumer(getpid(), "metadata");
+ ustcomm_request_consumer(getpid(), "ust");
+}
+
projects / ust.git / blobdiff