Changeset 1400:aa7829bd0b9c

Timestamp:

11/07/09 21:50:59 (2 years ago)

Author:

niam

Branch:

default

Message:

{issue #45[resolved]} saved uncought exception thrown by thread routine for later examination

Location:

src

Files:

• examples/pc_thread/test.cc (modified) (2 diffs)
• include/libdodo/exceptionBasic.h (modified) (2 diffs)
• include/libdodo/pcExecutionThread.h (modified) (2 diffs)
• src/pcExecutionThread.cc (modified) (7 diffs)

src/examples/pc_thread/test.cc

@@ -31 +31 @@
         cout.flush();
     } catch (dodo::exception::basic &ex)   {
-        cout << (dodoString)ex << ex.line << endl;
+        cout << (dodoString)ex << "\t" << ex.line << "\t" << ex.file << endl;
     }
+
+    // throwing exception
+    tools::os::os::setWorkingDir("./dir/");
 
     return 0;
@@ -66 +69 @@
         manager.wait();
 
+        for (int i = 0; i < amount; ++i) {
+            dodo::exception::basic *ex = manager.job(pos[i])->exception();
+            if (ex) {
+                cout << "Thread " << i << ":\t" << (dodoString)*ex << "\t" << ex->line << "\t" << ex->file << endl;
+            }
+        }
+
         delete data;
     } catch (dodo::exception::basic &ex)   {
-        cout << (dodoString)ex << endl;
+        cout << (dodoString)ex << "\t" << ex.line << "\t" << ex.file << endl;
     }
 

src/include/libdodo/exceptionBasic.h

@@ -143 +143 @@
           public:
 
-#ifdef DL_EXT
-            /**
-             * @struct __module__
-             * @brief is returned from initModule in the library
-             */
-            struct __module__ {
-                char name[64];                              ///< name of the library
-                char discription[256];                      ///< discription of the library
-                char hook[64];                              ///< name of the function in module that will be as a hook
-                char cookie[32];                            ///< cookie that would be passed to deinitModule
-                bool modules[MODULE_ENUMSIZE];              ///< for what modules handler should be set, @see exception::moduleEnum
-            };
-
-            /**
-             * @typedef initModule
-             * @brief defines type of init function for library
-             * @param data defines user data
-             * @note name in the library must be initExceptionBasicModule
-             */
-            typedef __module__ (*initModule)(void *data);
-
-            /**
-             * @typedef deinitModule
-             * @brief defines type of deinit function for library
-             * @param cookie defines cookie data returned from initModule
-             * @note name in the library must be deinitExceptionBasicModule
-             */
-            typedef void (*deinitModule)(char cookie[32]);
-#endif
-
-            /**
-             * @typedef handler
-             * @brief defines type of hook function
-             * @param module defines module where exception occured, @see exception::moduleEnum
-             * @param ex defines pointer to basic object with exception information
-             * @param data defines user data
-             */
-            typedef void (*handler)(int module, basic *ex, void *data);
-
             /**
              * constructor
@@ -207 +168 @@
             ~basic() throw ();
 
+#ifdef DL_EXT
+            /**
+             * @struct __module__
+             * @brief is returned from initModule in the library
+             */
+            struct __module__ {
+                char name[64];                              ///< name of the library
+                char discription[256];                      ///< discription of the library
+                char hook[64];                              ///< name of the function in module that will be as a hook
+                char cookie[32];                            ///< cookie that would be passed to deinitModule
+                bool modules[MODULE_ENUMSIZE];              ///< for what modules handler should be set, @see exception::moduleEnum
+            };
+
+            /**
+             * @typedef initModule
+             * @brief defines type of init function for library
+             * @param data defines user data
+             * @note name in the library must be initExceptionBasicModule
+             */
+            typedef __module__ (*initModule)(void *data);
+
+            /**
+             * @typedef deinitModule
+             * @brief defines type of deinit function for library
+             * @param cookie defines cookie data returned from initModule
+             * @note name in the library must be deinitExceptionBasicModule
+             */
+            typedef void (*deinitModule)(char cookie[32]);
+#endif
+
+            /**
+             * @typedef handler
+             * @brief defines type of hook function
+             * @param module defines module where exception occured, @see exception::moduleEnum
+             * @param ex defines pointer to basic object with exception information
+             * @param data defines user data
+             */
+            typedef void (*handler)(int module, basic *ex, void *data);
+
             /**
              * @return error string

src/include/libdodo/pcExecutionThread.h

@@ -37 +37 @@
 
 namespace dodo {
+    namespace exception {
+        class basic;
+    };
+
     namespace pc {
         namespace execution {
@@ -105 +109 @@
                 virtual bool isRunning() const;
 
+                /**
+                 * @return uncought exception thrown by thread routine
+                 */
+                virtual exception::basic *exception();
+
 #ifdef DL_EXT
                 /**

src/src/pcExecutionThread.cc

@@ -41 +41 @@
 
 namespace dodo {
+    namespace exception {
+        class basic;
+    };
+
     namespace pc {
         namespace execution {
@@ -57 +61 @@
                     executed(false),
                     joined(false),
-                    status(0)
+                    status(0),
+                    ex(NULL)
 #ifdef DL_EXT
                     ,
@@ -79 +84 @@
 #endif
 
+                void           *func;               ///< function to execute
                 void           *data;               ///< thread data
+
                 bool           executed;            ///< true if thread is running
                 bool           joined;              ///< true if the thread was joined
                 int            status;              ///< thread exit status
                 bool           detached;            ///< true if thread is detached
-                void           *func;               ///< function to execute
                 short          action;              ///< action on object destruction[@see onDestructionEnum]
+
+                exception::basic *ex; ///< uncought exception thrown by thread routine
+
 #ifdef DL_EXT
                 void           *handle;             ///< handle to library
@@ -100 +109 @@
 #include <libdodo/pcExecutionThreadEx.h>
 #include <libdodo/types.h>
+#include <libdodo/exceptionBasic.h>
 
 using namespace dodo::pc::execution;
@@ -109 +119 @@
     __thread__ *ti = (__thread__ *)data;
 
-    ti->status = ((execution::routine)ti->func)(ti->data);
+    try {
+        delete ti->ex;
+        ti->ex = NULL;
+
+        ti->status = ((execution::routine)ti->func)(ti->data);
+    } catch (exception::basic &ex) {
+        ti->ex = new exception::basic(ex);
+        ti->status = 0;
+    }
 
     return NULL;
@@ -283 +301 @@
     }
 
+    delete handle->ex;
+
     delete handle;
 }
@@ -408 +428 @@
 
 //-------------------------------------------------------------------
+
+dodo::exception::basic *
+thread::exception()
+{
+    return handle->ex;
+}
+
+//-------------------------------------------------------------------