Changeset 1485:3a149151a9cd

Timestamp:

08/29/10 14:59:23 (18 months ago)

Author:

niam

Branch:

default

Message:

[pc::sync] acquire returns false if the lock was not acquired within given timeout

Location:

sources

Files:

• examples/pc_process/test.cc (modified) (1 diff)
• include/libdodo/exceptionBasic.h (modified) (1 diff)
• include/libdodo/pc.h (modified) (1 diff)
• include/libdodo/pcNotificationThreadEx.h (modified) (1 diff)
• include/libdodo/pcSyncDataObject.h (modified) (1 diff)
• include/libdodo/pcSyncDataObjectEx.h (added)
• include/libdodo/pcSyncProcess.h (modified) (1 diff)
• include/libdodo/pcSyncProcessEx.h (modified) (1 diff)
• include/libdodo/pcSyncProtector.h (modified) (1 diff)
• include/libdodo/pcSyncThread.h (modified) (1 diff)
• include/libdodo/pcSyncThreadEx.h (modified) (1 diff)
• src/pcSyncDataObject.cc (modified) (2 diffs)
• src/pcSyncProcess.cc (modified) (5 diffs)
• src/pcSyncThread.cc (modified) (3 diffs)

sources/examples/pc_process/test.cc

@@ -48 +48 @@
         cout << endl << memory << ": " << tools::time::now() << endl, cout.flush();
     } dodo_catch (exception::basic *e)   {
-        cout << (dodo::string)*e << e->line << endl, cout.flush();
+        cout << (dodo::string)*e << " " << e->file << ":" << e->line << endl, cout.flush();
     }
 

sources/include/libdodo/exceptionBasic.h

@@ -104 +104 @@
             MODULE_PCSYNCTHREAD,
             MODULE_PCSYNCPROCESS,
+            MODULE_PCSYNCDATAOBJECT,
             MODULE_PCNOTIFICATIONTHREAD,
             MODULE_GRAPHICSIMAGE,

sources/include/libdodo/pc.h

@@ -40 +40 @@
 #include <libdodo/pcExecutionSchedulerEx.h>
 #include <libdodo/pcExecutionWorkqueue.h>
+#include <libdodo/pcNotificationThread.h>
+#include <libdodo/pcNotificationThreadEx.h>
 #include <libdodo/pcSyncDataObject.h>
+#include <libdodo/pcSyncDataObjectEx.h>
 #include <libdodo/pcSyncProcess.h>
 #include <libdodo/pcSyncProcessEx.h>

sources/include/libdodo/pcNotificationThreadEx.h

