improve error handling

[ust.git] / ustd / ustd.c

diff --git a/ustd/ustd.c b/ustd/ustd.c
index fdf8d13f8d2f1fe418b1604a1b6baad3a1114fd1..7d1eb49cec6de8d51157ca3c377a0d0be8d2318c 100644 (file)
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -65,12 +65,12 @@ int test_sigpipe(void)
 
        result = sigemptyset(&sigset);
        if(result == -1) {
-               perror("sigemptyset");
+               PERROR("sigemptyset");
                return -1;
        }
        result = sigaddset(&sigset, SIGPIPE);
        if(result == -1) {
-               perror("sigaddset");
+               PERROR("sigaddset");
                return -1;
        }
 
@@ -80,7 +80,7 @@ int test_sigpipe(void)
                return 0;
        }
        else if(result == -1) {
-               perror("sigtimedwait");
+               PERROR("sigtimedwait");
                return -1;
        }
        else if(result == SIGPIPE) {
@@ -94,32 +94,30 @@ int test_sigpipe(void)
 
 int get_subbuffer(struct buffer_info *buf)
 {
-       char *send_msg;
-       char *received_msg;
-       char *rep_code;
+       char *send_msg=NULL;
+       char *received_msg=NULL;
+       char *rep_code=NULL;
        int retval;
        int result;
 
        asprintf(&send_msg, "get_subbuffer %s", buf->name);
        result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
-       free(send_msg);
        if(test_sigpipe()) {
                WARN("process %d destroyed before we could connect to it", buf->pid);
-               return GET_SUBBUF_DONE;
+               retval = GET_SUBBUF_DONE;
+               goto end;
        }
        else if(result < 0) {
                ERR("get_subbuffer: ustcomm_send_request failed");
-               return -1;
-       }
-       else if(result == 0) {
-               DBG("app died while being traced");
-               return GET_SUBBUF_DIED;
+               retval = -1;
+               goto end;
        }
 
        result = sscanf(received_msg, "%as %ld", &rep_code, &buf->consumed_old);
        if(result != 2 && result != 1) {
                ERR("unable to parse response to get_subbuffer");
-               return -1;
+               retval = -1;
+               goto end_rep;
        }
 
        DBG("received msg is %s", received_msg);
@@ -129,7 +127,8 @@ int get_subbuffer(struct buffer_info *buf)
                retval = GET_SUBBUF_OK;
        }
        else if(nth_token_is(received_msg, "END", 0) == 1) {
-               return GET_SUBBUF_DONE;
+               retval = GET_SUBBUF_DONE;
+               goto end_rep;
        }
        else {
                DBG("error getting subbuffer %s", buf->name);
@@ -137,33 +136,44 @@ int get_subbuffer(struct buffer_info *buf)
        }
 
        /* FIMXE: free correctly the stuff */
-       free(received_msg);
-       free(rep_code);
+end_rep:
+       if(rep_code)
+               free(rep_code);
+end:
+       if(send_msg)
+               free(send_msg);
+       if(received_msg)
+               free(received_msg);
+
        return retval;
 }
 
 int put_subbuffer(struct buffer_info *buf)
 {
-       char *send_msg;
-       char *received_msg;
-       char *rep_code;
+       char *send_msg=NULL;
+       char *received_msg=NULL;
+       char *rep_code=NULL;
        int retval;
        int result;
 
        asprintf(&send_msg, "put_subbuffer %s %ld", buf->name, buf->consumed_old);
        result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+       if(result < 0 && errno == ECONNRESET) {
+               retval = PUT_SUBBUF_DIED;
+               goto end;
+       }
        if(result < 0) {
                ERR("put_subbuffer: send_message failed");
-               return -1;
+               retval = -1;
+               goto end;
        }
-       free(send_msg);
 
        result = sscanf(received_msg, "%as", &rep_code);
        if(result != 1) {
                ERR("unable to parse response to put_subbuffer");
-               return -1;
+               retval = -1;
+               goto end_rep;
        }
-       free(received_msg);
 
        if(!strcmp(rep_code, "OK")) {
                DBG("subbuffer put %s", buf->name);
@@ -171,10 +181,20 @@ int put_subbuffer(struct buffer_info *buf)
        }
        else {
                DBG("put_subbuffer: received error, we were pushed");
-               return PUT_SUBBUF_PUSHED;
+               retval = PUT_SUBBUF_PUSHED;
+               goto end_rep;
        }
 
-       free(rep_code);
+end_rep:
+       if(rep_code)
+               free(rep_code);
+
+end:
+       if(send_msg)
+               free(send_msg);
+       if(received_msg)
+               free(received_msg);
+
        return retval;
 }
 
