diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-02-28 17:32:47 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 15:41:50 +0100 |
| commit | 34daa03a2be13f9f38fc29336350236a3e9f541e (patch) | |
| tree | cd1e306f95fa232b375b6a0348c2856230e358e9 | |
| parent | ee78540d7d9a5d555085b4608ba0ccb4f9ec1801 (diff) | |
| download | libnitrokey-34daa03a2be13f9f38fc29336350236a3e9f541e.tar.gz libnitrokey-34daa03a2be13f9f38fc29336350236a3e9f541e.tar.bz2 | |
Count lifetime instances of device communication exception
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | DeviceCommunicationExceptions.cpp | 3 | ||||
| -rw-r--r-- | include/DeviceCommunicationExceptions.h | 15 |
3 files changed, 16 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d0bc1f8..46f5bee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ set(SOURCE_FILES NitrokeyManager.cc NK_C_API.h NK_C_API.cc -) + DeviceCommunicationExceptions.cpp) IF(UNIX) # add_library(hidapi-libusb STATIC hidapi/libusb/hid.c ) diff --git a/DeviceCommunicationExceptions.cpp b/DeviceCommunicationExceptions.cpp new file mode 100644 index 0000000..a470a48 --- /dev/null +++ b/DeviceCommunicationExceptions.cpp @@ -0,0 +1,3 @@ +#include "DeviceCommunicationExceptions.h" + +std::atomic_int DeviceCommunicationException::occurred {0}; diff --git a/include/DeviceCommunicationExceptions.h b/include/DeviceCommunicationExceptions.h index 78fc625..6d21561 100644 --- a/include/DeviceCommunicationExceptions.h +++ b/include/DeviceCommunicationExceptions.h @@ -1,16 +1,24 @@ #ifndef LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H #define LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H +#include <atomic> #include <exception> +#include <stdexcept> #include <string> -//class DeviceCommunicationException: public std::exception { -class DeviceCommunicationException: public std::runtime_error{ + +class DeviceCommunicationException: public std::runtime_error +{ std::string message; + static std::atomic_int occurred; public: - DeviceCommunicationException(std::string _msg): runtime_error(_msg), message(_msg){} + DeviceCommunicationException(std::string _msg): std::runtime_error(_msg), message(_msg){ + ++occurred; + } // virtual const char* what() const throw() override { // return message.c_str(); // } + static bool has_occurred(){ return occurred > 0; }; + static void reset_occurred_flag(){ occurred = 0; }; }; class DeviceNotConnected: public DeviceCommunicationException { @@ -28,4 +36,5 @@ public: DeviceReceivingFailure(std::string msg) : DeviceCommunicationException(msg){} }; + #endif //LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H |