massive changes to switch from bake-bulk => bake

Makefile.am

@@ -13,7 +13,7 @@ CLEANFILES = $(bin_SCRIPTS)
 MAINTAINERCLEANFILES =
 EXTRA_DIST =
 BUILT_SOURCES =
-include_HEADERS = include/bake-bulk.h include/bake-bulk-client.h include/bake-bulk-server.h
+include_HEADERS = include/bake.h include/bake-client.h include/bake-server.h
 TESTS_ENVIRONMENT =
 
 EXTRA_DIST += \
@@ -27,15 +27,16 @@ AM_LIBS =
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-lib_LTLIBRARIES = src/libbake-bulk-client.la src/libbake-bulk-server.la
-src_libbake_bulk_client_la_SOURCES =
-src_libbake_bulk_server_la_SOURCES =
+lib_LTLIBRARIES = src/libbake-client.la src/libbake-server.la
+src_libbake_client_la_SOURCES =
+src_libbake_server_la_SOURCES =
 
-LDADD = src/libbake-bulk-client.la
+LDADD = src/libbake-client.la
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = maint/bake-bulk-client.pc \
-		 maint/bake-bulk-server.pc
+pkgconfig_DATA = \
+ maint/bake-client.pc \
+ maint/bake-server.pc
 
 
 include Make.rules

configure.ac

@@ -80,6 +80,6 @@ LIBS="$UUID_LIBS $LIBS"
 CPPFLAGS="$UUID_CFLAGS $CPPFLAGS"
 CFLAGS="$UUID_CFLAGS $CFLAGS"
 
-AC_CONFIG_FILES([Makefile maint/bake-bulk-client.pc maint/bake-bulk-server.pc])
+AC_CONFIG_FILES([Makefile maint/bake-client.pc maint/bake-server.pc])
 AC_OUTPUT
  

include/bake-bulk-client.h → include/bake-client.h

@@ -4,19 +4,19 @@
  * See COPYRIGHT in top-level directory.
  */
 
-#ifndef __BAKE_BULK_CLIENT_H
-#define __BAKE_BULK_CLIENT_H
+#ifndef __BAKE_CLIENT_H
+#define __BAKE_CLIENT_H
 
 #include <stdint.h>
 #include "margo.h"
-#include "bake-bulk.h"
+#include "bake.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * Obtain identifying information for a bake target through the provided
+ * Obtains identifying information for a BAKE target through the provided
  * remote mercury address.
  *
  * @param [in] mid margo instance
