Trans: Fixed a couple of bugs in the previous commit

diff --git a/ucw/trans.c b/ucw/trans.c
index a8de27cdcc5f7ea82c499e56c82eb87d38717009..5f917fd219eea7ee2635968ca093fa137cb90c12 100644 (file)
--- a/ucw/trans.c
+++ b/ucw/trans.c
@@ -126,14 +126,15 @@ trans_fold(void)
 }
 
 void
-trans_caught(struct exception *x)
+trans_caught(void)
 {
   // Exception has been finally caught. Roll back the current transaction,
   // including all sub-transactions that have been folded to it during
   // propagation.
-  DBG("... exception %p caught", x);
   struct trans *t = trans_get_current();
-  ASSERT(t->thrown_exc == x);
+  struct exception *x = t->thrown_exc;
+  ASSERT(x);
+  DBG("... exception %p caught", x);
   t->thrown_exc = NULL;
   trans_rollback();
 }
@@ -170,7 +171,7 @@ trans_throw_exc(struct exception *x)
 
   // If we are already handling an exception (i.e., throw from a catch handler),
   // fold the current transaction into its parent.
-  if (t->thrown_exc)
+  while (t->thrown_exc)
     {
       if (!t->prev_trans)
        die("%s", x->msg);
@@ -240,6 +241,18 @@ int main(void)
        {
          printf("Inner catch: %s\n", x->msg);
          trans_dump();
+         TRANS_TRY
+           {
+             res_malloc(256, NULL);
+             trans_throw("ucw.test.nested", "nest", "Something is wrong recursively");
+           }
+         TRANS_CATCH(y)
+           {
+             printf("Yet another layer: %s\n", y->msg);
+             trans_dump();
+             // trans_throw_exc(y);
+           }
+         TRANS_END;
          trans_throw("ucw.test2", "out", "Error: %s", x->msg);
        }
       TRANS_END;

diff --git a/ucw/trans.h b/ucw/trans.h
index 85b42c2a4f02f559e634b29e74c66bcf1576f796..608581fade8a96b1f6200a8e28df9aa569aeb3af 100644 (file)
--- a/ucw/trans.h
+++ b/ucw/trans.h
@@ -49,7 +49,7 @@ struct exception {
 void trans_throw_exc(struct exception *x) NONRET;
 void trans_throw(const char *id, void *object, const char *fmt, ...) FORMAT_CHECK(printf,3,4) NONRET;
 void trans_vthrow(const char *id, void *object, const char *fmt, va_list args) NONRET;
-void trans_caught(struct exception *x);
+void trans_caught(void);
 
 struct exception *trans_current_exc(void);
 
@@ -66,7 +66,7 @@ struct exception *trans_current_exc(void);
       struct exception *x UNUSED = trans_current_exc();
 
 #define TRANS_END                              \
-      trans_caught(x);                         \
+      trans_caught();                          \
     }                                          \
   } while(0)