@@ -253,6 +273,7 @@ void *consumer_thread(void *arg)
                        WARN("application died while putting subbuffer");
                        /* FIXME: probably need to skip the first subbuffer in finish_consuming_dead_subbuffer */
                        finish_consuming_dead_subbuffer(buf);
+                       break;
                }
                else if(result == PUT_SUBBUF_OK) {
                }
@@ -273,7 +294,7 @@ int create_dir_if_needed(char *dir)
        result = mkdir(dir, 0777);
        if(result == -1) {
                if(errno != EEXIST) {
-                       perror("mkdir");
+                       PERROR("mkdir");
                        return -1;
                }
        }
@@ -326,6 +347,23 @@ int add_buffer(pid_t pid, char *bufname)
                return -1;
        }
 
+       /* get pidunique */
+       asprintf(&send_msg, "get_pidunique");
+       result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
+       free(send_msg);
+       if(result == -1) {
+               ERR("problem in ustcomm_send_request(get_pidunique)");
+               return -1;
+       }
+
+       result = sscanf(received_msg, "%lld", &buf->pidunique);
+       if(result != 1) {
+               ERR("unable to parse response to get_pidunique");
+               return -1;
+       }
+       free(received_msg);
+       DBG("got pidunique %lld", buf->pidunique);
+
        /* get shmid */
        asprintf(&send_msg, "get_shmid %s", buf->name);
        result = ustcomm_send_request(&buf->conn, send_msg, &received_msg);
@@ -376,14 +414,14 @@ int add_buffer(pid_t pid, char *bufname)
        /* attach memory */
        buf->mem = shmat(buf->shmid, NULL, 0);
        if(buf->mem == (void *) 0) {
-               perror("shmat");
+               PERROR("shmat");
                return -1;
        }
        DBG("successfully attached buffer memory");
 
        buf->bufstruct_mem = shmat(buf->bufstruct_shmid, NULL, 0);
        if(buf->bufstruct_mem == (void *) 0) {
-               perror("shmat");
+               PERROR("shmat");
                return -1;
        }
        DBG("successfully attached buffer bufstruct memory");
@@ -391,7 +429,7 @@ int add_buffer(pid_t pid, char *bufname)
        /* obtain info on the memory segment */
        result = shmctl(buf->shmid, IPC_STAT, &shmds);
        if(result == -1) {
-               perror("shmctl");
+               PERROR("shmctl");
                return -1;
        }
        buf->memlen = shmds.shm_segsz;
@@ -411,7 +449,7 @@ int add_buffer(pid_t pid, char *bufname)
                trace_path = USTD_DEFAULT_TRACE_PATH;
        }
 
-       asprintf(&tmp, "%s/%u", trace_path, buf->pid);
+       asprintf(&tmp, "%s/%u_%lld", trace_path, buf->pid, buf->pidunique);
        result = create_dir_if_needed(tmp);
        if(result == -1) {
                ERR("could not create directory %s", tmp);
@@ -420,8 +458,8 @@ int add_buffer(pid_t pid, char *bufname)
        }
        free(tmp);
 
-       asprintf(&tmp, "%s/%u/%s_0", trace_path, buf->pid, buf->name);
-       result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00600);
+       asprintf(&tmp, "%s/%u_%lld/%s_0", trace_path, buf->pid, buf->pidunique, buf->name);
+       result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 00600);
        if(result == -1) {
                PERROR("open");
                ERR("failed opening trace file %s", tmp);
@@ -511,7 +549,7 @@ int main(int argc, char **argv)
 
        result = sigemptyset(&sigset);
        if(result == -1) {
-               perror("sigemptyset");
+               PERROR("sigemptyset");
                return 1;
        }
        sa.sa_handler = sigterm_handler;
@@ -537,17 +575,17 @@ int main(int argc, char **argv)
        /* setup handler for SIGPIPE */
        result = sigemptyset(&sigset);
        if(result == -1) {
-               perror("sigemptyset");
+               PERROR("sigemptyset");
                return 1;
        }
        result = sigaddset(&sigset, SIGPIPE);
        if(result == -1) {
-               perror("sigaddset");
+               PERROR("sigaddset");
                return 1;
        }
        result = sigprocmask(SIG_BLOCK, &sigset, NULL);
        if(result == -1) {
-               perror("sigprocmask");
+               PERROR("sigprocmask");
                return 1;
        }