Commit ecbdaa69 authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

big reorganization

parent c8cbf938
noinst_HEADERS += \
src/args-read-actions.h \
src/args-write-actions.h \
src/buffer-union.h \
src/completion.h \
src/log.h \
src/omap-iter-impl.h \
src/prepare-read-op.h \
src/prepare-write-op.h \
src/proc-omap-iter.h \
src/proc-read-actions.h \
src/proc-read-responses.h \
src/proc-write-actions.h \
src/read-actions.h \
src/read-op-impl.h \
src/read-op-visitor.h \
src/read-resp-impl.h \
src/utlist.h \
src/write-actions.h \
src/write-op-impl.h \
src/write-op-visitor.h
src/io-chain/args-read-actions.h \
src/io-chain/args-write-actions.h \
src/util/buffer-union.h \
src/aio/completion.h \
src/util/log.h \
src/omap-iter/omap-iter-impl.h \
src/io-chain/prepare-read-op.h \
src/io-chain/prepare-write-op.h \
src/omap-iter/proc-omap-iter.h \
src/io-chain/proc-read-actions.h \
src/io-chain/proc-read-responses.h \
src/io-chain/proc-write-actions.h \
src/io-chain/read-actions.h \
src/io-chain/read-op-impl.h \
src/io-chain/read-op-visitor.h \
src/io-chain/read-resp-impl.h \
src/util/utlist.h \
src/io-chain/write-actions.h \
src/io-chain/write-op-impl.h \
src/io-chain/write-op-visitor.h \
src/server/exec-write-op.h \
src/server/exec-read-op.h
src_libmobject_store_la_SOURCES = \
src/completion.c \
src/libmobject-store.c \
src/omap-iter-impl.c \
src/prepare-read-op.c \
src/prepare-write-op.c \
src/proc-omap-iter.c \
src/proc-read-actions.c \
src/proc-read-responses.c \
src/proc-write-actions.c \
src/read-op-impl.c \
src/read-op-visitor.c \
src/read-resp-impl.c \
src/write-op-impl.c \
src/write-op-visitor.c
src/aio/completion.c \
src/client/libmobject-store.c \
src/omap-iter/omap-iter-impl.c \
src/io-chain/prepare-read-op.c \
src/io-chain/prepare-write-op.c \
src/omap-iter/proc-omap-iter.c \
src/io-chain/proc-read-actions.c \
src/io-chain/proc-read-responses.c \
src/io-chain/proc-write-actions.c \
src/io-chain/read-op-impl.c \
src/io-chain/read-op-visitor.c \
src/io-chain/read-resp-impl.c \
src/io-chain/write-op-impl.c \
src/io-chain/write-op-visitor.c
src_libmobject_server_la_SOURCES = \
src/mobject-server.c
src/aio/completion.c \
src/server/mobject-server.c \
src/omap-iter/omap-iter-impl.c \
src/omap-iter/proc-omap-iter.c \
src/io-chain/proc-read-actions.c \
src/io-chain/proc-read-responses.c \
src/io-chain/proc-write-actions.c \
src/io-chain/read-op-impl.c \
src/io-chain/read-op-visitor.c \
src/io-chain/read-resp-impl.c \
src/io-chain/write-op-impl.c \
src/io-chain/write-op-visitor.c \
src/server/exec-write-op.c \
src/server/exec-read-op.c
src_mobject_server_daemon_SOURCES = \
src/mobject-server-daemon.c
src/server/mobject-server-daemon.c
src_mobject_server_daemon_LDADD = \
src/libmobject-server.la
src/libmobject-server.la
bin_PROGRAMS += \
src/mobject-server-daemon
......
......@@ -7,8 +7,8 @@
#include <stdlib.h>
#include "mobject-store-config.h"
#include "libmobject-store.h"
#include "completion.h"
#include "log.h"
#include "src/aio/completion.h"
#include "src/util/log.h"
int mobject_store_aio_create_completion(void *cb_arg,
mobject_store_callback_t cb_complete,
......
......@@ -32,10 +32,9 @@ int mobject_store_create(mobject_store_t *cluster, const char * const id)
(void)id; /* XXX: id unused in mobject */
/* allocate a new cluster handle and set some fields */
cluster_handle = malloc(sizeof(*cluster_handle));
cluster_handle = (mobject_store_handle_t*)calloc(1,sizeof(*cluster_handle));
if (!cluster_handle)
return -1;
memset(cluster_handle, 0, sizeof(cluster_handle));
/* use env variable to determine how to connect to the cluster */
/* NOTE: this is the _only_ method for specifying a cluster for now... */
......
......@@ -7,7 +7,7 @@
#define __MOBJECT_ARGS_READ_ACTION_H
#include "mobject-store-config.h"
#include "read-actions.h"
#include "src/io-chain/read-actions.h"
/**
* This file contains a set of structures meant
......
......@@ -7,7 +7,7 @@
#define __MOBJECT_PI_WRITE_ACTION_H
#include "mobject-store-config.h"
#include "write-actions.h"
#include "src/io-chain/write-actions.h"
/**
* This file contains a set of structures meant
......
......@@ -3,10 +3,10 @@
*
* See COPYRIGHT in top-level directory.
*/
#include "prepare-read-op.h"
#include "read-op-impl.h"
#include "utlist.h"
#include "log.h"
#include "src/io-chain/prepare-read-op.h"
#include "src/io-chain/read-op-impl.h"
#include "src/util/utlist.h"
#include "src/util/log.h"
static void prepare_read(uint64_t* cur_offset,
rd_action_read_t action,
......
......@@ -3,10 +3,10 @@
*
* See COPYRIGHT in top-level directory.
*/
#include "prepare-write-op.h"
#include "write-op-impl.h"
#include "utlist.h"
#include "log.h"
#include "src/io-chain/prepare-write-op.h"
#include "src/io-chain/write-op-impl.h"
#include "src/util/utlist.h"
#include "src/util/log.h"
static void convert_write(uint64_t* cur_offset,
wr_action_write_t action,
......
......@@ -3,11 +3,11 @@
*
* See COPYRIGHT in top-level directory.
*/
#include "proc-read-actions.h"
#include "args-read-actions.h"
#include "read-op-impl.h"
#include "utlist.h"
#include "log.h"
#include "src/io-chain/proc-read-actions.h"
#include "src/io-chain/args-read-actions.h"
#include "src/io-chain/read-op-impl.h"
#include "src/util/utlist.h"
#include "src/util/log.h"
/**
* This file contains the main hg_proc_mobject_store_read_op_t
......
......@@ -4,12 +4,12 @@
* See COPYRIGHT in top-level directory.
*/
#include <mercury_proc.h>
#include "proc-read-responses.h"
#include "read-responses.h"
#include "read-resp-impl.h"
#include "proc-omap-iter.h"
#include "utlist.h"
#include "log.h"
#include "src/io-chain/proc-read-responses.h"
#include "src/io-chain/read-responses.h"
#include "src/io-chain/read-resp-impl.h"
#include "src/omap-iter/proc-omap-iter.h"
#include "src/util/utlist.h"
#include "src/util/log.h"
typedef hg_return_t (*encode_fn)(hg_proc_t, void*);
typedef hg_return_t (*decode_fn)(hg_proc_t, void*);
......
......@@ -7,7 +7,7 @@
#define __MOBJECT_PROC_READ_RESPONSE_H
#include <margo.h>
#include "read-resp-impl.h"
#include "src/io-chain/read-resp-impl.h"
hg_return_t hg_proc_read_response_t(hg_proc_t proc, read_response_t* response);
......
......@@ -3,11 +3,11 @@
*
* See COPYRIGHT in top-level directory.
*/
#include "proc-write-actions.h"
#include "args-write-actions.h"
#include "write-op-impl.h"
#include "utlist.h"
#include "log.h"
#include "src/io-chain/proc-write-actions.h"
#include "src/io-chain/args-write-actions.h"
#include "src/io-chain/write-op-impl.h"
#include "src/util/utlist.h"
#include "src/util/log.h"
/**
* This file contains the main hg_proc_mobject_store_write_op_t
......
......@@ -8,7 +8,7 @@
#include "mobject-store-config.h"
#include "libmobject-store.h"
#include "buffer-union.h"
#include "src/util/buffer-union.h"
typedef enum {
READ_OPCODE_BASE = 0,
......
......@@ -7,11 +7,11 @@
#include <stdlib.h>
#include <string.h>
#include "mobject-store-config.h"
#include "utlist.h"
#include "libmobject-store.h"
#include "log.h"
#include "read-op-impl.h"
#include "completion.h"
#include "src/io-chain/read-op-impl.h"
#include "src/aio/completion.h"
#include "src/util/utlist.h"
#include "src/util/log.h"
mobject_store_read_op_t mobject_store_create_read_op(void)
{
......
......@@ -9,7 +9,7 @@
#include <margo.h>
#include "mobject-store-config.h"
#include "libmobject-store.h"
#include "read-actions.h"
#include "src/io-chain/read-actions.h"
/**
* This object represents a handler for a list of actions
......
......@@ -4,9 +4,9 @@
* See COPYRIGHT in top-level directory.
*/
#include "libmobject-store.h"
#include "read-op-visitor.h"
#include "read-op-impl.h"
#include "utlist.h"
#include "src/io-chain/read-op-visitor.h"
#include "src/io-chain/read-op-impl.h"
#include "src/util/utlist.h"
static void execute_read_op_visitor_on_stat(read_op_visitor_t visitor, rd_action_stat_t a, void* uargs);
static void execute_read_op_visitor_on_read(read_op_visitor_t visitor, rd_action_read_t a, void* uargs);
......
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