Convert buffering system to per-cpu

[ust.git] / ustd / ustd.c

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 858bdf52b46c9e21ac6bab46e358ff016c117505..969c192abdb66bea7b9ce93dd48d7a994b5fe70c 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
@@ -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");
@@ -546,7 +545,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");
@@ -699,7 +698,6 @@ int start_ustd_daemon()
        }
        else {
                char buf;
-               FILE *pidfp;
 
                result = read(fd[0], &buf, 1);
                if(result == -1) {