From 0071e7bf874c0ac1c8b5b5a1fdef424b08916671 Mon Sep 17 00:00:00 2001
From: Phil Carns <carns@mcs.anl.gov>
Date: Sun, 27 Mar 2016 20:42:49 -0400
Subject: [PATCH] update to reflect latest Mercury master API

---
 README.md         | 2 ++
 examples/client.c | 6 +++---
 examples/my-rpc.c | 4 ++--
 examples/server.c | 2 +-
 include/margo.h   | 4 ++--
 src/margo.c       | 8 ++++----
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 5de0dbd..0b1a833 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ implementation.  See the following for more details about each project:
 ##  Dependencies
 
 * mercury  (git clone --recurse-submodules https://github.com/mercury-hpc/mercury.git)
+** Note: this code requires Mercury git revision 
+  6b9480aec20a48c6c775c78ed82947af2eb82b03 or later
 * argobots (git://git.mcs.anl.gov/argo/argobots.git)
 * abt-snoozer (https://xgitlab.cels.anl.gov/sds/abt-snoozer)
 * libev (e.g libev-dev package on Ubuntu or Debian)
diff --git a/examples/client.c b/examples/client.c
index fffb8e0..29ee860 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
         NA_Finalize(network_class);
         return(-1);
     }
-    hg_class = HG_Init(network_class, na_context, NULL);
+    hg_class = HG_Init(network_class, na_context);
     if(!hg_class)
     {
         fprintf(stderr, "Error: HG_Init()\n");
@@ -217,13 +217,13 @@ static void run_my_rpc(void *_arg)
     assert(ret == 0);
 
     /* create handle */
-    ret = HG_Create(arg->hg_class, arg->hg_context, svr_addr, my_rpc_id, &handle);
+    ret = HG_Create(arg->hg_context, svr_addr, my_rpc_id, &handle);
     assert(ret == 0);
 
     /* register buffer for rdma/bulk access by server */
     hgi = HG_Get_info(handle);
     assert(hgi);
-    ret = HG_Bulk_create(hgi->hg_bulk_class, 1, &buffer, &size, 
+    ret = HG_Bulk_create(hgi->hg_class, 1, &buffer, &size, 
         HG_BULK_READ_ONLY, &in.bulk_handle);
     assert(ret == 0);
 
diff --git a/examples/my-rpc.c b/examples/my-rpc.c
index 9741c07..b1c543a 100644
--- a/examples/my-rpc.c
+++ b/examples/my-rpc.c
@@ -48,14 +48,14 @@ static void my_rpc_ult(void *_arg)
     /* register local target buffer for bulk access */
     hgi = HG_Get_info(*handle);
     assert(hgi);
-    ret = HG_Bulk_create(hgi->hg_bulk_class, 1, &buffer,
+    ret = HG_Bulk_create(hgi->hg_class, 1, &buffer,
         &size, HG_BULK_WRITE_ONLY, &bulk_handle);
     assert(ret == 0);
 
     mid = margo_hg_class_to_instance(hgi->hg_class);
 
     /* do bulk transfer from client to server */
-    ret = margo_bulk_transfer(mid, hgi->bulk_context, HG_BULK_PULL, 
+    ret = margo_bulk_transfer(mid, hgi->context, HG_BULK_PULL, 
         hgi->addr, in.bulk_handle, 0,
         bulk_handle, 0, size);
     assert(ret == 0);
diff --git a/examples/server.c b/examples/server.c
index 787e87d..566250d 100644
--- a/examples/server.c
+++ b/examples/server.c
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
         NA_Finalize(network_class);
         return(-1);
     }
-    hg_class = HG_Init(network_class, na_context, NULL);
+    hg_class = HG_Init(network_class, na_context);
     if(!hg_class)
     {
         fprintf(stderr, "Error: HG_Init()\n");
diff --git a/include/margo.h b/include/margo.h
index 871a1e2..cc778b9 100644
--- a/include/margo.h
+++ b/include/margo.h
@@ -62,7 +62,7 @@ hg_return_t margo_forward(
 /** 
  * Perform a bulk transfer
  * @param [in] mid Margo instance
- * @param [in] context Mercury bulk context
+ * @param [in] context Mercury context
  * @param [in] op type of operation to perform
  * @param [in] origin_addr remote Mercury address
  * @param [in] origin_handle remote Mercury bulk memory handle
@@ -74,7 +74,7 @@ hg_return_t margo_forward(
  */
 hg_return_t margo_bulk_transfer(
     margo_instance_id mid,
-    hg_bulk_context_t *context,
+    hg_context_t *context,
     hg_bulk_op_t op,
     na_addr_t origin_addr,
     hg_bulk_t origin_handle,
diff --git a/src/margo.c b/src/margo.c
index c156801..b34c4d1 100644
--- a/src/margo.c
+++ b/src/margo.c
@@ -114,7 +114,7 @@ static void hg_progress_fn(void* foo)
     while(!mid->hg_progress_shutdown_flag)
     {
         do {
-            ret = HG_Trigger(mid->hg_class, mid->hg_context, 0, 1, &actual_count);
+            ret = HG_Trigger(mid->hg_context, 0, 1, &actual_count);
         } while((ret == HG_SUCCESS) && actual_count && !mid->hg_progress_shutdown_flag);
 
         if(!mid->hg_progress_shutdown_flag)
@@ -122,12 +122,12 @@ static void hg_progress_fn(void* foo)
             ABT_pool_get_total_size(mid->progress_pool, &size);
             if(size > 0)
             {
-                HG_Progress(mid->hg_class, mid->hg_context, 0);
+                HG_Progress(mid->hg_context, 0);
                 ABT_thread_yield();
             }
             else
             {
-                HG_Progress(mid->hg_class, mid->hg_context, 100);
+                HG_Progress(mid->hg_context, 100);
             }
         }
     }
@@ -246,7 +246,7 @@ na_return_t margo_na_addr_lookup(
 
 hg_return_t margo_bulk_transfer(
     margo_instance_id mid,
-    hg_bulk_context_t *context,
+    hg_context_t *context,
     hg_bulk_op_t op,
     na_addr_t origin_addr,
     hg_bulk_t origin_handle,
-- 
2.26.2