From 3df500cb195adadcfeb6fdbdc3df960e42b127ab Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Sat, 30 Mar 2019 20:14:48 -0700 Subject: uhd: Add new exceptions for RFNoC-specific errors Add the following exception types: - rfnoc_error - op_failed - op_seqerr - op_timeout - op_timeerr - access_error - It is meant to be used when access violations have taken place, i.e., when a resource is being accessed without appropriate permissions. - resolve_error - This is a derivative of rfnoc_error, and will be used when a property resolution fails unexpectedly. - routing_error - For use when the framework has path setup issues or general routing-related errors --- host/lib/exception.cpp | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'host/lib/exception.cpp') diff --git a/host/lib/exception.cpp b/host/lib/exception.cpp index a413e53c2..03c319fac 100644 --- a/host/lib/exception.cpp +++ b/host/lib/exception.cpp @@ -1,18 +1,23 @@ // // Copyright 2011 Ettus Research LLC // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // #include -#include #include +#include using namespace uhd; -exception::exception(const std::string &what): - std::runtime_error(what){/* NOP */} +exception::exception(const std::string& what) : std::runtime_error(what) +{ /* NOP */ +} + +// The formatting is fickle in this macro-magic +// clang-format off #define make_exception_impl(name, class, base) \ class::class(const std::string &what): \ @@ -30,13 +35,34 @@ make_exception_impl("ValueError", value_error, exception) make_exception_impl("NarrowingError", narrowing_error, value_error) make_exception_impl("RuntimeError", runtime_error, exception) make_exception_impl("NotImplementedError", not_implemented_error, runtime_error) +make_exception_impl("AccessError", access_error, runtime_error) make_exception_impl("EnvironmentError", environment_error, exception) make_exception_impl("IOError", io_error, environment_error) make_exception_impl("OSError", os_error, environment_error) make_exception_impl("SystemError", system_error, exception) make_exception_impl("SyntaxError", syntax_error, exception) +make_exception_impl("RfnocError", rfnoc_error, exception) +make_exception_impl("OpFailed", op_failed, rfnoc_error) +make_exception_impl("OpTimeout", op_timeout, rfnoc_error) +make_exception_impl("OpSeqerr", op_seqerr, rfnoc_error) +make_exception_impl("OpTimeErr", op_timerr, rfnoc_error) +make_exception_impl("ResolveError", resolve_error, rfnoc_error) +make_exception_impl("RoutingError", routing_error, rfnoc_error) + + +usb_error::usb_error(int code, const std::string &what) : + runtime_error(str(boost::format("%s %d: %s") % "USBError" % code % what)), + _code(code) +{} + +// clang-format on + +usb_error* usb_error::dynamic_clone(void) const +{ + return new usb_error(*this); +} -usb_error::usb_error(int code, const std::string &what): - runtime_error(str(boost::format("%s %d: %s") % "USBError" % code % what)), _code(code) {} -usb_error *usb_error::dynamic_clone(void) const{return new usb_error(*this);} \ -void usb_error::dynamic_throw(void) const{throw *this;} +void usb_error::dynamic_throw(void) const +{ + throw *this; +} -- cgit v1.2.3