drop op id arg for bulk_transfer -- not needed

examples/composition/data-xfer-service.c

@@ -55,7 +55,7 @@ static void data_xfer_read_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PUSH,
         client_addr, in.bulk_handle, 0,
-        g_buffer_bulk_handle, 0, g_buffer_size, HG_OP_ID_IGNORE);
+        g_buffer_bulk_handle, 0, g_buffer_size);
     assert(hret == HG_SUCCESS);
 
     if(in.client_addr)

examples/multiplex/svc1-server.c

@@ -51,7 +51,7 @@ static void svc1_do_thing_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     margo_free_input(handle, &in);
@@ -109,7 +109,7 @@ static void svc1_do_other_thing_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     margo_free_input(handle, &in);

examples/multiplex/svc2-server.c

@@ -51,7 +51,7 @@ static void svc2_do_thing_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     margo_free_input(handle, &in);
@@ -109,7 +109,7 @@ static void svc2_do_other_thing_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     margo_free_input(handle, &in);

examples/my-rpc.c

@@ -59,7 +59,7 @@ static void my_rpc_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     /* write to a file; would be done with abt-io if we enabled it */

include/margo.h

@@ -548,7 +548,6 @@ hg_return_t margo_bulk_deserialize(
  * @param [in] local_handle local bulk memory handle
  * @param [in] local_offset offset into local bulk memory to access
  * @param [in] size size (in bytes) of transfer
- * @param [out] op_id pointer to returned operation ID
  * @returns 0 on success, hg_return_t values on error
  */
 hg_return_t margo_bulk_transfer(
@@ -559,8 +558,7 @@ hg_return_t margo_bulk_transfer(
     size_t origin_offset,
     hg_bulk_t local_handle,
     size_t local_offset,
-    size_t size,
-    hg_op_id_t *op_id);
+    size_t size);
 
 /**
  * Suspends the calling ULT for a specified time duration

src/margo.c

@@ -730,8 +730,7 @@ hg_return_t margo_bulk_transfer(
     size_t origin_offset,
     hg_bulk_t local_handle,
     size_t local_offset,
-    size_t size,
-    hg_op_id_t *op_id)
+    size_t size)
 {
     hg_return_t hret = HG_TIMEOUT;
     hg_return_t *waited_hret;
@@ -750,7 +749,7 @@ hg_return_t margo_bulk_transfer(
 
     hret = HG_Bulk_transfer(mid->hg_context, margo_bulk_transfer_cb,
         &arg, op, origin_addr, origin_handle, origin_offset, local_handle,
-        local_offset, size, op_id);
+        local_offset, size, HG_OP_ID_IGNORE);
     if(hret == HG_SUCCESS)
     {
         ABT_eventual_wait(eventual, (void**)&waited_hret);

tests/my-rpc.c

@@ -59,7 +59,7 @@ static void my_rpc_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     /* write to a file; would be done with abt-io if we enabled it */
@@ -155,7 +155,7 @@ static void my_rpc_hang_ult(hg_handle_t handle)
     /* do bulk transfer from client to server */
     hret = margo_bulk_transfer(mid, HG_BULK_PULL,
         hgi->addr, in.bulk_handle, 0,
-        bulk_handle, 0, size, HG_OP_ID_IGNORE);
+        bulk_handle, 0, size);
     assert(hret == HG_SUCCESS);
 
     margo_free_input(handle, &in);