From aa668f74e95617fd0544327a2b57bf654a6f9a2d Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Tue, 31 Jan 2017 18:07:55 +0100
Subject: Be tread-safe on initializing instance

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 NitrokeyManager.cc                      |  3 ++-
 include/DeviceCommunicationExceptions.h | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 include/DeviceCommunicationExceptions.h

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index dc58e4d..ee7ca92 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -88,7 +88,8 @@ namespace nitrokey{
     }
 
     shared_ptr<NitrokeyManager> NitrokeyManager::instance() {
-      //FIXME check thread safety - add atomic for instance, add lock guard
+      static std::mutex mutex;
+      std::lock_guard<std::mutex> lock(mutex);
         if (_instance == nullptr){
             _instance = make_shared<NitrokeyManager>();
         }
diff --git a/include/DeviceCommunicationExceptions.h b/include/DeviceCommunicationExceptions.h
new file mode 100644
index 0000000..78fc625
--- /dev/null
+++ b/include/DeviceCommunicationExceptions.h
@@ -0,0 +1,31 @@
+#ifndef LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H
+#define LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H
+
+#include <exception>
+#include <string>
+//class DeviceCommunicationException: public std::exception {
+class DeviceCommunicationException: public std::runtime_error{
+  std::string message;
+public:
+  DeviceCommunicationException(std::string _msg): runtime_error(_msg), message(_msg){}
+//  virtual const char* what() const throw() override {
+//    return message.c_str();
+//  }
+};
+
+class DeviceNotConnected: public DeviceCommunicationException {
+public:
+  DeviceNotConnected(std::string msg) : DeviceCommunicationException(msg){}
+};
+
+class DeviceSendingFailure: public DeviceCommunicationException {
+public:
+  DeviceSendingFailure(std::string msg) : DeviceCommunicationException(msg){}
+};
+
+class DeviceReceivingFailure: public DeviceCommunicationException {
+public:
+  DeviceReceivingFailure(std::string msg) : DeviceCommunicationException(msg){}
+};
+
+#endif //LIBNITROKEY_DEVICECOMMUNICATIONEXCEPTIONS_H
-- 
cgit v1.2.3