fix support for trace format 2.5

[ust.git] / ustd / ustd.c

diff --git a/ustd/ustd.c b/ustd/ustd.c
index fef0eae1680336dfe83eb05b8ca16b37d1d6fa39..21da4ebb8785d620018b75e5736ee27cc2265e18 100644 (file)
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -35,7 +35,6 @@
 #include "ustd.h"
 #include "usterr.h"
 #include "ustcomm.h"
-#include "share.h"
 
 /* return value: 0 = subbuffer is finished, it won't produce data anymore
  *               1 = got subbuffer successfully
@@ -260,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);
@@ -343,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");
@@ -360,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;
@@ -383,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... */
@@ -542,6 +556,24 @@ void sigterm_handler(int sig)
        terminate_req = 1;
 }
 
+static int write_pidfile(const char *file_name, pid_t pid)
+{
+       FILE *pidfp;
+
+       pidfp = fopen(file_name, "w");
+       if(!pidfp) {
+               PERROR("fopen (%s)", pidfile);
+               WARN("killing child process");
+               return -1;
+       }
+
+       fprintf(pidfp, "%d\n", pid);
+
+       fclose(pidfp);
+
+       return 0;
+}
+
 int start_ustd(int fd)
 {
        struct ustcomm_ustd ustd;
@@ -586,6 +618,15 @@ int start_ustd(int fd)
                return 1;
        }
 
+       /* Write pidfile */
+       if(pidfile) {
+               result = write_pidfile(pidfile, getpid());
+               if(result == -1) {
+                       ERR("failed to write pidfile");
+                       return 1;
+               }
+       }
+
        /* Notify parent that we are successfully started. */
        if(fd != -1) {
                /* write any one character */
@@ -672,27 +713,6 @@ int start_ustd_daemon()
        }
        else {
                char buf;
-               FILE *pidfp;
-
-               /* It's important to write the file *before*
-                * the parent ends, because the file may be
-                * read as soon as the parent ends.
-                */
-               if(pidfile) {
-                       pidfp = fopen(pidfile, "w+");
-                       if(!pidfp) {
-                               PERROR("fopen (%s)", pidfile);
-                               WARN("killing child process");
-                               result = kill(child_pid, SIGTERM);
-                               if(result == -1) {
-                                       PERROR("kill");
-                               }
-                               return -1;
-                       }
-
-                       fprintf(pidfp, "%d\n", child_pid);
-                       fclose(pidfp);
-               }
 
                result = read(fd[0], &buf, 1);
                if(result == -1) {