rpc: Changed API to request/notify for better distinction between the two

2 files changed, 10 insertions, 9 deletions

diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp
index efc89f86e..f1c5efc14 100644
--- a/host/lib/usrp/mpmd/mpmd_impl.cpp
+++ b/host/lib/usrp/mpmd/mpmd_impl.cpp
@@ -140,16 +140,16 @@ void mpmd_impl::setup_rfnoc_blocks(
     const uhd::device_addr_t& ctrl_xport_args
 ) {
     auto &mb = _mb[mb_index];
-    mb->num_xbars = mb->rpc->call<size_t>("get_num_xbars");
+    mb->num_xbars = mb->rpc->request<size_t>("get_num_xbars");
     UHD_LOG_TRACE("MPM",
         "Mboard " << mb_index << " reports " << mb->num_xbars << " crossbar(s)."
     );
 
     for (size_t xbar_index = 0; xbar_index < mb->num_xbars; xbar_index++) {
         const size_t num_blocks =
-            mb->rpc->call<size_t>("get_num_blocks", xbar_index);
+            mb->rpc->request<size_t>("get_num_blocks", xbar_index);
         const size_t base_port =
-            mb->rpc->call<size_t>("get_base_port", xbar_index);
+            mb->rpc->request<size_t>("get_base_port", xbar_index);
         const size_t local_addr = mb->get_xbar_local_addr(xbar_index);
         UHD_LOGGER_TRACE("MPMD")
             << "Enumerating RFNoC blocks for xbar " << xbar_index
diff --git a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp
index 934663e29..6ebb2caf6 100644
--- a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp
+++ b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp
@@ -39,7 +39,7 @@ mpmd_mboard_impl::mpmd_mboard_impl(
         << "Initializing mboard, connecting to IP address: " << ip_addr
         << " mboard args: " << mb_args.to_string()
     ;
-    auto device_info_dict = rpc->call<dev_info>("get_device_info");
+    auto device_info_dict = rpc->request<dev_info>("get_device_info");
     for (const auto &info_pair: device_info_dict) {
         device_info[info_pair.first] = info_pair.second;
     }
@@ -47,12 +47,13 @@ mpmd_mboard_impl::mpmd_mboard_impl(
         << "MPM reports device info: " << device_info.to_string();
 
     // Claim logic
-    auto rpc_token = rpc->call<std::string>("claim",
+    auto rpc_token = rpc->request<std::string>("claim",
         mb_args.get("session_id", MPMD_DEFAULT_SESSION_ID)
     );
     if (rpc_token.empty()) {
         throw uhd::value_error("mpmd device claiming failed!");
     }
+    UHD_LOG_TRACE("MPMD", "Received claim token " << rpc_token);
     rpc->set_token(rpc_token);
     _claimer_task = task::make([this] {
         if (not this->claim()) {
@@ -64,7 +65,7 @@ mpmd_mboard_impl::mpmd_mboard_impl(
     });
 
     // Initialize properties
-    this->num_xbars = rpc->call<size_t>("get_num_xbars");
+    this->num_xbars = rpc->request<size_t>("get_num_xbars");
     // Local addresses are not yet valid after this!
     this->xbar_local_addrs.resize(this->num_xbars, 0xFF);
 
@@ -100,7 +101,7 @@ uhd::sid_t mpmd_mboard_impl::allocate_sid(const uint16_t port,
                                           const uint32_t xbar_src_addr,
                                           const uint32_t xbar_src_port)
 {
-    const auto sid = rpc->call_with_token<uint32_t>(
+    const auto sid = rpc->request_with_token<uint32_t>(
         "allocate_sid",
         port, address.get(), xbar_src_addr, xbar_src_port
     );
@@ -111,7 +112,7 @@ void mpmd_mboard_impl::set_xbar_local_addr(
         const size_t xbar_index,
         const size_t local_addr
 ) {
-    rpc->call_with_token<void>("set_xbar_local_addr", xbar_index, local_addr);
+    UHD_ASSERT_THROW(rpc->request_with_token<bool>("set_xbar_local_addr", xbar_index, local_addr));
     UHD_ASSERT_THROW(xbar_index < xbar_local_addrs.size());
     xbar_local_addrs.at(xbar_index) = local_addr;
 }
@@ -121,7 +122,7 @@ void mpmd_mboard_impl::set_xbar_local_addr(
  ****************************************************************************/
 bool mpmd_mboard_impl::claim()
 {
-    return rpc->call_with_token<bool>("reclaim");
+    return rpc->request_with_token<bool>("reclaim");
 }
 
 /*****************************************************************************