add TODO

[ust.git] / ustd / ustd.c

diff --git a/ustd/ustd.c b/ustd/ustd.c
index bfa6352e1ccf2b4063660ff279b007f29ec3702a..21da4ebb8785d620018b75e5736ee27cc2265e18 100644 (file)
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -259,7 +259,7 @@ struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
 
        result = sscanf(received_msg, "%d %d", &buf->shmid, &buf->bufstruct_shmid);
        if(result != 2) {
-               ERR("unable to parse response to get_shmid");
+               ERR("unable to parse response to get_shmid (\"%s\")", received_msg);
                return NULL;
        }
        free(received_msg);
@@ -342,7 +342,7 @@ struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
        }
        free(tmp);
 
-       asprintf(&tmp, "%s/%u_%lld/%s_0", trace_path, buf->pid, buf->pidunique, buf->name);
+       asprintf(&tmp, "%s/%u_%lld/%s", 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");
@@ -359,6 +359,24 @@ struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
        return buf;
 }
 
+int write_current_subbuffer(struct buffer_info *buf)
+{
+       int result;
+
+       void *subbuf_mem = buf->mem + (buf->consumed_old & (buf->n_subbufs * buf->subbuf_size-1));
+
+       size_t cur_sb_size = subbuffer_data_size(subbuf_mem);
+
+       result = patient_write(buf->file_fd, subbuf_mem, cur_sb_size);
+       if(result == -1) {
+               PERROR("write");
+               /* FIXME: maybe drop this trace */
+               return 0;
+       }
+
+       return 0;
+}
+
 int consumer_loop(struct buffer_info *buf)
 {
        int result;
@@ -382,11 +400,8 @@ int consumer_loop(struct buffer_info *buf)
                }
 
                /* write data to file */
-               result = patient_write(buf->file_fd, buf->mem + (buf->consumed_old & (buf->n_subbufs * buf->subbuf_size-1)), buf->subbuf_size);
-               if(result == -1) {
-                       PERROR("write");
-                       /* FIXME: maybe drop this trace */
-               }
+               write_current_subbuffer(buf);
+               /* FIXME: handle return value? */
 
                /* put the subbuffer */
                /* FIXME: we actually should unput the buffer before consuming... */
@@ -545,7 +560,7 @@ static int write_pidfile(const char *file_name, pid_t pid)
 {
        FILE *pidfp;
 
-       pidfp = fopen(file_name, "w+");
+       pidfp = fopen(file_name, "w");
        if(!pidfp) {
                PERROR("fopen (%s)", pidfile);
                WARN("killing child process");
@@ -698,7 +713,6 @@ int start_ustd_daemon()
        }
        else {
                char buf;
-               FILE *pidfp;
 
                result = read(fd[0], &buf, 1);
                if(result == -1) {