move mkdirhier() to utilities

include/maestro/i_misc.h

@@ -36,6 +36,8 @@
 #ifndef MAESTRO_I_MISC_H_
 #define MAESTRO_I_MISC_H_ 1
 
+#include "maestro/status.h"
+
 /**@ingroup MSTRO_Internal
  **@{
  */
@@ -64,6 +66,11 @@ popcount(unsigned int v)
 #define ctz(x) (ffs(x)-1)
 #endif
 
+
+/** ensure all directories in DIRNAME exist. If not, try creating them  */
+mstro_status
+mkdirhier(const char *dirname);
+
 /**@} (end of group MSTRO_Internal) */
 
 #endif /* MAESTRO_I_MISC_H_ */

maestro/Makefile.am

@@ -57,6 +57,7 @@ libmaestro_core_la_SOURCES = \
 	uuid.c uuid_sha1.c \
         uuid_str.c uuid_ui128.c uuid_ui64.c \
         base64.c\
+        misc.c \
 	env.c logging.c tpl.c \
         statistics.c \
         pool.c \

maestro/misc.c

+#include "maestro/i_misc.h"
+#include "maestro/logging.h"
+
+#define _POSIX_C_SOURCE 1
+#include <limits.h>
+
+#include <assert.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+
+/* simplify logging */
+#define NOISE(...) LOG_DEBUG(MSTRO_LOG_MODULE_CORE,__VA_ARGS__)
+#define DEBUG(...) LOG_DEBUG(MSTRO_LOG_MODULE_CORE,__VA_ARGS__)
+#define INFO(...)  LOG_INFO(MSTRO_LOG_MODULE_CORE,__VA_ARGS__)
+#define WARN(...)  LOG_WARN(MSTRO_LOG_MODULE_CORE,__VA_ARGS__)
+#define ERR(...)   LOG_ERR(MSTRO_LOG_MODULE_CORE,__VA_ARGS__)
+
+
+/** find next separator in PATH. Return the start of that segment */
+static inline
+const char *
+next_sep (const char *path)
+{
+  while (*path)
+    if (*path == '/' || *path == '\\')
+      return path;
+    else
+      path++;
+  return NULL;
+}
+
+
+mstro_status
+mkdirhier(const char *dirname)
+{
+  assert(strlen(dirname)<PATH_MAX);
+  
+  char buf[PATH_MAX];
+  const char *prev = dirname;
+  const char *next;
+  struct stat sb;
+
+  while(NULL!=(next = next_sep(prev))) {
+    strncpy(buf, dirname, next - dirname) ;
+    buf[next - dirname] = '\0';
+    if(stat(buf,&sb)) {
+      mkdir(buf, 0777); /* umask taken into account by system */
+      /* we ignore errors, as we'll see an error on the last part */
+    }
+    prev=next+1;
+  }
+  /* handle last part */
+  if(stat(dirname, &sb)) {
+    int s = mkdir(dirname, 0777);
+    if(s!=0) {
+      ERR("Failed to create GFS transport directory %s: %d (%s)\n",
+          dirname, errno, strerror(errno));
+      return MSTRO_FAIL;
+    }
+  }
+  return MSTRO_OK;
+}

transport/transport.c

@@ -177,47 +177,6 @@ mstro_transport__src_datalen_get(mstro_cdo src,
 mstro_event_domain g_transport_rdma_edom = NULL;
 const char* mstro_transport_rdma_edom_name = RDMA_EDOM_NAME;
 
-/** find next separator in PATH. Return the start of that segment */
-static inline
-const char * next_sep (const char *path)
-{
-  while (*path)
-    if (*path == '/' || *path == '\\')
-      return path;
-    else
-      path++;
-  return NULL;
-}
-
-mstro_status
-mkdirhier(char *dirname)
-{
-  char buf[PATH_MAX];
-  const char *prev = dirname;
-  const char *next;
-  struct stat sb;
-  
-  while(NULL!=(next = next_sep(prev))) {
-    strncpy(buf, dirname, next - dirname) ;
-    buf[next - dirname] = '\0';
-    if(stat(buf,&sb)) {
-      mkdir(buf, 0777); /* umask taken into account by system */
-      /* we ignore errors, as we'll see an error on the last part */
-    }
-    prev=next+1;
-  }
-  /* handle last part */
-  if(stat(dirname, &sb)) {
-    int s = mkdir(dirname, 0777);
-    if(s!=0) {
-      ERR("Failed to create GFS transport directory %s: %d (%s)\n",
-          dirname, errno, strerror(errno));
-      return MSTRO_FAIL;
-    }
-  }
-  return MSTRO_OK;
-}
-
 mstro_status
 mstro_transport_init()
 {

transport/transport.h

@@ -87,10 +87,6 @@ mstro_transport__src_datalen_get(mstro_cdo src,
 mstro_status
 mstro_transport_get_dst_buffer(mstro_cdo dst, void** data);
 
-/** ensure all directories in DIRNAME exist. If not, try creating them  */
-mstro_status
-mkdirhier(char *dirname);
-
 /** @brief initialize individual transports */
 mstro_status
 mstro_transport_init();