@@ -30,25 +30,25 @@ int bake_probe_instance(
     bake_target_id_t *bti);
   
 /**
- * Create a bounded-size bulk data region.  The resulting region can be
- * written using bulk write operations, and can be persisted (once writes are
- * complete) with a a bulk persist operation.  The region is not valid for
- * read access until persisted.
+ * Creates a bounded-size BAKE data region.  The resulting region can be
+ * written using BAKE write operations, and can be persisted (once writes
+ * are complete) with a a BAKE persist operation.  The region is not valid
+ * for read access until persisted.
  *
  * @param [in] bti BAKE target identifier
  * @param [in] region_size size of region to be created
  * @param [out] rid identifier for new region
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_create(
+int bake_create(
     bake_target_id_t bti,
     uint64_t region_size,
-    bake_bulk_region_id_t *rid);
+    bake_region_id_t *rid);
  
 /**
- * Writes into a region that was previously created with bake_bulk_create().
+ * Writes into a BAKE region that was previously created with bake_create().
  * Result is not guaranteed to be persistent until explicit
- * bake_bulk_persist() call.
+ * bake_persist() call.
  *
  * Results are undefined if multiple writers (from same process or different
  * processes) perform overlapping writes.
@@ -60,15 +60,15 @@ int bake_bulk_create(
  * @param [in] buf_size size of local memory buffer to write
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_write(
+int bake_write(
     bake_target_id_t bti,
-    bake_bulk_region_id_t rid,
+    bake_region_id_t rid,
     uint64_t region_offset,
     void const *buf,
     uint64_t buf_size);
 
 /**
- * Write data into a previously created BAKE region like bake_bulk_write(),
+ * Writes data into a previously created BAKE region like bake_write(),
  * except the write is performed on behalf of some remote entity.
  *
  * @param [in] bti BAKE target identifier
@@ -80,9 +80,9 @@ int bake_bulk_write(
  * @param [in] size size to write from remote bulk handle
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_proxy_write(
+int bake_proxy_write(
     bake_target_id_t bti,
-    bake_bulk_region_id_t rid,
+    bake_region_id_t rid,
     uint64_t region_offset,
     hg_bulk_t remote_bulk,
     uint64_t remote_offset,
@@ -90,32 +90,32 @@ int bake_bulk_proxy_write(
     uint64_t size);
 
 /**
- * Persist a bulk region. The region is considered immutable at this point 
+ * Persists a BAKE region. The region is considered immutable at this point 
  * and reads may be performed on the region.
  *
  * @param [in] bti BAKE target identifier
  * @param [in] rid identifier for region
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_persist(
+int bake_persist(
     bake_target_id_t bti,
-    bake_bulk_region_id_t rid);
-  
+    bake_region_id_t rid);
+
 /**
- * Check the size of an existing region. 
+ * Checks the size of an existing BAKE region. 
  *
  * @param [in] bti BAKE target identifier
  * @param [in] rid identifier for region
- * @param [out] size sizes of region
+ * @param [out] size size of region
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_get_size(
+int bake_get_size(
     bake_target_id_t bti,
-    bake_bulk_region_id_t rid,
-    uint64_t *region_size);
+    bake_region_id_t rid,
+    uint64_t *size);
 
 /**
- * Reads from a region that was previously persisted with bake_bulk_persist().
+ * Reads from a BAKE region that was previously persisted with bake_persist().
  *
  * NOTE: for now at least, this call does not support "short" reads.  It
  * either succeeds in reading the requested size or not.
@@ -127,15 +127,15 @@ int bake_bulk_get_size(
  * @param [in] buf_size size of local memory buffer to read into
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_read(
+int bake_read(
     bake_target_id_t bti,
-    bake_bulk_region_id_t rid,
+    bake_region_id_t rid,
     uint64_t region_offset,
     void *buf,
     uint64_t buf_size);
 
 /**
- * Read data from a previously persisted BAKE region like bake_bulk_read(),
+ * Reads data from a previously persisted BAKE region like bake_read(),
  * except the read is performed on behalf of some remote entity.
  *
  * @param [in] bti BAKE target identifier
@@ -147,9 +147,9 @@ int bake_bulk_read(
  * @param [in] size size to read to remote bulk handle
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_proxy_read(
+int bake_proxy_read(
     bake_target_id_t bti,
-    bake_bulk_region_id_t rid,
+    bake_region_id_t rid,
     uint64_t region_offset,
     hg_bulk_t remote_bulk,
     uint64_t remote_offset,
@@ -157,8 +157,8 @@ int bake_bulk_proxy_read(
     uint64_t size);
 
 /**
- * Release local resources associated with access to a target; does not
- * modify the target in any way.
+ * Releases local resources associated with access to a BAKE target;
+ * does not modify the target in any way.
  *
  * @param [in] bti BAKE target_identifier
  */
@@ -166,28 +166,25 @@ void bake_release_instance(
     bake_target_id_t bti);
 
 /**
- * Utility function to shut down a remote service
+ * Shuts down a remote BAKE service (given a target ID).
  *
- * @param [in] bti Bake target identifier
+ * @param [in] bti BAKE target identifier
  * @returns 0 on success, -1 on fialure 
  */
-int bake_shutdown_service(bake_target_id_t bti);
-
-/* NOTE: code below is a copy of the bulk portion of the proposed BAKE API.
- * Commented out for now but leaving it in place for reference
- */
+int bake_shutdown_service(
+    bake_target_id_t bti);
 
 /**
- * Issue a no-op 
+ * Issues a BAKE no-op operation.
  *
  * @param [in] bti BAKE target identifier
  * @returns 0 on success, -1 on failure
  */
