Fix UST renaming and update ust headers

[lttng-tools.git] / ltt-sessiond / utils.c

diff --git a/ltt-sessiond/utils.c b/ltt-sessiond/utils.c
index 5b8e31b8d0b4e44623360fa68fa67288ba4a923d..0da5642109fcc5ddf7eeced026a0d441cb685594 100644 (file)
--- a/ltt-sessiond/utils.c
+++ b/ltt-sessiond/utils.c
@@ -1,20 +1,19 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; only version 2 of the License.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 #define _GNU_SOURCE
@@ -27,13 +26,29 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <lttngerr.h>
+
 #include "utils.h"
 
 /*
- *  get_home_dir
+ * Write to writable pipe used to notify a thread.
+ */
+int notify_thread_pipe(int wpipe)
+{
+       int ret;
+
+       ret = write(wpipe, "!", 1);
+       if (ret < 0) {
+               PERROR("write poll pipe");
+       }
+
+       return ret;
+}
+
+/*
+ * Return pointer to home directory path using the env variable HOME.
  *
- *  Return pointer to home directory path using the env variable HOME.
- *  No home, NULL is returned.
+ * No home, NULL is returned.
  */
 const char *get_home_dir(void)
 {
@@ -41,9 +56,7 @@ const char *get_home_dir(void)
 }
 
 /*
- *  mkdir_recursive
- *
- *  Create recursively directory using the FULL path.
+ * Create recursively directory using the FULL path.
  */
 int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 {
@@ -54,7 +67,7 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 
        ret = snprintf(tmp, sizeof(tmp), "%s", path);
        if (ret < 0) {
-               perror("snprintf mkdir");
+               PERROR("snprintf mkdir");
                goto error;
        }
 
@@ -70,19 +83,18 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
                        ret = mkdir(tmp, mode);
                        if (ret < 0) {
                                if (!(errno == EEXIST)) {
-                                       perror("mkdir recursive");
+                                       PERROR("mkdir recursive");
                                        ret = -errno;
                                        goto umask_error;
                                }
                        } else if (ret == 0) {
                                /*
-                                * We created the directory. Set its
-                                * ownership to the user/group
-                                * specified.
+                                * We created the directory. Set its ownership to the
+                                * user/group specified.
                                 */
                                ret = chown(tmp, uid, gid);
                                if (ret < 0) {
-                                       perror("chown in mkdir recursive");
+                                       PERROR("chown in mkdir recursive");
                                        ret = -errno;
                                        goto umask_error;
                                }
@@ -93,15 +105,20 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 
        ret = mkdir(tmp, mode);
        if (ret < 0) {
-               ret = -errno;
+               if (!(errno == EEXIST)) {
+                       PERROR("mkdir recursive last piece");
+                       ret = -errno;
+               } else {
+                       ret = 0;
+               }
        } else if (ret == 0) {
                /*
-                * We created the directory. Set its ownership to the
-                * user/group specified.
+                * We created the directory. Set its ownership to the user/group
+                * specified.
                 */
                ret = chown(tmp, uid, gid);
                if (ret < 0) {
-                       perror("chown in mkdir recursive");
+                       PERROR("chown in mkdir recursive");
                        ret = -errno;
                        goto umask_error;
                }