From 30521c87a5d6b531b894877f40f0f34ef8ecd541 Mon Sep 17 00:00:00 2001
From: Matthieu Dorier <mdorier@anl.gov>
Date: Thu, 11 Jan 2018 16:28:09 +0100
Subject: [PATCH] changed multiplex ids from uint32_t to uint8_t

---
 include/margo.h | 10 +++++-----
 src/margo.c     | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/margo.h b/include/margo.h
index 50d3369..0d2cb49 100644
--- a/include/margo.h
+++ b/include/margo.h
@@ -154,7 +154,7 @@ hg_id_t margo_register_name_mplex(
     hg_proc_cb_t in_proc_cb,
     hg_proc_cb_t out_proc_cb,
     hg_rpc_cb_t rpc_cb,
-    uint32_t mplex_id,
+    uint8_t mplex_id,
     ABT_pool pool);
 
 /*
@@ -188,7 +188,7 @@ hg_return_t margo_registered_name(
 hg_return_t margo_registered_name_mplex(
     margo_instance_id mid,
     const char *func_name,
-    uint32_t mplex_id,
+    uint8_t mplex_id,
     hg_id_t *id,
     hg_bool_t *flag);
 
@@ -240,7 +240,7 @@ void* margo_registered_data(
 int margo_register_data_mplex(
     margo_instance_id mid,
     hg_id_t id,
-    uint32_t mplex_id,
+    uint8_t mplex_id,
     void* data,
     void (*free_callback)(void *));
 
@@ -257,7 +257,7 @@ int margo_register_data_mplex(
 void* margo_registered_data_mplex(
     margo_instance_id mid,
     hg_id_t id,
-    uint32_t mplex_id);
+    uint8_t mplex_id);
 
 /**
  * Disable response for a given RPC ID.
@@ -757,7 +757,7 @@ margo_instance_id margo_hg_info_get_instance(const struct hg_info *info);
  * @param [in] mplex_id multiplexing identifier
  * @param [out] pool Argobots pool the handler will execute in
  */
-int margo_lookup_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id, ABT_pool *pool);
+int margo_lookup_mplex(margo_instance_id mid, hg_id_t id, uint8_t mplex_id, ABT_pool *pool);
 
 /**
  * Enables diagnostic collection on specified Margo instance
diff --git a/src/margo.c b/src/margo.c
index abe0a2e..eff3b0e 100644
--- a/src/margo.c
+++ b/src/margo.c
@@ -28,7 +28,7 @@
 struct mplex_key
 {
     hg_id_t id;
-    uint32_t mplex_id;
+    uint8_t mplex_id;
 };
 
 struct mplex_element
@@ -473,7 +473,7 @@ hg_id_t margo_register_name(margo_instance_id mid, const char *func_name,
 
 hg_id_t margo_register_name_mplex(margo_instance_id mid, const char *func_name,
     hg_proc_cb_t in_proc_cb, hg_proc_cb_t out_proc_cb, hg_rpc_cb_t rpc_cb,
-    uint32_t mplex_id, ABT_pool pool)
+    uint8_t mplex_id, ABT_pool pool)
 {
     struct mplex_key key;
     struct mplex_element *element;
@@ -513,7 +513,7 @@ hg_return_t margo_registered_name(margo_instance_id mid, const char *func_name,
 }
 
 hg_return_t margo_registered_name_mplex(margo_instance_id mid, const char *func_name,
-    uint32_t mplex_id, hg_id_t *id, hg_bool_t *flag)
+    uint8_t mplex_id, hg_id_t *id, hg_bool_t *flag)
 {
     hg_bool_t b;
     hg_return_t ret = margo_registered_name(mid, func_name, id, &b);
@@ -1006,7 +1006,7 @@ margo_instance_id margo_hg_info_get_instance(const struct hg_info *info)
 	return data->mid;
 }
 
-int margo_lookup_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id, ABT_pool *pool)
+int margo_lookup_mplex(margo_instance_id mid, hg_id_t id, uint8_t mplex_id, ABT_pool *pool)
 {
     struct mplex_key key;
     struct mplex_element *element;
@@ -1036,7 +1036,7 @@ int margo_lookup_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id, ABT
     return(0);
 }
 
-int margo_register_data_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id, void* data, void (*free_callback)(void *))
+int margo_register_data_mplex(margo_instance_id mid, hg_id_t id, uint8_t mplex_id, void* data, void (*free_callback)(void *))
 {
     struct mplex_key key;
     struct mplex_element *element;
@@ -1060,7 +1060,7 @@ int margo_register_data_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_
     return(0);
 }
 
-void* margo_registered_data_mplex(margo_instance_id mid, hg_id_t id, uint32_t mplex_id)
+void* margo_registered_data_mplex(margo_instance_id mid, hg_id_t id, uint8_t mplex_id)
 {
     struct mplex_key key;
     struct mplex_element *element;
-- 
2.22.0