Revert "Changed list of events to vector, switched back to using lock_guard instead of shared/unique_locks"

This reverts commit 2dac03b3e5.
This commit is contained in:
EricLiu2000
2019-06-27 14:16:36 -04:00
parent 2dac03b3e5
commit d0c6aba0fc
2 changed files with 18 additions and 27 deletions
+10 -7
View File
@@ -2,8 +2,11 @@
#define __ICSNEO_API_EVENTMANAGER_H_
#include <vector>
#include <list>
#include <mutex>
#include <shared_mutex>
#include <functional>
#include <unordered_map>
#include<map>
#include <thread>
#include "icsneo/api/event.h"
@@ -19,7 +22,7 @@ public:
static void ResetInstance();
size_t eventCount(EventFilter filter = EventFilter()) const {
std::lock_guard<std::mutex> lk(mutex);
std::shared_lock<std::shared_mutex> lk(mutex);
return count_internal(filter);
};
@@ -35,11 +38,11 @@ public:
APIEvent getLastError();
void add(APIEvent event) {
std::lock_guard<std::mutex> lk(mutex);
std::unique_lock<std::shared_mutex> lk(mutex);
add_internal(event);
}
void add(APIEvent::Type type, APIEvent::Severity severity, const Device* forDevice = nullptr) {
std::lock_guard<std::mutex> lk(mutex);
std::unique_lock<std::shared_mutex> lk(mutex);
add_internal(APIEvent(type, severity, forDevice));
}
@@ -54,14 +57,14 @@ public:
return;
}
std::lock_guard<std::mutex> lk(mutex);
std::unique_lock<std::shared_mutex> lk(mutex);
eventLimit = newLimit;
if(enforceLimit())
add_internal(APIEvent(APIEvent::Type::TooManyEvents, APIEvent::Severity::EventWarning));
}
size_t getEventLimit() const {
std::lock_guard<std::mutex> lk(mutex);
std::shared_lock<std::shared_mutex> lk(mutex);
return eventLimit;
}
@@ -71,10 +74,10 @@ private:
EventManager& operator=(const EventManager &other);
// Used by functions for threadsafety
mutable std::mutex mutex;
mutable std::shared_mutex mutex;
// Stores all events
std::vector<APIEvent> events;
std::list<APIEvent> events;
std::map<std::thread::id, APIEvent> lastUserErrors;
size_t eventLimit = 10000;