Commit 92ce2fb3 authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

some changes in Makefiles.am and mobject-store.h

parent 75905650
...@@ -9,10 +9,16 @@ AM_CXXFLAGS = $(AM_CFLAGS) ...@@ -9,10 +9,16 @@ AM_CXXFLAGS = $(AM_CFLAGS)
lib_LTLIBRARIES = libmobject-store.la lib_LTLIBRARIES = libmobject-store.la
libmobject_store_la_SOURCES = src/libmobject-store.c \ libmobject_store_la_SOURCES = src/libmobject-store.c \
src/completion.c \
src/write-op.c \
src/completion.h \
src/log.h \
src/write-op.h \
include/rados-mobject-store.h \
include/mobject-store.h include/mobject-store.h
include_HEADERS = include/mobject-store.h include_HEADERS = include/mobject-store.h
libmobject_la_CPPFLAGS = -I${srcdir}/include libmobject_la_CPPFLAGS = -I${srcdir}/include -I${srcdir}/src
include Make.rules include Make.rules
...@@ -130,6 +130,8 @@ typedef void *mobject_store_omap_iter_t; ...@@ -130,6 +130,8 @@ typedef void *mobject_store_omap_iter_t;
*/ */
typedef void *mobject_store_write_op_t; typedef void *mobject_store_write_op_t;
#define MOBJECT_WRITE_OP_NULL ((void*)0)
/** /**
* @typedef mobject_store_read_op_t * @typedef mobject_store_read_op_t
* *
...@@ -152,6 +154,8 @@ typedef void *mobject_store_write_op_t; ...@@ -152,6 +154,8 @@ typedef void *mobject_store_write_op_t;
*/ */
typedef void *mobject_store_read_op_t; typedef void *mobject_store_read_op_t;
#define MOBJECT_READ_OP_NULL ((void*)0)
/** /**
* @typedef mobject_store_completion_t * @typedef mobject_store_completion_t
* Represents the state of an asynchronous operation - it contains the * Represents the state of an asynchronous operation - it contains the
...@@ -160,6 +164,8 @@ typedef void *mobject_store_read_op_t; ...@@ -160,6 +164,8 @@ typedef void *mobject_store_read_op_t;
*/ */
typedef void *mobject_store_completion_t; typedef void *mobject_store_completion_t;
#define MOBJECT_COMPLETION_NULL ((void*)0)
/***************************************** /*****************************************
* mobject store setup/teardown routines * * mobject store setup/teardown routines *
*****************************************/ *****************************************/
...@@ -537,8 +543,6 @@ typedef void (*mobject_store_callback_t)(mobject_store_completion_t cb, void *ar ...@@ -537,8 +543,6 @@ typedef void (*mobject_store_callback_t)(mobject_store_completion_t cb, void *ar
* complete callback, and vice versa. This is affected by journalling * complete callback, and vice versa. This is affected by journalling
* on the OSDs. * on the OSDs.
* *
* TODO: more complete documentation of this elsewhere (in the RADOS docs?)
*
* @note Read operations only get a complete callback. * @note Read operations only get a complete callback.
* @note BUG: this should check for ENOMEM instead of throwing an exception * @note BUG: this should check for ENOMEM instead of throwing an exception
* *
...@@ -586,9 +590,6 @@ int mobject_store_aio_is_complete(mobject_store_completion_t c); ...@@ -586,9 +590,6 @@ int mobject_store_aio_is_complete(mobject_store_completion_t c);
* *
* @pre The operation is safe or complete * @pre The operation is safe or complete
* *
* @note BUG: complete callback may never be called when the safe
* message is received before the complete message
*
* @param c async operation to inspect * @param c async operation to inspect
* @returns return value of the operation * @returns return value of the operation
*/ */
...@@ -604,11 +605,8 @@ int mobject_store_aio_get_return_value(mobject_store_completion_t c); ...@@ -604,11 +605,8 @@ int mobject_store_aio_get_return_value(mobject_store_completion_t c);
*/ */
void mobject_store_aio_release(mobject_store_completion_t c); void mobject_store_aio_release(mobject_store_completion_t c);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __MOBJECT_STORE */ #endif /* __MOBJECT_STORE */
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