#include "tracer.h"
#include "localerr.h"
#include "ustcomm.h"
+#include "relay.h" /* FIXME: remove */
//#define USE_CLONE
-#define UNIX_PATH_MAX 108
-
-#define SOCKETDIR "/tmp/socks"
-#define SOCKETDIRLEN sizeof(SOCKETDIR)
#define USTSIGNAL SIGIO
#define MAX_MSG_SIZE (100)
char payload[94];
};
-char mysocketfile[UNIX_PATH_MAX] = "";
-//int pfd = -1;
-
struct consumer_channel {
int fd;
struct ltt_channel_struct *chan;
}
}
-#define CONSUMER_DAEMON_SOCK SOCKETDIR "/ustd"
-
static int inform_consumer_daemon(void)
{
ustcomm_request_consumer(getpid(), "metadata");
free(channel_name);
free(consumed_old_str);
}
+ else if(nth_token_is(recvbuf, "get_notifications", 0) == 1) {
+ struct ltt_trace_struct *trace;
+ char trace_name[] = "auto";
+ int i;
+ char *channel_name;
+
+ DBG("get_notifications");
+
+ channel_name = strdup_malloc(nth_token(recvbuf, 1));
+ if(channel_name == NULL) {
+ ERR("put_subbuf_size: cannot parse channel");
+ goto next_cmd;
+ }
+
+ ltt_lock_traces();
+ trace = _ltt_trace_find(trace_name);
+ ltt_unlock_traces();
+
+ if(trace == NULL) {
+ CPRINTF("cannot find trace!");
+ return 1;
+ }
+
+ for(i=0; i<trace->nr_channels; i++) {
+ struct rchan *rchan = trace->channels[i].trans_channel_data;
+ int fd;
+
+ 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;
+
+ result = fd = ustcomm_app_detach_client(&ustcomm_app, &src);
+ if(result == -1) {
+ ERR("ustcomm_app_detach_client failed");
+ goto next_cmd;
+ }
+
+ lttbuf->wake_consumer_arg = (void *) fd;
+
+ smp_wmb();
+
+ lttbuf->call_wake_consumer = 1;
+
+ break;
+ }
+ }
+
+ free(channel_name);
+ }
else {
ERR("unable to parse message: %s", recvbuf);
}
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");
+// }
}
static int init_signal_handler(void)
DBG("just auto connected marker %s %s to probe default", m->channel, m->name);
}
+/* Wake the consumer of a buffer
+ *
+ * wake_consumer_cb is called in tracing context so it must haste.
+ *
+ * FIXME: don't do a system call here; maybe schedule work to be done
+ * in listener context? Once this is done in listener context, we can
+ * check for the return value of send_message_fd and remove the fd if necessary
+ *
+ * @arg: the buffer
+ * @finished: 0: subbuffer full; 1: buffer being destroyed
+ */
+
+static void wake_consumer_cb(void *arg, int finished)
+{
+ struct ltt_channel_buf_struct *ltt_buf = (struct ltt_channel_buf_struct *) arg;
+ int fd = (int)ACCESS_ONCE(arg);
+
+ if(!finished) {
+ send_message_fd(fd, "consume", NULL);
+ }
+ else {
+ send_message_fd(fd, "destroyed", NULL);
+ }
+}
+
static void __attribute__((constructor(101))) init0()
{
DBG("UST_AUTOPROBE constructor");
if(getenv("UST_AUTOPROBE")) {
marker_set_new_marker_cb(auto_probe_connect);
}
+
+ relay_set_wake_consumer(wake_consumer_cb);
}
static void fini(void);
}
+void (*wake_consumer)(void *, int) = NULL;
+
+void relay_set_wake_consumer(void (*wake)(void *, int))
+{
+ wake_consumer = wake;
+}
+
+void relay_wake_consumer(void *arg, int finished)
+{
+ if(wake_consumer)
+ wake_consumer(arg, finished);
+}
+
static notrace void ltt_deliver(struct rchan_buf *buf, unsigned int subbuf_idx,
void *subbuf)
{
(struct ltt_channel_struct *)buf->chan->private_data;
struct ltt_channel_buf_struct *ltt_buf = channel->buf;
- atomic_set(<t_buf->wakeup_readers, 1);
+ if(ltt_buf->call_wake_consumer)
+ relay_wake_consumer(ACCESS_ONCE(ltt_buf->wake_consumer_arg), 0);
+//ust// atomic_set(<t_buf->wakeup_readers, 1);
}
static struct dentry *ltt_create_buf_file_callback(struct rchan_buf *buf)
consumed_old = consumed_old | uconsumed_old;
consumed_new = SUBBUF_ALIGN(consumed_old, buf->chan);
- spin_lock(<t_buf->full_lock);
+//ust// spin_lock(<t_buf->full_lock);
if (atomic_long_cmpxchg(<t_buf->consumed, consumed_old,
consumed_new)
!= consumed_old) {
/* We have been pushed by the writer : the last
* buffer read _is_ corrupted! It can also
* happen if this is a buffer we never got. */
- spin_unlock(<t_buf->full_lock);
+//ust// spin_unlock(<t_buf->full_lock);
return -EIO;
} else {
/* tell the client that buffer is now unfull */
index = SUBBUF_INDEX(consumed_old, buf->chan);
data = BUFFER_OFFSET(consumed_old, buf->chan);
ltt_buf_unfull(buf, index, data);
- spin_unlock(<t_buf->full_lock);
+//ust// spin_unlock(<t_buf->full_lock);
}
return 0;
}
for (j = 0; j < n_subbufs; j++)
local_set(<t_buf->commit_count[j], 0);
//ust// init_waitqueue_head(<t_buf->write_wait);
- atomic_set(<t_buf->wakeup_readers, 0);
- spin_lock_init(<t_buf->full_lock);
+//ust// atomic_set(<t_buf->wakeup_readers, 0);
+//ust// spin_lock_init(<t_buf->full_lock);
ltt_buffer_begin_callback(buf, trace->start_tsc, 0);
local_set(<t_buf->events_lost, 0);
local_set(<t_buf->corrupted_subbuffers, 0);
+ ltt_buf->call_wake_consumer = 0;
+ ltt_buf->wake_consumer_arg = NULL;
+
return 0;
}
*/
static notrace void ltt_relay_buffer_flush(struct rchan_buf *buf)
{
+ struct ltt_channel_struct *channel =
+ (struct ltt_channel_struct *)buf->chan->private_data;
+ struct ltt_channel_buf_struct *ltt_buf = channel->buf;
+
buf->finalized = 1;
ltt_force_switch(buf, FORCE_FLUSH);
+
+ relay_wake_consumer(ltt_buf, 1);
}
static void ltt_relay_async_wakeup_chan(struct ltt_channel_struct *ltt_channel)
//ust// unsigned int page_count; /* number of current buffer pages */
unsigned int finalized; /* buffer has been finalized */
//ust// unsigned int cpu; /* this buf's cpu */
- int shmid;
+ int shmid; /* the shmid of the buffer data pages */
} ____cacheline_aligned;
/*
*/
local_t events_lost;
local_t corrupted_subbuffers;
- spinlock_t full_lock; /*
- * buffer full condition spinlock, only
- * for userspace tracing blocking mode
- * synchronization with reader.
- */
+//ust// spinlock_t full_lock; /*
+//ust// * buffer full condition spinlock, only
+//ust// * for userspace tracing blocking mode
+//ust// * synchronization with reader.
+//ust// */
//ust// wait_queue_head_t write_wait; /*
//ust// * Wait queue for blocking user space
//ust// * writers
//ust// */
- atomic_t wakeup_readers; /* Boolean : wakeup readers waiting ? */
+//ust// atomic_t wakeup_readers; /* Boolean : wakeup readers waiting ? */
+ /* whether or not wake_consumer must be called; must be accessed atomically */
+ int call_wake_consumer;
+ /* the arg to pass to wake_consumer; must be accessed atomically */
+ void *wake_consumer_arg;
} ____cacheline_aligned;
int ltt_do_get_subbuf(struct rchan_buf *buf, struct ltt_channel_buf_struct *ltt_buf, long *pconsumed_old);
return ustcomm_recv_message(&app->server, msg, src, timeout);
}
+/* This removes src from the list of active connections of app.
+ */
+
+int ustcomm_app_detach_client(struct ustcomm_app *app, struct ustcomm_source *src)
+{
+ struct ustcomm_server *server = (struct ustcomm_server *)app;
+ struct ustcomm_connection *conn;
+
+ list_for_each_entry(conn, &server->connections, list) {
+ if(conn->fd == src->fd) {
+ list_del(&conn->list);
+ goto found;
+ }
+ }
+
+ return -1;
+found:
+ return src->fd;
+}
+
static int init_named_socket(char *name, char **path_out)
{
int result;
#define mutex_unlock(m) pthread_mutex_unlock(m)
-/* SPINLOCKS */
-
-typedef int spinlock_t;
-
-#define spin_lock(a) /* nothing */
-#define spin_unlock(a) /* nothing */
-#define spin_lock_init(a) /* nothing */
-
/* MALLOCATION */
projects / ust.git / commitdiff
