add TODO

[ust.git] / ustd / ustd.c

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 001977660a6ec0c86d809ce4a0ccb298a638427b..21da4ebb8785d620018b75e5736ee27cc2265e18 100644 (file)
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -33,9 +33,8 @@
 #include <getopt.h>
 
 #include "ustd.h"
-#include "localerr.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
@@ -53,6 +52,7 @@
 char *sock_path=NULL;
 char *trace_path=NULL;
 int daemon_mode = 0;
+char *pidfile = NULL;
 
 /* Number of active buffers and the mutex to protect it. */
 int active_buffers = 0;
@@ -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... */
@@ -516,6 +531,9 @@ int parse_args(int argc, char **argv)
                case 'd':
                        daemon_mode = 1;
                        break;
+               case 'p':
+                       pidfile = strdup(optarg);
+                       break;
                case 'h':
                        usage();
                        exit(0);
@@ -538,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;
@@ -582,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 */
@@ -654,10 +699,11 @@ int start_ustd_daemon()
 {
        int result;
        int fd[2];
+       pid_t child_pid;
 
        result = pipe(fd);
 
-       result = fork();
+       result = child_pid = fork();
        if(result == -1) {
                PERROR("fork");
                return -1;