device3: Fixed potential concurreny issues

- Protected block_ctrl vector with a mutex
  - Note: const block accessors are not thread safe
- Removed sid_framer from base device3 class
- Made x300,e300 sid_framers atomic

1 files changed, 3 insertions, 5 deletions

diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp
index ea326878e..20dd89dd1 100644
--- a/host/lib/usrp/e300/e300_impl.cpp
+++ b/host/lib/usrp/e300/e300_impl.cpp
@@ -747,15 +747,16 @@ uint32_t e300_impl::_allocate_sid(const sid_config_t &config)
 {
     const uint32_t stream = (config.dst_prefix | (config.router_dst_there << 2)) & 0xff;
 
+    const size_t sid_framer = _sid_framer++; //increment for next setup
     const uint32_t sid = 0
         | (E300_DEVICE_HERE << 24)
-        | (_sid_framer << 16)
+        | (sid_framer << 16)
         | (config.router_addr_there << 8)
         | (stream << 0)
     ;
     UHD_LOGGER_DEBUG("E300")<< std::hex
         << " sid 0x" << sid
-        << " framer 0x" << _sid_framer
+        << " framer 0x" << sid_framer
         << " stream 0x" << stream
         << " router_dst_there 0x" << int(config.router_dst_there)
         << " router_addr_there 0x" << int(config.router_addr_there)
@@ -779,9 +780,6 @@ uint32_t e300_impl::_allocate_sid(const sid_config_t &config)
         << "done router config for sid 0x" << sid
         << std::dec ;
 
-    //increment for next setup
-    _sid_framer++;
-
     return sid;
 }