diff options
| author | trungnob <trung.n.tran@ni.com> | 2017-05-19 17:43:26 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-05-20 21:21:59 -0700 |
| commit | b431866a5ec00753b40823e3172a8388582701c4 (patch) | |
| tree | 3238e22f847439df08a79e413abfc649b5f81906 | |
| parent | 6c002e026645738e8cc23e3e1b3d2a631c7f2b3b (diff) | |
| download | uhd-b431866a5ec00753b40823e3172a8388582701c4.tar.gz uhd-b431866a5ec00753b40823e3172a8388582701c4.tar.bz2 uhd-b431866a5ec00753b40823e3172a8388582701c4.zip | |
log: Remove logging out of any UHD_STATIC_BLOCK.
Window DLL loading is causing deadlock due to thread creation and
synchronization of logging system; therefore, we want to remove it for
now.
| -rw-r--r-- | host/lib/device.cpp | 2 | ||||
| -rw-r--r-- | host/lib/image_loader.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard_manager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp index ace0a0bd6..f8b2fc498 100644 --- a/host/lib/device.cpp +++ b/host/lib/device.cpp @@ -73,7 +73,7 @@ void device::register_device( const make_t &make, const device_filter_t filter ){ - UHD_LOGGER_TRACE("UHD") << "registering device"; + // UHD_LOGGER_TRACE("UHD") << "registering device"; get_dev_fcn_regs().push_back(dev_fcn_reg_t(find, make, filter)); } diff --git a/host/lib/image_loader.cpp b/host/lib/image_loader.cpp index b05664dd0..8b56d607e 100644 --- a/host/lib/image_loader.cpp +++ b/host/lib/image_loader.cpp @@ -46,8 +46,8 @@ UHD_SINGLETON_FCN(string_map_t, get_recovery_strings); void uhd::image_loader::register_image_loader(const std::string &device_type, const loader_fcn_t &loader_fcn, const std::string &recovery_instructions){ - UHD_LOGGER_TRACE("UHD") << "Registering image loader and recovery instructions for " - << device_type; + // UHD_LOGGER_TRACE("UHD") << "Registering image loader and recovery instructions for " + // << device_type; get_image_loaders().insert(loader_fcn_pair_t(device_type, loader_fcn)); get_recovery_strings().insert(string_pair_t(device_type, recovery_instructions)); diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp index 532f5593b..87b0c9f9c 100644 --- a/host/lib/usrp/dboard_manager.cpp +++ b/host/lib/usrp/dboard_manager.cpp @@ -96,7 +96,7 @@ static void register_dboard_key( const std::vector<std::string> &subdev_names, dboard_manager::dboard_ctor_t db_container_ctor ){ - UHD_LOGGER_TRACE("DBMGR") << "registering: " << name; + // UHD_LOGGER_TRACE("DBMGR") << "registering: " << name; if (get_id_to_args_map().has_key(dboard_key)){ if (dboard_key.is_xcvr()) throw uhd::key_error(str(boost::format( |