X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=9976d3e6e5355c1dffcf84cc9ef53f304c04f113;hp=5a72b31b78563c73e3053e107d14b112c9e040b0;hb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;hpb=dd63af740355865cc0659dfba74ecf4445414bc8 diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index 5a72b31b..9976d3e6 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -18,128 +18,236 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "devicemanager.h" +#include "devicemanager.hpp" +#include "session.hpp" #include -#include #include +#include #include +#include + +#include + +#include + +using std::dynamic_pointer_cast; +using std::list; +using std::map; +using std::ostringstream; +using std::remove_if; +using std::runtime_error; +using std::shared_ptr; +using std::string; +using std::vector; -#include +using Glib::VariantBase; -using namespace std; +using sigrok::ConfigKey; +using sigrok::Context; +using sigrok::Driver; +using sigrok::Device; +using sigrok::HardwareDevice; +using sigrok::SessionDevice; namespace pv { -DeviceManager::DeviceManager(struct sr_context *sr_ctx) : - _sr_ctx(sr_ctx) +DeviceManager::DeviceManager(shared_ptr context) : + context_(context) { - init_drivers(); - scan_all_drivers(); + for (auto entry : context->drivers()) + driver_scan(entry.second, map()); } DeviceManager::~DeviceManager() { - release_devices(); } -const std::list& DeviceManager::devices() const +shared_ptr DeviceManager::context() { - return _devices; + return context_; } -list DeviceManager::driver_scan( - struct sr_dev_driver *const driver, GSList *const drvopts) +const list< shared_ptr >& DeviceManager::devices() const { - list driver_devices; + return devices_; +} + +list< shared_ptr > DeviceManager::driver_scan( + shared_ptr driver, map drvopts) +{ + list< shared_ptr > driver_devices; assert(driver); // Remove any device instances from this driver from the device // list. They will not be valid after the scan. - list::iterator i = _devices.begin(); - while (i != _devices.end()) { - if ((*i)->driver == driver) - i = _devices.erase(i); - else - i++; - } - - // Clear all the old device instances from this driver - sr_dev_clear(driver); + devices_.remove_if([&](shared_ptr device) { + return device->driver() == driver; }); // Do the scan - GSList *const devices = sr_driver_scan(driver, drvopts); - for (GSList *l = devices; l; l = l->next) - driver_devices.push_back((sr_dev_inst*)l->data); - g_slist_free(devices); - driver_devices.sort(compare_devices); - - // Add the scanned devices to the main list - _devices.insert(_devices.end(), driver_devices.begin(), + auto devices = driver->scan(drvopts); + driver_devices.insert(driver_devices.end(), devices.begin(), devices.end()); + + // Add the scanned devices to the main list, set display names and sort. + devices_.insert(devices_.end(), driver_devices.begin(), driver_devices.end()); - _devices.sort(compare_devices); + + for (shared_ptr device : devices_) + display_names_[device] = build_display_name(device); + + devices_.sort([&](shared_ptr a, shared_ptr b) + { return compare_devices(a, b); }); + + // As the display names depend on the complete devices_ list, + // we need to recompute them. However, there is no need to + // recomute all names of the devices_ list since only the + // devices that use the given driver can be affected. + for (shared_ptr device : driver_devices) + display_names_[device] = build_display_name(device); + + driver_devices.sort([&](shared_ptr a, shared_ptr b) + { return compare_devices(a, b); }); return driver_devices; } -string DeviceManager::format_device_title(const sr_dev_inst *const sdi) +const map DeviceManager::get_device_info( + shared_ptr device) +{ + map result; + + assert(device); + + if (device->vendor().length() > 0) + result["vendor"] = device->vendor(); + if (device->model().length() > 0) + result["model"] = device->model(); + if (device->version().length() > 0) + result["version"] = device->version(); + if (device->serial_number().length() > 0) + result["serial_num"] = device->serial_number(); + if (device->connection_id().length() > 0) + result["connection_id"] = device->connection_id(); + + return result; +} + +const shared_ptr DeviceManager::find_device_from_info( + const map search_info) { + shared_ptr last_resort_dev; + map dev_info; + + last_resort_dev = NULL; + + for (shared_ptr dev : devices_) { + assert(dev); + dev_info = get_device_info(dev); + + // If present, vendor and model always have to match. + if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0) + if (dev_info.at("vendor") != search_info.at("vendor")) continue; + + if (dev_info.count("model") > 0 && search_info.count("model") > 0) + if (dev_info.at("model") != search_info.at("model")) continue; + + // Most unique match: vendor/model/serial_num (but don't match a S/N of 0) + if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0") + && search_info.count("serial_num") > 0) + if (dev_info.at("serial_num") == search_info.at("serial_num") && + dev_info.at("serial_num") != "0") + return dev; + + // Second best match: vendor/model/connection_id + if (dev_info.count("connection_id") > 0 && + search_info.count("connection_id") > 0) + if (dev_info.at("connection_id") == search_info.at("connection_id")) + return dev; + + // Last resort: vendor/model/version + if (dev_info.count("version") > 0 && + search_info.count("version") > 0) + if (dev_info.at("version") == search_info.at("version") && + dev_info.at("version") != "0") + return dev; + + // For this device, we merely have a vendor/model match. + last_resort_dev = dev; + } + + // If there wasn't even a vendor/model/version match, we end up here. + // This is usually the case for devices with only vendor/model data. + // The selected device may be wrong with multiple such devices attached + // but it is the best we can do at this point. After all, there may be + // only one such device and we do want to select it in this case. + return last_resort_dev; +} + +const string DeviceManager::build_display_name(shared_ptr device) +{ + auto session_device = dynamic_pointer_cast(device); + auto hardware_device = dynamic_pointer_cast(device); + + if (session_device) + return boost::filesystem::path( + session_device->parent()->filename()).filename().string(); + ostringstream s; - assert(sdi); + bool multiple_dev = false; - if (sdi->vendor && sdi->vendor[0]) { - s << sdi->vendor; - if ((sdi->model && sdi->model[0]) || - (sdi->version && sdi->version[0])) - s << ' '; - } + // If we can find another device with the same model/vendor then + // we have at least two such devices and need to distinguish them. + if (hardware_device) + multiple_dev = any_of(devices_.begin(), devices_.end(), + [&](shared_ptr dev) { + return (dev->vendor() == hardware_device->vendor() && + dev->model() == hardware_device->model()) && + dev != hardware_device; + } ); - if (sdi->model && sdi->model[0]) { - s << sdi->model; - if (sdi->version && sdi->version[0]) - s << ' '; - } + vector parts = {device->vendor(), device->model()}; - if (sdi->version && sdi->version[0]) - s << sdi->version; + if (multiple_dev) { + parts.push_back(device->version()); + parts.push_back(device->serial_number()); - return s.str(); -} + if ((device->serial_number().length() == 0) && + (device->connection_id().length() > 0)) + parts.push_back("("+device->connection_id()+")"); + } -void DeviceManager::init_drivers() -{ - // Initialise all libsigrok drivers - sr_dev_driver **const drivers = sr_driver_list(); - for (sr_dev_driver **driver = drivers; *driver; driver++) { - if (sr_driver_init(_sr_ctx, *driver) != SR_OK) { - throw runtime_error( - string("Failed to initialize driver ") + - string((*driver)->name)); + for (size_t i = 0; i < parts.size(); i++) + { + if (parts[i].length() > 0) + { + if (i != 0) + s << " "; + s << parts[i]; } } + + return s.str(); } -void DeviceManager::release_devices() +const std::string DeviceManager::get_display_name(std::shared_ptr dev) { - sr_dev_driver **const drivers = sr_driver_list(); - for (sr_dev_driver **driver = drivers; *driver; driver++) - sr_dev_clear(*driver); + return display_names_[dev]; } -void DeviceManager::scan_all_drivers() +void DeviceManager::update_display_name(std::shared_ptr dev) { - // Scan all drivers for all devices. - struct sr_dev_driver **const drivers = sr_driver_list(); - for (struct sr_dev_driver **driver = drivers; *driver; driver++) - driver_scan(*driver); + display_names_[dev] = build_display_name(dev); } -bool DeviceManager::compare_devices(const sr_dev_inst *const a, - const sr_dev_inst *const b) +bool DeviceManager::compare_devices(shared_ptr a, + shared_ptr b) { - return format_device_title(a).compare(format_device_title(b)) < 0; + assert(a); + assert(b); + + return display_names_[a].compare(display_names_[b]) < 0; } } // namespace pv