Commit cb01640d authored by Shane Snyder's avatar Shane Snyder

rework source/headers to use rados types/names

parent 74bfb428
ACLOCAL_AMFLAGS="-Im4" ACLOCAL_AMFLAGS="-Im4"
lib_LTLIBRARIES = libmobject.la lib_LTLIBRARIES = libmobject-store.la
libmobject_la_SOURCES = src/mobject-store.c \ libmobject_store_la_SOURCES = src/libmobject-store.c \
include/mobject-store.h include/mobject-store.h
include_HEADERS = include/mobject-store.h include_HEADERS = include/mobject-store.h
......
...@@ -46,14 +46,9 @@ extern "C" { ...@@ -46,14 +46,9 @@ extern "C" {
* *
*/ */
/* opaque type for a handle for interacting with a mobject store cluster */
typedef void *rados_t;
/* opaque handle for interacting with a mobject cluster */
typedef struct mobject_store_handle *mobject_store_t;
/* opaque mobject store i/o context type */
typedef struct mobject_store_ioctx *mobject_store_ioctx_t;
extern const char *mobject_global_pool;
/***************************************** /*****************************************
* mobject store setup/teardown routines * * mobject store setup/teardown routines *
...@@ -63,6 +58,7 @@ extern const char *mobject_global_pool; ...@@ -63,6 +58,7 @@ extern const char *mobject_global_pool;
* Create a handle to a mobject cluster. * Create a handle to a mobject cluster.
* *
* @param[in/out] cluster pointer to store mobject cluster handle at * @param[in/out] cluster pointer to store mobject cluster handle at
* @param[in] id the user to connect as (NOTE: ignored in mobject store)
* @returns 0 on success, negative error code on failure * @returns 0 on success, negative error code on failure
* *
* NOTES: * NOTES:
...@@ -70,30 +66,34 @@ extern const char *mobject_global_pool; ...@@ -70,30 +66,34 @@ extern const char *mobject_global_pool;
* - drop user_id from API * - drop user_id from API
* - may eventually need conf. file, env variable checking, etc. * - may eventually need conf. file, env variable checking, etc.
*/ */
int mobject_store_create( int rados_create(
mobject_store_t *cluster); rados_t *cluster,
const char * const id);
#if 0
/** /**
* Connect to a mobject cluster. * Connect to a mobject cluster.
* *
* @param[in] cluster handle to mobject cluster * @param[in] cluster handle to mobject cluster
* @returns 0 on success, negative error code on failure * @returns 0 on success, negative error code on failure
*/ */
int mobject_store_connect( int rados_connect(
mobject_store_t cluster); mobject_store_t cluster);
#endif
/** /**
* Disconnects from a mobject cluster and destroys the cluster handle. * Disconnects from a mobject cluster and destroys the cluster handle.
* *
* @param[in] cluster handle to mobject cluster * @param[in] cluster handle to mobject cluster
*/ */
void mobject_store_shutdown( void rados_shutdown(
mobject_store_t cluster); rados_t cluster);
/***************************************************** /*****************************************************
* mobject store i/o context setup/teardown routines * * mobject store i/o context setup/teardown routines *
*****************************************************/ *****************************************************/
#if 0
/** /**
* Create an I/O context for a mobject cluster. * Create an I/O context for a mobject cluster.
* *
...@@ -226,6 +226,8 @@ mobject_store_stat( ...@@ -226,6 +226,8 @@ mobject_store_stat(
const char * oid, const char * oid,
uint64_t * psize, uint64_t * psize,
time_t * pmtime); time_t * pmtime);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -11,24 +11,33 @@ ...@@ -11,24 +11,33 @@
struct mobject_store_handle struct mobject_store_handle
{ {
int test;
}; };
const char *mobject_global_pool = "mobject-global-pool"; int rados_create(rados_t *cluster, const char * const id)
int mobject_store_create(mobject_store_t *cluster)
{ {
/* XXX alloc, set handle */ struct mobject_store_handle *cluster_handle;
(void)id; /* XXX: id unused in mobject */
/* allocate a new cluster handle and set some fields */
cluster_handle = malloc(sizeof(*cluster_handle));
if (!cluster_handle)
return(-1); /* TODO: error codes */
cluster_handle->test = 123;
/* XXX find the SSG group ID for the mobject cluster group */ /* XXX find the SSG group ID for the mobject cluster group */
return(0);
} }
#if 0
int mobject_store_connect(mobject_store_t cluster) int mobject_store_connect(mobject_store_t cluster)
{ {
/* XXX ssg attach to mobject cluster group id */ /* XXX ssg attach to mobject cluster group id */
} }
#endif
void mobject_store_shutdown(mobject_store_t cluster) void rados_shutdown(rados_t cluster)
{ {
/* XXX ssg detatch from mobject cluster group id */ /* XXX ssg detatch from mobject cluster group id */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment