From 34daa03a2be13f9f38fc29336350236a3e9f541e Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 28 Feb 2017 17:32:47 +0100 Subject: Count lifetime instances of device communication exception Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 2 +- DeviceCommunicationExceptions.cpp | 3 +++ include/DeviceCommunicationExceptions.h | 15 ++++++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 DeviceCommunicationExceptions.cpp 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 #include +#include #include -//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 -- cgit v1.2.1