aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorSamuel O'Brien <sam.obrien@ni.com>2020-07-24 08:35:35 -0500
committerAaron Rossetto <aaron.rossetto@ni.com>2020-10-28 15:25:48 -0500
commit00c306d5c441e60e7dfd2516e05e4e433977ecee (patch)
tree998752676d4ff9dbd06ad194056a214e7fdc763c /host/lib/usrp
parentbd278a4b936f3e30f51d7cb9ff489f3ff7215379 (diff)
downloaduhd-00c306d5c441e60e7dfd2516e05e4e433977ecee.tar.gz
uhd-00c306d5c441e60e7dfd2516e05e4e433977ecee.tar.bz2
uhd-00c306d5c441e60e7dfd2516e05e4e433977ecee.zip
sim: Integrate simulator into UHD
This commit adds a device::register_device which allows uhd to start up a simulator when uhd is called with the arguments type=sim. Creating the device object creates a subprocess using pybind and an embedded interpreter, and destroying the object cleans up those subprocesses. Signed-off-by: Samuel O'Brien <sam.obrien@ni.com>
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/mpmd/CMakeLists.txt6
-rw-r--r--host/lib/usrp/mpmd/mpmd_impl.cpp13
-rw-r--r--host/lib/usrp/mpmd/mpmd_impl.hpp4
-rw-r--r--host/lib/usrp/mpmd/sim_find.cpp177
4 files changed, 197 insertions, 3 deletions
diff --git a/host/lib/usrp/mpmd/CMakeLists.txt b/host/lib/usrp/mpmd/CMakeLists.txt
index 6604ba5a8..d7f7f93a2 100644
--- a/host/lib/usrp/mpmd/CMakeLists.txt
+++ b/host/lib/usrp/mpmd/CMakeLists.txt
@@ -18,6 +18,12 @@ if(ENABLE_MPMD)
${CMAKE_CURRENT_SOURCE_DIR}/mpmd_link_if_ctrl_udp.cpp
)
+ if(ENABLE_SIM)
+ LIBUHD_APPEND_SOURCES(
+ ${CMAKE_CURRENT_SOURCE_DIR}/sim_find.cpp
+ )
+ endif(ENABLE_SIM)
+
if(ENABLE_DPDK)
include_directories(${DPDK_INCLUDE_DIRS})
set_property(
diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp
index 7aa9fd8bb..f02e7795c 100644
--- a/host/lib/usrp/mpmd/mpmd_impl.cpp
+++ b/host/lib/usrp/mpmd/mpmd_impl.cpp
@@ -152,11 +152,10 @@ mpmd_impl::mpmd_impl(const device_addr_t& device_args)
{
const device_addrs_t mb_args_without_prefs = separate_device_addr(device_args);
device_addrs_t mb_args;
- for (size_t i = 0; i < mb_args_without_prefs.size(); ++i)
- {
+ for (size_t i = 0; i < mb_args_without_prefs.size(); ++i) {
mb_args.push_back(prefs::get_usrp_args(mb_args_without_prefs[i]));
}
- const size_t num_mboards = mb_args.size();
+ const size_t num_mboards = mb_args.size();
_mb.reserve(num_mboards);
const bool serialize_init = device_args.has_key("serialize_init");
const bool skip_init = device_args.has_key("skip_init");
@@ -209,6 +208,14 @@ mpmd_impl::mpmd_impl(const device_addr_t& device_args)
mpmd_impl::~mpmd_impl()
{
+ _deinit();
+}
+
+/*****************************************************************************
+ * Protected methods
+ ****************************************************************************/
+void mpmd_impl::_deinit()
+{
_tree.reset();
_mb.clear();
}
diff --git a/host/lib/usrp/mpmd/mpmd_impl.hpp b/host/lib/usrp/mpmd/mpmd_impl.hpp
index 06b452724..364978fd7 100644
--- a/host/lib/usrp/mpmd/mpmd_impl.hpp
+++ b/host/lib/usrp/mpmd/mpmd_impl.hpp
@@ -227,6 +227,10 @@ public:
return _mb.at(mb_idx)->get_mb_iface();
}
+protected:
+ //! Destroys the mboard_impls and the device_tree
+ void _deinit();
+
private:
/*************************************************************************
* Private methods/helpers
diff --git a/host/lib/usrp/mpmd/sim_find.cpp b/host/lib/usrp/mpmd/sim_find.cpp
new file mode 100644
index 000000000..2f957977e
--- /dev/null
+++ b/host/lib/usrp/mpmd/sim_find.cpp
@@ -0,0 +1,177 @@
+//
+// Copyright 2020 Ettus Research, a National Instruments Brand
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+//
+
+#include "mpmd_devices.hpp"
+#include "mpmd_impl.hpp"
+#include <uhd/device.hpp>
+#include <uhd/utils/static.hpp>
+#include <uhdlib/rfnoc/rfnoc_device.hpp>
+// Need this import because pybind doesn't have an equivalent to Py_IsInitialized()
+#include <Python.h>
+#include <pybind11/embed.h>
+#include <pybind11/pybind11.h>
+#include <chrono>
+#include <cstdint>
+#include <cstdio>
+#include <memory>
+
+using namespace uhd;
+using namespace uhd::mpmd;
+using namespace std::chrono_literals;
+namespace py = pybind11;
+
+constexpr auto SIMULATOR_EXIT_TIMEOUT = 5s;
+constexpr auto SIMULATOR_STARTUP_TIMEOUT = 5s;
+
+// There can only be one python interpreter instantiated at a time
+// The guard means we only destroy the interpreter if we created it
+static std::unique_ptr<py::scoped_interpreter> interpreter_guard;
+
+void ensure_python_interpreter()
+{
+ // This call is needed because the interpreter may already be running
+ // i.e. UHD is being called from python through pyuhd
+ if (not Py_IsInitialized()) {
+ interpreter_guard = std::make_unique<py::scoped_interpreter>();
+ }
+}
+
+py::object get_simulator_module()
+{
+ try {
+ return py::module::import("usrp_mpm.process_manager");
+ } catch (const py::error_already_set& ex) {
+ std::string message("Simulator failed to import: ");
+ message.append(ex.what());
+ message.append("\nPYTHONPATH: ");
+ auto pythonpath =
+ py::str(py::module::import("sys").attr("path")).cast<std::string>();
+ message.append(pythonpath);
+ throw std::runtime_error(message);
+ }
+}
+
+device_addrs_t mpmd_find_with_addr(
+ const std::string& mgmt_addr, const device_addr_t& hint_);
+
+void shutdown_process(py::object& process_manager)
+{
+ // TODO: Sometimes during a TX, the simulator gets shutdown before all of the packets
+ // are sent
+ py::object stop_fn = process_manager.attr("stop");
+ const double timeout_floating =
+ std::chrono::duration<double>(SIMULATOR_EXIT_TIMEOUT).count();
+ const bool result = stop_fn(timeout_floating).cast<bool>();
+ if (!result) {
+ UHD_LOG_WARNING("SIM",
+ "Simulator Subprocess did not exit, manual cleanup of subprocesses may "
+ "be necessary.")
+ process_manager.attr("terminate")();
+ }
+}
+
+class sim_impl : public mpmd_impl
+{
+public:
+ sim_impl(const uhd::device_addr_t& device_addr, py::object process_manager)
+ : mpmd_impl(device_addr), _process_manager(std::move(process_manager))
+ {
+ }
+
+ ~sim_impl()
+ {
+ // Destroys the mb_ifaces, causing mpm to be unclaimed before shutting down the
+ // simulator
+ _deinit();
+ shutdown_process(_process_manager);
+ }
+
+private:
+ // This is an object of type ProcessManager
+ // See mpm/python/usrp_mpm/process_manager.py
+ py::object _process_manager;
+};
+
+device_addrs_t sim_find(const device_addr_t& hint_)
+{
+ device_addrs_t simulators;
+ if (hint_.has_key("type") && hint_["type"] == "sim") {
+ simulators.push_back(hint_);
+ // Set addr to localhost
+ simulators.back()["addr"] = "127.0.0.1";
+ simulators.back()["mgmt_addr"] = "127.0.0.1";
+ // So discovery doesn't complain about hint mismatch
+ simulators.back()["type"] = MPM_CATCHALL_DEVICE_TYPE;
+ }
+ return simulators;
+}
+
+/*! Ensure that the simulator is loaded by pinging the discovery port until it responds or
+ * the function times out
+ */
+bool check_simulator_status(
+ const device_addr_t& device_addr, std::chrono::milliseconds timeout)
+{
+ const auto timeout_time = std::chrono::steady_clock::now() + timeout;
+ while (std::chrono::steady_clock::now() < timeout_time) {
+ const auto devices = mpmd_find_with_addr(device_addr["mgmt_addr"], device_addr);
+ if (!devices.empty()) {
+ return true;
+ }
+ std::this_thread::sleep_for(std::chrono::milliseconds(10));
+ }
+ return false;
+}
+
+device::sptr sim_make(const device_addr_t& device_args)
+{
+ // Ensure the interpreter is loaded
+ ensure_python_interpreter();
+ py::object manager_module = get_simulator_module();
+ py::object manager_class = manager_module.attr("ProcessManager");
+
+ std::string config_arg("--default-args=config=");
+ if (not device_args.has_key("config")) {
+ throw std::runtime_error(
+ "Please specify a config file using the args key 'config'");
+ }
+ config_arg.append(device_args["config"]);
+
+ py::list process_args;
+ process_args.append(py::str(config_arg));
+
+ if (device_args.has_key("log_level")) {
+ std::string level = device_args["log_level"];
+ if (level == "trace") {
+ process_args.append(py::str("-vv"));
+ } else if (level == "debug") {
+ process_args.append(py::str("-v"));
+ } else if (level == "info") {
+ // No-op
+ } else if (level == "warning") {
+ process_args.append(py::str("-q"));
+ } else if (level == "error") {
+ process_args.append(py::str("-qq"));
+ }
+ }
+
+ py::object process_manager = manager_class(process_args);
+ process_manager.attr("start")();
+
+ const uint32_t pid = process_manager.attr("pid")().cast<uint32_t>();
+ UHD_LOG_INFO("SIM", "Starting simulator as pid " << pid);
+ if (not check_simulator_status(device_args, SIMULATOR_STARTUP_TIMEOUT)) {
+ shutdown_process(process_manager);
+ throw std::runtime_error("Simulator Startup timed out!");
+ }
+ return static_cast<device::sptr>(
+ std::make_shared<sim_impl>(device_args, std::move(process_manager)));
+}
+
+UHD_STATIC_BLOCK(register_sim_device)
+{
+ device::register_device(&sim_find, &sim_make, device::USRP);
+}