X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustd%2Fustd.c;h=5b45b6c812b94263d92ce81b8f4a8a06a81b70f3;hb=72ebd39abef77ed574ec88e5607c902afdea1cfa;hp=ab4ec7aaac38c281f3c4cc6ac8f2c735453784ff;hpb=0b0cd93782698872ea4778d29cd68091663ca367;p=ust.git
diff --git a/ustd/ustd.c b/ustd/ustd.c
index ab4ec7a..5b45b6c 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -1,18 +1,18 @@
-/*
- * Copyright (C) 2009 Pierre-Marc Fournier
+/* Copyright (C) 2009 Pierre-Marc Fournier
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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 program is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program. If not, see .
+ * 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
@@ -22,17 +22,18 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
+#include
#include "ustd.h"
#include "localerr.h"
#include "ustcomm.h"
-struct list_head buffers = LIST_HEAD_INIT(buffers);
-
/* return value: 0 = subbuffer is finished, it won't produce data anymore
* 1 = got subbuffer successfully
* <0 = error
@@ -42,6 +43,44 @@ struct list_head buffers = LIST_HEAD_INIT(buffers);
#define GET_SUBBUF_DONE 0
#define GET_SUBBUF_DIED 2
+#define PUT_SUBBUF_OK 1
+#define PUT_SUBBUF_DIED 0
+#define PUT_SUBBUF_PUSHED 2
+
+int test_sigpipe(void)
+{
+ sigset_t sigset;
+ int result;
+
+ result = sigemptyset(&sigset);
+ if(result == -1) {
+ perror("sigemptyset");
+ return -1;
+ }
+ result = sigaddset(&sigset, SIGPIPE);
+ if(result == -1) {
+ perror("sigaddset");
+ return -1;
+ }
+
+ result = sigtimedwait(&sigset, NULL, &(struct timespec){0,0});
+ if(result == -1 && errno == EAGAIN) {
+ /* no signal received */
+ return 0;
+ }
+ else if(result == -1) {
+ perror("sigtimedwait");
+ return -1;
+ }
+ else if(result == SIGPIPE) {
+ /* received sigpipe */
+ return 1;
+ }
+ else {
+ assert(0);
+ }
+}
+
int get_subbuffer(struct buffer_info *buf)
{
char *send_msg;
@@ -53,7 +92,11 @@ int get_subbuffer(struct buffer_info *buf)
asprintf(&send_msg, "get_subbuffer %s", buf->name);
result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
free(send_msg);
- if(result < 0) {
+ if(test_sigpipe()) {
+ WARN("process %d destroyed before we could connect to it", buf->pid);
+ return GET_SUBBUF_DONE;
+ }
+ else if(result < 0) {
ERR("get_subbuffer: ustcomm_send_request failed");
return -1;
}
@@ -113,16 +156,20 @@ int put_subbuffer(struct buffer_info *buf)
if(!strcmp(rep_code, "OK")) {
DBG("subbuffer put %s", buf->name);
- retval = 1;
+ retval = PUT_SUBBUF_OK;
}
else {
- ERR("invalid response to put_subbuffer");
+ DBG("put_subbuffer: received error, we were pushed");
+ return PUT_SUBBUF_PUSHED;
}
free(rep_code);
return retval;
}
+/* This write is patient because it restarts if it was incomplete.
+ */
+
ssize_t patient_write(int fd, const void *buf, size_t count)
{
const char *bufc = (const char *) buf;
@@ -175,9 +222,20 @@ void *consumer_thread(void *arg)
/* put the subbuffer */
result = put_subbuffer(buf);
if(result == -1) {
- ERR("error putting subbuffer");
+ ERR("unknown error putting subbuffer (channel=%s)", buf->name);
+ break;
+ }
+ else if(result == PUT_SUBBUF_PUSHED) {
+ ERR("Buffer overflow (channel=%s), reader pushed. This channel will not be usable passed this point.", buf->name);
break;
}
+ else if(result == PUT_SUBBUF_DIED) {
+ WARN("application died while putting subbuffer");
+ /* FIXME: probably need to skip the first subbuffer in finish_consuming_dead_subbuffer */
+ finish_consuming_dead_subbuffer(buf);
+ }
+ else if(result == PUT_SUBBUF_OK) {
+ }
}
DBG("thread for buffer %s is stopping", buf->name);
@@ -187,6 +245,20 @@ void *consumer_thread(void *arg)
return NULL;
}
+int create_dir_if_needed(char *dir)
+{
+ int result;
+ result = mkdir(dir, 0777);
+ if(result == -1) {
+ if(errno != EEXIST) {
+ perror("mkdir");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
int add_buffer(pid_t pid, char *bufname)
{
struct buffer_info *buf;
@@ -196,6 +268,7 @@ int add_buffer(pid_t pid, char *bufname)
char *tmp;
int fd;
pthread_t thr;
+ struct shmid_ds shmds;
buf = (struct buffer_info *) malloc(sizeof(struct buffer_info));
if(buf == NULL) {
@@ -209,15 +282,18 @@ int add_buffer(pid_t pid, char *bufname)
/* connect to app */
result = ustcomm_connect_app(buf->pid, &buf->conn);
if(result) {
- ERR("unable to connect to process");
+ WARN("unable to connect to process, it probably died before we were able to connect");
return -1;
}
/* get shmid */
asprintf(&send_msg, "get_shmid %s", buf->name);
- ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
free(send_msg);
- DBG("got buffer name %s", buf->name);
+ if(result == -1) {
+ ERR("problem in ustcomm_send_request(get_shmid)");
+ return -1;
+ }
result = sscanf(received_msg, "%d %d", &buf->shmid, &buf->bufstruct_shmid);
if(result != 2) {
@@ -229,8 +305,12 @@ int add_buffer(pid_t pid, char *bufname)
/* get n_subbufs */
asprintf(&send_msg, "get_n_subbufs %s", buf->name);
- ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+ result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
free(send_msg);
+ if(result == -1) {
+ ERR("problem in ustcomm_send_request(g_n_subbufs)");
+ return -1;
+ }
result = sscanf(received_msg, "%d", &buf->n_subbufs);
if(result != 1) {
@@ -268,18 +348,40 @@ int add_buffer(pid_t pid, char *bufname)
}
DBG("successfully attached buffer bufstruct memory");
+ /* obtain info on the memory segment */
+ result = shmctl(buf->shmid, IPC_STAT, &shmds);
+ if(result == -1) {
+ perror("shmctl");
+ return -1;
+ }
+ buf->memlen = shmds.shm_segsz;
+
/* open file for output */
- asprintf(&tmp, "/tmp/trace/%s_0", buf->name);
+ result = create_dir_if_needed(USTD_DEFAULT_TRACE_PATH);
+ if(result == -1) {
+ ERR("could not create directory %s", USTD_DEFAULT_TRACE_PATH);
+ return -1;
+ }
+
+ asprintf(&tmp, "%s/%u", USTD_DEFAULT_TRACE_PATH, buf->pid);
+ result = create_dir_if_needed(tmp);
+ if(result == -1) {
+ ERR("could not create directory %s", tmp);
+ free(tmp);
+ return -1;
+ }
+ free(tmp);
+
+ asprintf(&tmp, "%s/%u/%s_0", USTD_DEFAULT_TRACE_PATH, buf->pid, buf->name);
result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00600);
if(result == -1) {
PERROR("open");
+ ERR("failed opening trace file %s", tmp);
return -1;
}
buf->file_fd = fd;
free(tmp);
- //list_add(&buf->list, &buffers);
-
pthread_create(&thr, NULL, consumer_thread, buf);
return 0;
@@ -289,6 +391,7 @@ int main(int argc, char **argv)
{
struct ustcomm_ustd ustd;
int result;
+ sigset_t sigset;
result = ustcomm_init_ustd(&ustd);
if(result == -1) {
@@ -296,6 +399,22 @@ int main(int argc, char **argv)
return 1;
}
+ result = sigemptyset(&sigset);
+ if(result == -1) {
+ perror("sigemptyset");
+ return 1;
+ }
+ result = sigaddset(&sigset, SIGPIPE);
+ if(result == -1) {
+ perror("sigaddset");
+ return 1;
+ }
+ result = sigprocmask(SIG_BLOCK, &sigset, NULL);
+ if(result == -1) {
+ perror("sigprocmask");
+ return 1;
+ }
+
/* app loop */
for(;;) {
char *recvbuf;