Changeset 773ad32 in nscp for include

Timestamp:

11/10/09 18:25:49 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

b4ab033

Parents:

6672c56

Message:

swaped the mutexes for the settings subsysytem to boost

Location:

include/settings

Files:

• Settings.h (modified) (12 diffs)
• settings_ini.hpp (modified) (1 diff)

include/settings/Settings.h

@@ -24 +24 @@
 #include <string>
 #include <map>
-#include <Mutex.h>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/locks.hpp>
+#include <strEx.h>
 #define BUFF_LEN 4096
 
@@ -615 +617 @@
     SettingsInterface* instance_;
     instance_list instances_;
-    MutexHandler mutexHandler_;
+    boost::timed_mutex mutexHandler_;
     /*
     struct key_description : public SettingsCore::key_description {
@@ -714 +716 @@
 
     SettingsInterface* get() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("Failed to get mutext, cant get settings instance"));
       if (instance_ == NULL)
@@ -724 +726 @@
     }
     SettingsInterface* get(SettingsCore::settings_type type) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("Failed to get mutext, cant get settings instance"));
       return instance_unsafe(type);
@@ -783 +785 @@
         get_logger()->debug(__FILEW__, __LINE__, _T("Starting to migrate..."));
 #endif
-        MutexLock mutex(mutexHandler_);
-        if (!mutex.hasMutex())
+        boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+        if (!mutex.owns_lock())
           throw SettingsException(_T("migrate_type: Failed to get mutext, cant get settings instance"));
         SettingsInterface* iFrom = instance_unsafe(from);
@@ -803 +805 @@
     }
     SettingsCore::settings_type get_settings_type() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("Failed to get mutext, cant get load settings"));
       if (instance_ == NULL)
@@ -823 +825 @@
     }
     bool has_type(SettingsCore::settings_type type) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("has_type Failed to get mutext, cant get access settings"));
       instance_list::const_iterator cit = instances_.find(type);
@@ -830 +832 @@
     }
     void set_type(SettingsCore::settings_type type) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("set_type Failed to get mutext, cant get access settings"));
       instance_list::const_iterator cit = instances_.find(type);
@@ -839 +841 @@
     }
     void add_type_impl(SettingsCore::settings_type type, SettingsInterface* impl) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("add_type_impl Failed to get mutext, cant get access settings"));
       instance_list::iterator it = instances_.find(type);
@@ -1150 +1152 @@
 
     void add_instance(SettingsInterface *instance) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("load_all_instance Failed to get mutext, cant get access settings"));
       instance_list::iterator it = instances_.find(instance->get_type());
@@ -1172 +1174 @@
   private:
     void destroy_all_instances() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("destroy_all_instances Failed to get mutext, cant get access settings"));
       instance_ = NULL;
@@ -1186 +1188 @@
     }
     SettingsInterface *get_default_settings_instance_unsafe() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("destroy_all_instances Failed to get mutext, cant get access settings"));
       instance_ = NULL;

include/settings/settings_ini.hpp

@@ -5 +5 @@
 #include <settings/Settings.h>
 #include <simpleini/SimpleIni.h>
+#include <error.hpp>
 
 namespace Settings {