Update framework.

This commit is contained in:
stephb9959
2022-02-04 11:45:09 -08:00
parent 1100fa9836
commit d0bf94f7ef

View File

@@ -1115,7 +1115,7 @@ namespace OpenWifi {
{ {
std::lock_guard M(Mutex_); std::lock_guard M(Mutex_);
if(isFull()) { if(Used_==Buffer_->capacity()) {
Buffer_->reserve( Buffer_->size()+100 ); Buffer_->reserve( Buffer_->size()+100 );
} }
@@ -1139,7 +1139,7 @@ namespace OpenWifi {
inline auto MaxEverUser() const { return MaxEverUsed_; } inline auto MaxEverUser() const { return MaxEverUsed_; }
private: private:
std::mutex Mutex_; std::recursive_mutex Mutex_;
uint32_t Read_=0; uint32_t Read_=0;
uint32_t Write_=0; uint32_t Write_=0;
uint32_t Used_=0; uint32_t Used_=0;
@@ -2380,7 +2380,7 @@ namespace OpenWifi {
} }
private: private:
std::mutex Mutex_; std::recursive_mutex Mutex_;
Poco::Thread Worker_; Poco::Thread Worker_;
std::atomic_bool Running_=false; std::atomic_bool Running_=false;
Poco::NotificationQueue Queue_; Poco::NotificationQueue Queue_;
@@ -2406,7 +2406,7 @@ namespace OpenWifi {
} }
private: private:
std::mutex Mutex_; std::recursive_mutex Mutex_;
Poco::Thread Worker_; Poco::Thread Worker_;
std::atomic_bool Running_=false; std::atomic_bool Running_=false;
}; };
@@ -2487,7 +2487,7 @@ namespace OpenWifi {
} }
private: private:
std::mutex Mutex_; std::recursive_mutex Mutex_;
Types::NotifyTable Notifiers_; Types::NotifyTable Notifiers_;
Poco::Thread Worker_; Poco::Thread Worker_;
std::atomic_bool Running_=false; std::atomic_bool Running_=false;
@@ -3073,7 +3073,7 @@ namespace OpenWifi {
std::string UIURI_; std::string UIURI_;
std::string Version_{ OW_VERSION::VERSION + "("+ OW_VERSION::BUILD + ")" + " - " + OW_VERSION::HASH }; std::string Version_{ OW_VERSION::VERSION + "("+ OW_VERSION::BUILD + ")" + " - " + OW_VERSION::HASH };
BusEventManager BusEventManager_; BusEventManager BusEventManager_;
std::mutex InfraMutex_; std::recursive_mutex InfraMutex_;
std::default_random_engine RandomEngine_; std::default_random_engine RandomEngine_;
Poco::Util::PropertyFileConfiguration * PropConfigurationFile_ = nullptr; Poco::Util::PropertyFileConfiguration * PropConfigurationFile_ = nullptr;
std::string DAEMON_PROPERTIES_FILENAME; std::string DAEMON_PROPERTIES_FILENAME;