e310/e320: Move E310 to MPM architecture and refactor

- Turns the E310 into an MPM device (like N3xx, E320)
- Factor out common code between E320 and E310, maximize sharing between
  the two devices
- Remove all pre-MPM E310 code that is no longer needed
- Modify MPM to remove all existing overlays before applying new ones
  (this is necessary to enable idle image mode for E310)

Co-authored-by: Virendra Kakade <virendra.kakade@ni.com>
Signed-off-by: Virendra Kakade <virendra.kakade@ni.com>

1 files changed, 20 insertions, 9 deletions

diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py
index c67bf769b..80b4eb44e 100644
--- a/mpm/python/usrp_mpm/rpc_server.py
+++ b/mpm/python/usrp_mpm/rpc_server.py
@@ -286,6 +286,8 @@ class MPMServer(RPCServer):
         self._state.claim_status.value = True
         self.periph_manager.claimed = True
         self.periph_manager.claim()
+        if self.periph_manager.clear_rpc_method_registry_on_unclaim:
+            self._init_rpc_calls(self.periph_manager)
         self._state.lock.release()
         self.session_id = session_id + " ({})".format(self.client_host)
         self._reset_timer()
@@ -337,6 +339,8 @@ class MPMServer(RPCServer):
         self._state.claim_status.value = False
         self._state.claim_token.value = b''
         self.session_id = None
+        if self.periph_manager.clear_rpc_method_registry_on_unclaim:
+            self.clear_method_registry()
         try:
             self.periph_manager.claimed = False
             self.periph_manager.unclaim()
@@ -451,19 +455,13 @@ class MPMServer(RPCServer):
     ###########################################################################
     # Update components
     ###########################################################################
-    def reset_mgr(self):
+    def clear_method_registry(self):
         """
-        Reset the Peripheral Manager for this RPC server.
+        Clear all the methods in the RPC server method cache.
         """
-        self.log.info("Resetting peripheral manager.")
-        self.periph_manager.tear_down()
-        self.periph_manager = None
-        self.periph_manager = self._mgr_generator()
-        self._init_rpc_calls(self.periph_manager)
         # RPCServer caches RPC methods, but that cache is not accessible here
         # (because Cython). Re-running `RPCServer.__init__` clears that cache,
-        # and allows us to register new RPC methods (which we need to do because
-        # we're resetting the PeriphManager).
+        # and allows us to register new RPC methods.
         # A note on maintenance: This has been deemed safe through inspection of
         # the RPCServer source code. However, this is not typical Python, and
         # changes in future versions of RPCServer may cause issues.
@@ -471,6 +469,19 @@ class MPMServer(RPCServer):
             pack_params={'use_bin_type': True},
         )
 
+    def reset_mgr(self):
+        """
+        Reset the Peripheral Manager for this RPC server.
+        """
+        self.log.info("Resetting peripheral manager.")
+        self.periph_manager.tear_down()
+        self.periph_manager = None
+        self.periph_manager = self._mgr_generator()
+        self._init_rpc_calls(self.periph_manager)
+        # Clear the method cache in order to remove stale references to
+        # methods from the old peripheral manager (the one before reset)
+        self.clear_method_registry()
+
     def update_component(self, token, file_metadata_l, data_l):
         """"
         Updates the device component files specified by the metadata and data