#define MSG_NOTIF 1
#define MSG_REGISTER_NOTIF 2
-char consumer_stack[10000];
-
/* This should only be accessed by the constructor, before the creation
* of the listener, and then only by the listener.
*/
};
/* volatile because shared between the listener and the main thread */
-volatile sig_atomic_t buffers_to_export = 0;
+int buffers_to_export = 0;
struct trctl_msg {
/* size: the size of all the fields except size itself */
static int init_socket(void);
-int fd_notif = -1;
-void notif_cb(void)
-{
- int result;
- struct trctl_msg msg;
-
- /* FIXME: fd_notif should probably be protected by a spinlock */
-
- if(fd_notif == -1)
- return;
-
- msg.type = MSG_NOTIF;
- msg.size = sizeof(msg.type);
-
- /* FIXME: don't block here */
- result = write(fd_notif, &msg, msg.size+sizeof(msg.size));
- if(result == -1) {
- PERROR("write");
- return;
- }
-}
-
/* Ask the daemon to collect a trace called trace_name and being
* produced by this pid.
*
}
for(i=0; i < trace->nr_channels; i++) {
- /* iterate on all cpus */
- for(j=0; j<trace->channels[i].n_cpus; j++) {
- char *buf;
- asprintf(&buf, "%s_%d", trace->channels[i].channel_name, j);
- result = ustcomm_request_consumer(pid, buf);
- if(result == -1) {
- WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name);
- /* continue even if fail */
+ if(trace->channels[i].request_collection) {
+ /* iterate on all cpus */
+ for(j=0; j<trace->channels[i].n_cpus; j++) {
+ char *buf;
+ asprintf(&buf, "%s_%d", trace->channels[i].channel_name, j);
+ result = ustcomm_request_consumer(pid, buf);
+ if(result == -1) {
+ WARN("Failed to request collection for channel %s. Is the daemon available?", trace->channels[i].channel_name);
+ /* continue even if fail */
+ }
+ free(buf);
+ STORE_SHARED(buffers_to_export, LOAD_SHARED(buffers_to_export)+1);
}
- free(buf);
- buffers_to_export++;
}
}
*/
if(uatomic_read(&buf->consumed) == 0) {
DBG("decrementing buffers_to_export");
- buffers_to_export--;
+ STORE_SHARED(buffers_to_export, LOAD_SHARED(buffers_to_export)-1);
}
break;
DBG("put_subbuf");
- channel_and_cpu = strdup_malloc(nth_token(recvbuf, 1));
+ channel_and_cpu = strdup(nth_token(recvbuf, 1));
if(channel_and_cpu == NULL) {
ERR("cannot parse channel");
retval = -1;
goto end;
}
- consumed_old_str = strdup_malloc(nth_token(recvbuf, 2));
+ consumed_old_str = strdup(nth_token(recvbuf, 2));
if(consumed_old_str == NULL) {
ERR("cannot parse consumed_old");
retval = -1;
free(reply);
}
-// else if(nth_token_is(recvbuf, "get_notifications", 0) == 1) {
-// struct ust_trace *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) {
-// ERR("cannot find trace!");
-// return (void *)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);
}
}
}
+ if(getenv("UST_OVERWRITE")) {
+ int val = atoi(getenv("UST_OVERWRITE"));
+ if(val == 0 || val == 1) {
+ STORE_SHARED(ust_channels_overwrite_by_default, val);
+ }
+ else {
+ WARN("invalid value for UST_OVERWRITE");
+ }
+ }
+
+ if(getenv("UST_AUTOCOLLECT")) {
+ int val = atoi(getenv("UST_AUTOCOLLECT"));
+ if(val == 0 || val == 1) {
+ STORE_SHARED(ust_channels_request_collection_by_default, val);
+ }
+ else {
+ WARN("invalid value for UST_AUTOCOLLECT");
+ }
+ }
+
if(getenv("UST_TRACE")) {
char trace_name[] = "auto";
char trace_type[] = "ustrelay";
int result;
result = pthread_cancel(listener_thread);
- if(result == -1) {
- PERROR("pthread_cancel");
+ if(result != 0) {
+ ERR("pthread_cancel: %s", strerror(result));
}
result = pthread_join(listener_thread, NULL);
- if(result == -1) {
- PERROR("pthread_join");
+ if(result != 0) {
+ ERR("pthread_join: %s", strerror(result));
}
}
static void __attribute__((destructor)) keepalive()
{
- if(trace_recording() && buffers_to_export) {
+ if(trace_recording() && LOAD_SHARED(buffers_to_export)) {
int total = 0;
DBG("Keeping process alive for consumer daemon...");
- while(buffers_to_export) {
+ while(LOAD_SHARED(buffers_to_export)) {
const int interv = 200000;
restarting_usleep(interv);
total += interv;
/* free app, keeping socket file */
ustcomm_fini_app(&ustcomm_app, 1);
- buffers_to_export = 0;
+ STORE_SHARED(buffers_to_export, 0);
have_listener = 0;
init_socket();
create_listener();