start shifting terminology

- prepping for letting client transmit all addresses

examples/composition/composed-client-lib.c

@@ -95,7 +95,7 @@ void data_xfer_read(margo_instance_id mid, hg_addr_t svr_addr, void *buffer, hg_
     ret = HG_Bulk_create(hgi->hg_class, 1, &buffer, &buffer_sz, 
         HG_BULK_WRITE_ONLY, &in.bulk_handle);
     assert(ret == 0);
-    in.bulk_relay_addr = NULL;
+    in.client_addr = NULL;
 
 #if 0
     HG_Set_target_id(handle, mplex_id);

examples/composition/data-xfer-proto.h

@@ -12,7 +12,7 @@
 
 MERCURY_GEN_PROC(data_xfer_read_out_t, ((int32_t)(ret)))
 MERCURY_GEN_PROC(data_xfer_read_in_t,
-    ((hg_string_t)(bulk_relay_addr))\
+    ((hg_string_t)(client_addr))\
     ((hg_bulk_t)(bulk_handle)))
 
 #endif /* __DATA_XFER_PROTO */

examples/composition/data-xfer-service.c

@@ -21,7 +21,7 @@ static void data_xfer_read_ult(hg_handle_t handle)
     int ret;
     const struct hg_info *hgi;
     margo_instance_id mid;
-    hg_addr_t bulk_addr;
+    hg_addr_t client_addr;
 #if 0
     ABT_thread my_ult;
     ABT_xstream my_xstream; 
@@ -45,22 +45,22 @@ static void data_xfer_read_ult(hg_handle_t handle)
 
     mid = margo_hg_class_to_instance(hgi->hg_class);
 
-    if(!in.bulk_relay_addr)
-        bulk_addr = hgi->addr;
+    if(!in.client_addr)
+        client_addr = hgi->addr;
     else
     {
-        hret = margo_addr_lookup(mid, in.bulk_relay_addr, &bulk_addr);
+        hret = margo_addr_lookup(mid, in.client_addr, &client_addr);
         assert(hret == HG_SUCCESS);
     }
 
     /* do bulk transfer from client to server */
     ret = margo_bulk_transfer(mid, HG_BULK_PUSH,
-        bulk_addr, in.bulk_handle, 0,
+        client_addr, in.bulk_handle, 0,
         g_buffer_bulk_handle, 0, g_buffer_size);
     assert(ret == 0);
 
-    if(in.bulk_relay_addr)
-        HG_Addr_free(margo_get_class(mid), bulk_addr);
+    if(in.client_addr)
+        HG_Addr_free(margo_get_class(mid), client_addr);
 
     HG_Free_input(handle, &in);
 

examples/composition/delegator-service.c

@@ -56,7 +56,7 @@ static void delegator_read_ult(hg_handle_t handle)
     in_relay.bulk_handle = in.bulk_handle; 
     hret = HG_Addr_to_string(margo_get_class(mid), relay_addr_string, &relay_addr_string_sz, hgi->addr);
     assert(hret == HG_SUCCESS);
-    in_relay.bulk_relay_addr = relay_addr_string;
+    in_relay.client_addr = relay_addr_string;
     margo_forward(mid, handle_relay, &in_relay);
 
     hret = HG_Get_output(handle_relay, &out_relay);