@@ -39 +39 @@
         namespace notification {
             /**
-             * libdodo defined errors
-             */
-            enum threadExR {
-                THREADEX_CANNOTLOCK
-            };
-
-            /**
-             * explanations for libdodo defined errors
-             */
-#define PCNOTIFICATIONTHREADEX_CANNOTLOCK_STR      "Item is currently locked, timeout exhousted"
-
-            /**
              * IDs of functions where exception might be thrown
              */

sources/include/libdodo/pcSyncDataObject.h

@@ -75 +75 @@
                      * @param timeout defines wait timeout for unlock in microseconds
                      * @note if timeout is 0 it will wait infinitely
+                     * raises an exception if lock was not acquired within given timeout
                      */
                     virtual void *acquire(unsigned long timeout = 0);

sources/include/libdodo/pcSyncProcess.h

@@ -71 +71 @@
                 /**
                  * lock
+                 * @return false if lock was not acquired within given timeout
                  * @param timeout defines wait timeout for unlock in microseconds
                  * @note if timeout is 0 it will wait infinitely
                  */
-                virtual void acquire(unsigned long timeout = 0);
+                virtual bool acquire(unsigned long timeout = 0);
 
                 /**

sources/include/libdodo/pcSyncProcessEx.h

@@ -39 +39 @@
         namespace sync {
             /**
-             * libdodo defined errors
-             */
-            enum processExR {
-                PROCESSEX_CANNOTLOCK,
-            };
-
-            /**
-             * explanations for libdodo defined errors
-             */
-#define PCSYNCPROCESSEX_CANNOTLOCK_STR      "Item is currently locked, timeout exhousted"
-
-            /**
              * IDs of functions where exception might be thrown
              */

sources/include/libdodo/pcSyncProtector.h

@@ -50 +50 @@
                 /**
                  * lock
+                 * @return false if lock was not acquired within given timeout
                  * @param timeout defines wait timeout for unlock in microseconds
                  * @note if timeout is 0 it will wait infinitely
                  */
-                virtual void acquire(unsigned long timeout) = 0;
+                virtual bool acquire(unsigned long timeout) = 0;
 
                 /**

sources/include/libdodo/pcSyncThread.h

@@ -71 +71 @@
                 /**
                  * lock
+                 * @return false if lock was not acquired within given timeout
                  * @param timeout defines wait timeout for unlock in microseconds
                  * @note if timeout is 0 it will wait infinitely
                  */
-                virtual void acquire(unsigned long timeout = 0);
+                virtual bool acquire(unsigned long timeout = 0);
 
                 /**

sources/include/libdodo/pcSyncThreadEx.h

@@ -39 +39 @@
         namespace sync {
             /**
-             * libdodo defined errors
-             */
-            enum threadExR {
-                THREADEX_CANNOTLOCK
-            };
-
-            /**
-             * explanations for libdodo defined errors
-             */
-#define PCSYNCTHREADEX_CANNOTLOCK_STR      "Item is currently locked, timeout exhousted"
-
-            /**
              * IDs of functions where exception might be thrown
              */

sources/src/pcSyncDataObject.cc

@@ -31 +31 @@
 
 #include <libdodo/pcSyncDataObject.h>
+#include <libdodo/pcSyncDataObjectEx.h>
 #include <libdodo/pcSyncProtector.h>
 #include <libdodo/pcSyncStack.h>
@@ -72 +73 @@
 object::acquire(unsigned long timeout)
 {
-    lock.acquire(timeout);
+    if (!lock.acquire(timeout))
+        dodo_throw exception::basic(exception::MODULE_PCSYNCDATAOBJECT, DATAOBJECTEX_ACQUIRE, exception::ERRNO_LIBDODO, DATAOBJECTEX_CANNOTLOCK, PCSYNCDATAOBJECTEX_CANNOTLOCK_STR, __LINE__, __FILE__);
+
     return data;
 }

sources/src/pcSyncProcess.cc

@@ -213 +213 @@
 //-------------------------------------------------------------------
 
-void
+bool
 process::acquire(unsigned long microseconds)
 {
@@ -221 +221 @@
         ++recursive;
 
-        return;
+        return true;
     }
 
@@ -235 +235 @@
         if (semtimedop(lock->keeper, lock->operations, 1, &ts) != 0) {
             if (errno == EAGAIN)
-                dodo_throw exception::basic(exception::MODULE_PCSYNCPROCESS, PROCESSEX_ACQUIRE, exception::ERRNO_LIBDODO, PROCESSEX_CANNOTLOCK, PCSYNCPROCESSEX_CANNOTLOCK_STR, __LINE__, __FILE__);
+                return false;
             else
                 dodo_throw exception::basic(exception::MODULE_PCSYNCPROCESS, PROCESSEX_ACQUIRE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__);
@@ -258 +258 @@
         if (sem_timedwait(lock->keeper, &ts) != 0) {
             if (errno == ETIMEDOUT)
-                dodo_throw exception::basic(exception::MODULE_PCSYNCPROCESS, PROCESSEX_ACQUIRE, exception::ERRNO_LIBDODO, PROCESSEX_CANNOTLOCK, PCSYNCPROCESSEX_CANNOTLOCK_STR, __LINE__, __FILE__);
+                return false;
             else
                 dodo_throw exception::basic(exception::MODULE_PCSYNCPROCESS, PROCESSEX_ACQUIRE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__);
@@ -267 +267 @@
     current = pid;
     recursive = 0;
+
+    return true;
 }
 

sources/src/pcSyncThread.cc

@@ -105 +105 @@
 //-------------------------------------------------------------------
 
-void
+bool
 thread::acquire(unsigned long microseconds)
 {
@@ -128 +128 @@
         if (errno != 0) {
             if (errno == ETIMEDOUT)
-                dodo_throw exception::basic(exception::MODULE_PCSYNCTHREAD, THREADEX_ACQUIRE, exception::ERRNO_ERRNO, THREADEX_CANNOTLOCK, PCSYNCTHREADEX_CANNOTLOCK_STR, __LINE__, __FILE__);
+                return false;
             else
                 dodo_throw exception::basic(exception::MODULE_PCSYNCTHREAD, THREADEX_ACQUIRE, exception::ERRNO_ERRNO, errno, strerror(errno), __LINE__, __FILE__);
@@ -134 +134 @@
     }
 #endif
+
+    return true;
 }