moved printer into new directory

src/Makefile.subdir

@@ -20,8 +20,8 @@ noinst_HEADERS += \
   src/omap-iter/proc-omap-iter.h \
   src/rpc-types/read-op.h \
   src/rpc-types/write-op.h \
-  src/server/print-read-op.h\
-  src/server/print-write-op.h \
+  src/server/printer/print-read-op.h\
+  src/server/printer/print-write-op.h \
   src/util/buffer-union.h \
   src/util/log.h \
   src/util/utlist.h
@@ -62,8 +62,8 @@ src_server_libmobject_server_la_SOURCES = \
   src/server/fake/fake-db.cpp \
   src/server/core/core-write-op.cpp \
   src/server/core/core-read-op.cpp \
-  src/server/print-write-op.c \
-  src/server/print-read-op.c
+  src/server/printer/print-write-op.c \
+  src/server/printer/print-read-op.c
 src_server_libmobject_server_la_CPPFLAGS = ${AM_CPPFLAGS} ${SERVER_CPPFLAGS}
 src_server_libmobject_server_la_CFLAGS   = ${AM_CFLAGS} ${SERVER_CFLAGS}
 src_server_libmobject_server_la_LIBADD = src/omap-iter/libomap-iter.la \

src/server/mobject-server.c

@@ -4,6 +4,8 @@
  * See COPYRIGHT in top-level directory.
  */
 
+//#define FAKE_CPP_SERVER
+
 #include <assert.h>
 #include <mpi.h>
 #include <abt.h>
@@ -22,10 +24,13 @@
 #include "src/io-chain/write-op-impl.h"
 #include "src/io-chain/read-op-impl.h"
 #include "src/server/visitor-args.h"
-//#include "src/server/fake/fake-write-op.h"
-//#include "src/server/fake/fake-write-op.h"
+#ifdef FAKE_CPP_SERVER
+#include "src/server/fake/fake-read-op.h"
+#include "src/server/fake/fake-write-op.h"
+#else
 #include "src/server/core/core-read-op.h"
 #include "src/server/core/core-write-op.h"
+#endif
 
 struct mobject_server_context
 {
@@ -75,13 +80,6 @@ mobject_server_context_t* mobject_server_init(margo_instance_id mid, const char
     ABT_mutex_create(&srv_ctx->shutdown_mutex);
     ABT_cond_create(&srv_ctx->shutdown_cond);
 
-    /* TODO sds-keyval */
-# if 0
-    kv_context *metadata;
-    struct bake_pool_info *pool_info;
-    pool_info = bake_server_makepool(poolname);
-#endif
-
     ret = ssg_init(mid);
     if (ret != SSG_SUCCESS)
     {
@@ -133,6 +131,8 @@ mobject_server_context_t* mobject_server_init(margo_instance_id mid, const char
     bake_probe_instance(mid, self_addr, &(srv_ctx->bake_id));
     // XXX: check return value of the above calls
 
+    /* TODO setup sds-keyval */
+
     mobject_server_is_initialized = 1;
 
     return srv_ctx;
@@ -231,8 +231,11 @@ static hg_return_t mobject_write_op_ult(hg_handle_t h)
 
     /* Execute the operation chain */
     //print_write_op(in.write_op, in.object_name);
-    //fake_write_op(in.write_op, &vargs);
+#ifdef FAKE_CPP_SERVER
+    fake_write_op(in.write_op, &vargs);
+#else
     core_write_op(in.write_op, &vargs);
+#endif
 
     // set the return value of the RPC
     out.ret = 0;
@@ -277,8 +280,11 @@ static hg_return_t mobject_read_op_ult(hg_handle_t h)
 
     /* Compute the result. */
     //print_read_op(in.read_op, in.object_name);
-    //fake_read_op(in.read_op, &vargs);
+#ifdef FAKE_CPP_SERVER
+    fake_read_op(in.read_op, &vargs);
+#else
     core_read_op(in.read_op, &vargs);
+#endif
 
     out.responses = resp;
 

src/server/print-read-op.c → src/server/printer/print-read-op.c

@@ -2,7 +2,7 @@
 #include "src/io-chain/read-op-visitor.h"
 #include "src/io-chain/read-resp-impl.h"
 #include "src/omap-iter/omap-iter-impl.h"
-#include "src/server/print-read-op.h"
+#include "src/server/printer/print-read-op.h"
 
 static void read_op_printer_begin(void*);
 static void read_op_printer_stat(void*, uint64_t*, time_t*, int*);

src/server/print-write-op.c → src/server/printer/print-write-op.c

 #include <stdio.h>
-#include "src/server/print-write-op.h"
+#include "src/server/printer/print-write-op.h"
 #include "src/io-chain/write-op-visitor.h"
 
 static void write_op_printer_begin(void*);