Merge branch 'master' of xgitlab.cels.anl.gov:sds/mobject-store

Makefile.am

+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS="-Im4"
+
+EXTRA_DIST = prepare.sh
+
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS =
+AM_CXXFLAGS = $(AM_CFLAGS)
+
 lib_LTLIBRARIES = libmobject-store.la
 libmobject_store_la_SOURCES = src/libmobject-store.c \
 			include/mobject-store.h
 
 include_HEADERS = include/mobject-store.h
 libmobject_la_CPPFLAGS = -I${srcdir}/include
+
+include Make.rules
+

src/libmobject-store.c

@@ -4,6 +4,11 @@
  * See COPYRIGHT in top-level directory.
  */
 
+#include "mobject-conf.h"
+
+#include <stdio.h>
+#include <assert.h>
+
 #include <margo.h>
 #include <ssg.h>
 
@@ -25,7 +30,10 @@ int rados_create(rados_t *cluster, const char * const id)
         return(-1); /* TODO: error codes */
     cluster_handle->test = 123;
 
-    /* XXX find the SSG group ID for the mobject cluster group */
+    /* TODO find the SSG group ID for the mobject cluster group */
+
+    /* set the returned cluster handle */
+    *cluster = cluster_handle;
 
     return(0);
 }
@@ -33,14 +41,20 @@ int rados_create(rados_t *cluster, const char * const id)
 #if 0
 int mobject_store_connect(mobject_store_t cluster)
 {
-    /* XXX ssg attach to mobject cluster group id */
+    /* TODO ssg attach to mobject cluster group id */
 }
 #endif
 
 void rados_shutdown(rados_t cluster)
 {
-    /* XXX ssg detatch from mobject cluster group id */
+    struct mobject_store_handle *cluster_handle =
+        (struct mobject_store_handle *)cluster;
+    assert(cluster_handle != NULL);
+
+    /* TODO ssg detatch from mobject cluster group id */
+
+    free(cluster_handle);
 
-    /* XXX free handle */
+    return;
 }