#include <sys/socket.h>
#include <sys/un.h>
#include <sched.h>
+
+#include "marker.h"
+
#define UNIX_PATH_MAX 108
//#define SOCKETDIR "/var/run/ust/socks"
char mysocketfile[UNIX_PATH_MAX] = "";
int pfd = -1;
+
+static void print_markers(void)
+{
+ struct marker_iter iter;
+
+ marker_iter_reset(&iter);
+ marker_iter_start(&iter);
+
+ while(iter.marker) {
+ fprintf(stderr, "marker: %s_%s \"%s\"\n", iter.marker->channel, iter.marker->name, iter.marker->format);
+ marker_iter_next(&iter);
+ }
+}
+
void do_command(struct tracecmd *cmd)
{
}
}
}
+char recvbuf[10000];
+
int listener_main(void *p)
{
int result;
- /* Allowing only 1 connection for now. */
- result = listen(pfd, 1);
- if(result == -1) {
- PERROR("listen");
- return 1;
- }
-
for(;;) {
-
uint32_t size;
- int fd;
struct sockaddr_un addr;
socklen_t addrlen = sizeof(addr);
-
- result = fd = accept(pfd, (struct sockaddr *)&addr, &addrlen);
- if(result == -1) {
- PERROR("accept");
- continue;
- }
+ char trace_name[] = "auto";
+ char trace_type[] = "ustrelay";
for(;;) {
struct trctl_msg msg;
- unsigned char dontclose=0;
+ int len;
- result = read(fd, &msg.size, sizeof(msg.size));
+ result = len = recvfrom(pfd, recvbuf, sizeof(recvbuf), 0, &addr, &addrlen);
if(result == -1) {
- PERROR("read");
+ PERROR("recvfrom");
continue;
}
- if(size > MAX_MSG_SIZE) {
- ERR("trctl message too big");
- break;
- }
+ if(recvbuf[len-1] == '\n')
+ recvbuf[len-1] = '\0';
- result = read(fd, &msg.type, sizeof(msg.type));
- if(result == -1) {
- PERROR("read");
- continue;
+ fprintf(stderr, "received a message! it's: %s\n", recvbuf);
+
+
+ if(!strcmp(recvbuf, "print_markers")) {
+ print_markers();
}
+ else if(!strcmp(recvbuf, "trace_setup")) {
+ DBG("trace setup");
+
+ result = ltt_trace_setup(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_setup failed");
+ return;
+ }
+
+ result = ltt_trace_set_type(trace_name, trace_type);
+ if(result < 0) {
+ ERR("ltt_trace_set_type failed");
+ return;
+ }
+ }
+ else if(!strcmp(recvbuf, "trace_alloc")) {
+ DBG("trace alloc");
+
+ result = ltt_trace_alloc(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_alloc failed");
+ return;
+ }
+ }
+ else if(!strcmp(recvbuf, "trace_start")) {
+ DBG("trace start");
+
+ result = ltt_trace_start(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_start failed");
+ return;
+ }
+ }
+ else if(!strcmp(recvbuf, "trace_stop")) {
+ DBG("trace stop");
+
+ result = ltt_trace_stop(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_stop failed");
+ return;
+ }
+ }
+ else if(!strcmp(recvbuf, "trace_destroy")) {
+
+ DBG("trace destroy");
- switch(msg.type) {
- case MSG_REGISTER_NOTIF:
- /* TODO: put it in notif mode */
- goto next_conn;
- };
+ result = ltt_trace_destroy(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_destroy failed");
+ return;
+ }
+ }
}
next_conn:;
}
int result;
static char listener_stack[16384];
- result = clone(listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM, NULL);
+ 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");
}
void sighandler(int sig)
{
DBG("sighandler");
- receive_commands();
+ create_listener();
}
/* Called by the app signal handler to chain it to us. */
struct sockaddr_un addr;
- result = fd = socket(PF_UNIX, SOCK_SEQPACKET, 0);
+ result = fd = socket(PF_UNIX, SOCK_DGRAM, 0);
if(result == -1) {
PERROR("socket");
return -1;
return 0;
}
-static void __attribute__((constructor)) init()
+static void auto_probe_connect(struct marker *m)
{
int result;
+ result = ltt_marker_connect(m->channel, m->name, "default");
+ if(result)
+ ERR("ltt_marker_connect");
+
+ 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 __attribute__((constructor(1000))) init()
+{
+ int result;
+
+ DBG("UST_TRACE constructor");
+
mypid = getpid();
+ if(getenv("UST_TRACE")) {
+ char trace_name[] = "auto";
+ char trace_type[] = "ustrelay";
+
+ DBG("starting early tracing");
+
+ /* Ensure marker control is initialized */
+ init_marker_control();
+
+ /* Ensure relay is initialized */
+ init_ustrelay_transport();
+
+ /* Ensure markers are initialized */
+ init_markers();
+
+ /* In case. */
+ ltt_channels_register("ust");
+
+ result = ltt_trace_setup(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_setup failed");
+ return;
+ }
+
+ result = ltt_trace_set_type(trace_name, trace_type);
+ if(result < 0) {
+ ERR("ltt_trace_set_type failed");
+ return;
+ }
+
+ result = ltt_trace_alloc(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_alloc failed");
+ return;
+ }
+
+ result = ltt_trace_start(trace_name);
+ if(result < 0) {
+ ERR("ltt_trace_start failed");
+ return;
+ }
+ }
+
/* Must create socket before signal handler to prevent races
* on pfd variable.
*/
projects / ust.git / blobdiff