-int bake_bulk_noop(
+int bake_noop(
     bake_target_id_t bti);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __BAKE_BULK__CLIENT_H */
+#endif /* __BAKE_CLIENT_H */

include/bake-bulk-server.h → include/bake-server.h

@@ -4,23 +4,24 @@
  * See COPYRIGHT in top-level directory.
  */
 
-#ifndef __BAKE_BULK_SERVER_H
-#define __BAKE_BULK_SERVER_H
+#ifndef __BAKE_SERVER_H
+#define __BAKE_SERVER_H
 
 #include <margo.h>
 #include <libpmemobj.h>
-#include "bake-bulk.h"
+#include "bake.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * Creates a bake-bulk pool to use for backend PMEM storage.
- * NOTE: this function must be called on a pool before the pool
- *       can be passed to 'bake_server_init'
+ * Creates a BAKE pool to use for backend PMEM storage.
+ * 
+ * NOTE: This function must be called on a pool before the pool
+ * can be passed to 'bake_server_init'.
  *
- * @param[in] pool_name path to pmem backend file
+ * @param[in] pool_name path to PMEM backend file
  * @param[in] pool_size size of the created pool
  * @param[in] pool_mode mode of the created pool
  * @returns 0 on success, -1 otherwise
@@ -31,10 +32,10 @@ int bake_server_makepool(
     mode_t pool_mode);
 
 /**
- * Register a bake server instance for a given Margo instance.
+ * Initializes a BAKE server instance.
  *
  * @param[in] mid Margo instance identifier
- * @param[in] pool_name path to pmem backend file
+ * @param[in] pool_name path to PMEM backend file
  * @returns 0 on success, -1 otherwise
  */
 int bake_server_init(
@@ -42,16 +43,20 @@ int bake_server_init(
     const char *pool_name);
 
 /**
- * Shuts down a bake server and frees all associated resources.
+ * Shuts down a BAKE server and frees all associated resources.
  */
-void bake_server_shutdown(void);
+void bake_server_shutdown(
+    void);
 
 /**
- * Suspends the server process until some other entity calls bake_server_shutdown.
+ * Suspends a BAKE server process until some other entity calls
+ * bake_server_shutdown().
  */
-void bake_server_wait_for_shutdown(void);
+void bake_server_wait_for_shutdown(
+    void);
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* __BAKE_BULK_SERVER_H */
+
+#endif /* __BAKE_SERVER_H */

include/bake-bulk.h → include/bake.h

@@ -4,8 +4,8 @@
  * See COPYRIGHT in top-level directory.
  */
 
-#ifndef __BAKE_BULK_H
-#define __BAKE_BULK_H
+#ifndef __BAKE_H
+#define __BAKE_H
 
 #include <uuid/uuid.h>
 #include <stdint.h>
@@ -23,16 +23,16 @@ typedef struct {
 } bake_target_id_t;
 
 /**
- * Persistent, opaque identifier for a bulk region within a BAKE target.
+ * Persistent, opaque identifier for a region within a BAKE target.
  */
-#define BAKE_BULK_REGION_ID_DATA_SIZE 24
+#define BAKE_REGION_ID_DATA_SIZE 24
 typedef struct {
     uint32_t type;
-    char data[BAKE_BULK_REGION_ID_DATA_SIZE];
-} bake_bulk_region_id_t;
+    char data[BAKE_REGION_ID_DATA_SIZE];
+} bake_region_id_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __BAKE_BULK_H */
+#endif /* __BAKE_H */

src/Makefile.subdir

-src_libbake_bulk_client_la_SOURCES += \
- src/bake-bulk-client.c
+src_libbake_client_la_SOURCES += \
+ src/bake-client.c
 
-src_libbake_bulk_server_la_SOURCES += \
- src/bake-bulk-server.c
+src_libbake_server_la_SOURCES += \
+ src/bake-server.c
 
-src_bake_bulk_server_daemon_LDADD = src/libbake-bulk-server.la
-src_bake_bulk_mkpool_LDADD = src/libbake-bulk-server.la
+src_bake_server_daemon_LDADD = src/libbake-server.la
+src_bake_mkpool_LDADD = src/libbake-server.la
 
 bin_PROGRAMS += \
- src/bake-bulk-server-daemon \
- src/bake-bulk-mkpool \
- src/bb-shutdown \
- src/bb-copy-to \
- src/bb-copy-from \
- src/bb-latency-bench
+ src/bake-server-daemon \
+ src/bake-mkpool \
+ src/bake-shutdown \
+ src/bake-copy-to \
+ src/bake-copy-from \
+ src/bake-latency-bench

src/bb-copy-from.c → src/bake-copy-from.c

@@ -13,9 +13,9 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include "bake-bulk-client.h"
+#include "bake-client.h"
 
-/* client program that will copy a bake bulk region out to a POSIX file */
+/* client program that will copy a BAKE region out to a POSIX file */
 
 int main(int argc, char **argv) 
 {
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
     bake_target_id_t bti;
     hg_return_t hret;
     int ret;
-    bake_bulk_region_id_t rid;
+    bake_region_id_t rid;
     int fd;
     char* local_region;
     int region_fd;
@@ -35,8 +35,8 @@ int main(int argc, char **argv)
  
     if(argc != 4)
     {
-        fprintf(stderr, "Usage: bb-copy-from <server addr> <identifier file> <output file>\n");
-        fprintf(stderr, "  Example: ./bb-copy-from tcp://localhost:1234 /tmp/bb-copy-rid.0GjOlu /tmp/output.dat\n");
+        fprintf(stderr, "Usage: bake-copy-from <server addr> <identifier file> <output file>\n");
+        fprintf(stderr, "  Example: ./bake-copy-from tcp://localhost:1234 /tmp/bb-copy-rid.0GjOlu /tmp/output.dat\n");
         return(-1);
     }
     svr_addr_str = argv[1];
@@ -93,10 +93,10 @@ int main(int argc, char **argv)
     }
     close(region_fd);
 
-    ret = bake_bulk_get_size(bti, rid, &check_size);
+    ret = bake_get_size(bti, rid, &check_size);
     if(ret != 0)
     {
-        fprintf(stderr, "Error: bake_bulk_get_size()\n");
+        fprintf(stderr, "Error: bake_get_size()\n");
         bake_release_instance(bti);
         margo_addr_free(mid, svr_addr);
         margo_finalize(mid);
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
     }
 
     /* transfer data */
-    ret = bake_bulk_read(
+    ret = bake_read(
         bti,
         rid,
         0,
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
         bake_release_instance(bti);
         margo_addr_free(mid, svr_addr);
         margo_finalize(mid);
-        fprintf(stderr, "Error: bake_bulk_read()\n");
+        fprintf(stderr, "Error: bake_read()\n");
         return(-1);
     }
 

src/bb-copy-to.c → src/bake-copy-to.c

@@ -13,9 +13,9 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include "bake-bulk-client.h"
+#include "bake-client.h"
 
-/* client program that will copy a POSIX file into a bake bulk region */
+/* client program that will copy a POSIX file into a BAKE region */
 
 int main(int argc, char **argv) 
 {
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
     bake_target_id_t bti;
     hg_return_t hret;
     int ret;
-    bake_bulk_region_id_t rid;
+    bake_region_id_t rid;
     int fd;
     struct stat statbuf;
     char* local_region;
@@ -37,8 +37,8 @@ int main(int argc, char **argv)
  
     if(argc != 3)
     {
-        fprintf(stderr, "Usage: bb-copy-to <local file> <server addr>\n");
-        fprintf(stderr, "  Example: ./bb-copy-to /tmp/foo.dat tcp://localhost:1234\n");
+        fprintf(stderr, "Usage: bake-copy-to <local file> <server addr>\n");
+        fprintf(stderr, "  Example: ./bake-copy-to /tmp/foo.dat tcp://localhost:1234\n");
         return(-1);
     }
     svr_addr_str = argv[2];
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
     }
 
     /* create region */
-    ret = bake_bulk_create(bti, statbuf.st_size, &rid);
+    ret = bake_create(bti, statbuf.st_size, &rid);
     if(ret != 0)
     {
         bake_release_instance(bti);
@@ -110,12 +110,12 @@ int main(int argc, char **argv)
         margo_finalize(mid);
         munmap(local_region, statbuf.st_size);
         close(fd);
-        fprintf(stderr, "Error: bake_bulk_create()\n");
+        fprintf(stderr, "Error: bake_create()\n");
         return(-1);
     }
 
     /* transfer data */
-    ret = bake_bulk_write(
+    ret = bake_write(
         bti,
         rid,
         0,
@@ -128,31 +128,31 @@ int main(int argc, char **argv)
         margo_finalize(mid);
         munmap(local_region, statbuf.st_size);
         close(fd);
-        fprintf(stderr, "Error: bake_bulk_write()\n");
+        fprintf(stderr, "Error: bake_write()\n");
         return(-1);
     }
 
     munmap(local_region, statbuf.st_size);
     close(fd);
 
-    ret = bake_bulk_persist(bti, rid);
+    ret = bake_persist(bti, rid);
     if(ret != 0)
     {
         bake_release_instance(bti);
         margo_addr_free(mid, svr_addr);
         margo_finalize(mid);
-        fprintf(stderr, "Error: bake_bulk_persist()\n");
+        fprintf(stderr, "Error: bake_persist()\n");
         return(-1);
     }
 
     /* safety check size */
-    ret = bake_bulk_get_size(bti, rid, &check_size);
+    ret = bake_get_size(bti, rid, &check_size);
     if(ret != 0)
     {
         bake_release_instance(bti);
         margo_addr_free(mid, svr_addr);
         margo_finalize(mid);
-        fprintf(stderr, "Error: bake_bulk_get_size()\n");
+        fprintf(stderr, "Error: bake_get_size()\n");
         return(-1);
     }
     

src/bb-latency-bench.c → src/bake-latency-bench.c

@@ -13,7 +13,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include "bake-bulk-client.h"
+#include "bake-client.h"
 
 static void bench_routine_write(bake_target_id_t bti, int iterations, double* measurement_array, int size);
 static void bench_routine_read(bake_target_id_t bti, int iterations, double* measurement_array, int size);
@@ -22,7 +22,7 @@ static void bench_routine_print(const char* op, int size, int iterations, double
 static int measurement_cmp(const void* a, const void *b);
 
 static double *measurement_array = NULL;
-static bake_bulk_region_id_t rid;
+static bake_region_id_t rid;
 
 int main(int argc, char **argv) 
 {
@@ -38,8 +38,8 @@ int main(int argc, char **argv)
  
     if(argc != 5)
     {
-        fprintf(stderr, "Usage: bb-latency-bench <server addr> <iterations> <min_sz> <max_sz>\n");
-        fprintf(stderr, "  Example: ./bb-latency-bench tcp://localhost:1234 1000 4 32\n");
+        fprintf(stderr, "Usage: bake-latency-bench <server addr> <iterations> <min_sz> <max_sz>\n");
+        fprintf(stderr, "  Example: ./bake-latency-bench tcp://localhost:1234 1000 4 32\n");
         return(-1);
     }
     svr_addr_str = argv[1];       
@@ -126,7 +126,7 @@ static void bench_routine_write(bake_target_id_t bti, int iterations, double *me
     assert(buffer);
 
     /* create region */
-    ret = bake_bulk_create(bti, size*iterations, &rid);
+    ret = bake_create(bti, size*iterations, &rid);
     assert(ret == 0);
 
     sleep(1);
@@ -135,7 +135,7 @@ static void bench_routine_write(bake_target_id_t bti, int iterations, double *me
     {
         tm1 = Wtime();
         /* transfer data (writes) */
-        ret = bake_bulk_write(
+        ret = bake_write(
             bti,
             rid,
             region_offset,
@@ -148,7 +148,7 @@ static void bench_routine_write(bake_target_id_t bti, int iterations, double *me
     }
 
     /* persist */
-    ret = bake_bulk_persist(bti, rid);
+    ret = bake_persist(bti, rid);
     assert(ret == 0);
 
     free(buffer);
@@ -173,7 +173,7 @@ static void bench_routine_read(bake_target_id_t bti, int iterations, double *mea
     {
         tm1 = Wtime();
         /* transfer data (reads) */
-        ret = bake_bulk_read(
+        ret = bake_read(
             bti,
             rid,
             region_offset,
@@ -202,7 +202,7 @@ static void bench_routine_noop(bake_target_id_t bti, int iterations, double *mea
     {
         tm1 = Wtime();
         /* noop */
-        ret = bake_bulk_noop(bti);
+        ret = bake_noop(bti);
         tm2 = Wtime();
         assert(ret == 0);
 

src/bake-bulk-mkpool.c → src/bake-mkpool.c

@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <libpmemobj.h>
-#include <bake-bulk-server.h>
+#include <bake-server.h>
 
 struct options
 {
@@ -20,10 +20,10 @@ struct options
 
 void usage(int argc, char *argv[])
 {
-    fprintf(stderr, "Usage: bake-bulk-mkpool [OPTIONS] <pmem_pool>\n");
+    fprintf(stderr, "Usage: bake-mkpool [OPTIONS] <pmem_pool>\n");
     fprintf(stderr, "       pmem_pool is the path to the pmemobj pool to create\n");
     fprintf(stderr, "       [-s size] is the desired size of the pool (K, M, G, etc. suffixes allowed) (%lu is default)\n", PMEMOBJ_MIN_POOL);
-    fprintf(stderr, "Example: ./bake-bulk-mkpool -s 16M /dev/shm/foo.dat\n");
+    fprintf(stderr, "Example: ./bake-mkpool -s 16M /dev/shm/foo.dat\n");
     return;
 }
 

src/bake-bulk-rpc.h → src/bake-rpc.h

@@ -4,92 +4,90 @@
  * See COPYRIGHT in top-level directory.
  */
 
-#ifndef __BAKE_BULK_RPC
-#define __BAKE_BULK_RPC
+#ifndef __BAKE_RPC
+#define __BAKE_RPC
 
 #include <margo.h>
 #include <mercury_proc_string.h>
-#include <bake-bulk.h>
+#include <bake.h>
 
-/* encoders for bake-specific types */
+/* encoders for BAKE-specific types */
 static inline hg_return_t hg_proc_bake_target_id_t(hg_proc_t proc, bake_target_id_t *bti);
-static inline hg_return_t hg_proc_bake_bulk_region_id_t(hg_proc_t proc, bake_bulk_region_id_t *rid);
-/* shutdown */
-DECLARE_MARGO_RPC_HANDLER(bake_bulk_shutdown_ult)
+static inline hg_return_t hg_proc_bake_region_id_t(hg_proc_t proc, bake_region_id_t *rid);
 
-/* bulk create */
-MERCURY_GEN_PROC(bake_bulk_create_in_t,
+/* BAKE shutdown */
+DECLARE_MARGO_RPC_HANDLER(bake_shutdown_ult)
+
+/* BAKE create */
+MERCURY_GEN_PROC(bake_create_in_t,
     ((bake_target_id_t)(bti))\
     ((uint64_t)(region_size)))
-MERCURY_GEN_PROC(bake_bulk_create_out_t,
+MERCURY_GEN_PROC(bake_create_out_t,
     ((int32_t)(ret))\
-    ((bake_bulk_region_id_t)(rid)))
-DECLARE_MARGO_RPC_HANDLER(bake_bulk_create_ult)
+    ((bake_region_id_t)(rid)))
+DECLARE_MARGO_RPC_HANDLER(bake_create_ult)
 
-/* bulk write */
-MERCURY_GEN_PROC(bake_bulk_write_in_t,
+/* BAKE write */
+MERCURY_GEN_PROC(bake_write_in_t,
     ((bake_target_id_t)(bti))\
-    ((bake_bulk_region_id_t)(rid))\
+    ((bake_region_id_t)(rid))\
     ((uint64_t)(region_offset))\
     ((hg_bulk_t)(bulk_handle))\
     ((uint64_t)(bulk_offset))\
     ((uint64_t)(bulk_size))\
     ((hg_string_t)(remote_addr_str)))
-MERCURY_GEN_PROC(bake_bulk_write_out_t,
+MERCURY_GEN_PROC(bake_write_out_t,
     ((int32_t)(ret)))
-DECLARE_MARGO_RPC_HANDLER(bake_bulk_write_ult)
+DECLARE_MARGO_RPC_HANDLER(bake_write_ult)
 
-/* bulk eager write */
+/* BAKE eager write */
 typedef struct 
 {
     bake_target_id_t bti;
-    bake_bulk_region_id_t rid;
+    bake_region_id_t rid;
     uint64_t region_offset;
     uint32_t size;
     char * buffer;
-} bake_bulk_eager_write_in_t;
-static inline hg_return_t hg_proc_bake_bulk_eager_write_in_t(hg_proc_t proc, void *v_out_p);
-MERCURY_GEN_PROC(bake_bulk_eager_write_out_t,
+} bake_eager_write_in_t;
+static inline hg_return_t hg_proc_bake_eager_write_in_t(hg_proc_t proc, void *v_out_p);
+MERCURY_GEN_PROC(bake_eager_write_out_t,
     ((int32_t)(ret)))
-DECLARE_MARGO_RPC_HANDLER(bake_bulk_eager_write_ult)
-
+DECLARE_MARGO_RPC_HANDLER(bake_eager_write_ult)
 
-/* bulk persist */
-MERCURY_GEN_PROC(bake_bulk_persist_in_t,
+/* BAKE persist */
+MERCURY_GEN_PROC(bake_persist_in_t,
     ((bake_target_id_t)(bti))\
-    ((bake_bulk_region_id_t)(rid)))
-MERCURY_GEN_PROC(bake_bulk_persist_out_t,
+    ((bake_region_id_t)(rid)))
+MERCURY_GEN_PROC(bake_persist_out_t,
     ((int32_t)(ret)))
-DECLARE_MARGO_RPC_HANDLER(bake_bulk_persist_ult)
+DECLARE_MARGO_RPC_HANDLER(bake_persist_ult)
 
-/* bulk get size */
-MERCURY_GEN_PROC(bake_bulk_get_size_in_t,
+/* BAKE get size */
+MERCURY_GEN_PROC(bake_get_size_in_t,
     ((bake_target_id_t)(bti))\
-    ((bake_bulk_region_id_t)(rid)))
-MERCURY_GEN_PROC(bake_bulk_get_size_out_t,
+    ((bake_region_id_t)(rid)))
+MERCURY_GEN_PROC(bake_get_size_out_t,
     ((int32_t)(ret))\
     ((uint64_t)(size)))
-DECLARE_MARGO_RPC_HANDLER(bake_bulk_get_size_ult)
+DECLARE_MARGO_RPC_HANDLER(bake_get_size_ult)
 
-/* bulk read */
-MERCURY_GEN_PROC(bake_bulk_read_in_t,
+/* BAKE read */
+MERCURY_GEN_PROC(bake_read_in_t,
     ((bake_target_id_t)(bti))\
-    ((bake_bulk_region_id_t)(rid))\
+    ((bake_region_id_t)(rid))\
     ((uint64_t)(region_offset))\
     ((hg_bulk_t)(bulk_handle))\
     ((uint64_t)(bulk_offset))\
     ((uint64_t)(bulk_size))\
     ((hg_string_t)(remote_addr_str)))
-    
-