s/sg/xbt/ ; s/code/category/

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1536 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 3067129..8e34e72 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -36,7 +36,7 @@
 
 /* default __ex_ctx callback function */
 ex_ctx_t *__xbt_ex_ctx_default(void) {
-    static ex_ctx_t ctx = SG_CTX_INITIALIZER;
+    static ex_ctx_t ctx = XBT_CTX_INITIALIZER;
 
     return &ctx;
 }
@@ -48,7 +48,7 @@ void __xbt_ex_terminate_default(ex_t *e) {
             "** SimGrid: UNCAUGHT EXCEPTION:\n"
            "** (%d/%d) %s\n"
             "** Thrown by %s%s%s at %s:%d:%s\n",
-           e->code, e->value, e->msg,
+           e->category, e->value, e->msg,
            e->procname, (e->host?"@":""),(e->host?e->host:""),
            e->file,e->line,e->func);
     abort();

diff --git a/testsuite/xbt/ex_test.c b/testsuite/xbt/ex_test.c
index 66b63f7..7302ad3 100644 (file)
--- a/testsuite/xbt/ex_test.c
+++ b/testsuite/xbt/ex_test.c
@@ -43,25 +43,25 @@ TS_TEST(test_controlflow)
 
     ts_test_check(TS_CTX, "basic nested control flow");
     n = 1;
-    sg_try {
+    xbt_try {
         if (n != 1)
             ts_test_fail(TS_CTX, "M1: n=%d (!= 1)", n);
         n++;
-        sg_try {
+        xbt_try {
             if (n != 2)
                 ts_test_fail(TS_CTX, "M2: n=%d (!= 2)", n);
             n++;
-            sg_throw(0,0,"something");
+            xbt_throw(0,0,"something");
         }
-        sg_catch (ex) {
+        xbt_catch (ex) {
             if (n != 3)
                 ts_test_fail(TS_CTX, "M3: n=%d (!= 1)", n);
             n++;
-            sg_rethrow;
+            xbt_rethrow;
         }
         ts_test_fail(TS_CTX, "MX: n=%d (expected: not reached)", n);
     }
-    sg_catch (ex) {
+    xbt_catch (ex) {
         if (n != 4)
             ts_test_fail(TS_CTX, "M4: n=%d (!= 4)", n);
         n++;
@@ -74,13 +74,13 @@ TS_TEST(test_value)
 {
     ex_t ex;
 
-    sg_try {
-        sg_throw(1, 2, "toto");
+    xbt_try {
+        xbt_throw(1, 2, "toto");
     }
-    sg_catch (ex) {
+    xbt_catch (ex) {
         ts_test_check(TS_CTX, "exception value passing");
-        if (ex.code != 1)
-            ts_test_fail(TS_CTX, "code=%d (!= 1)", ex.code);
+        if (ex.category != 1)
+            ts_test_fail(TS_CTX, "category=%d (!= 1)", ex.category);
         if (ex.value != 2)
             ts_test_fail(TS_CTX, "value=%d (!= 2)", ex.value);
         if (strcmp(ex.msg,"toto"))
@@ -95,12 +95,12 @@ TS_TEST(test_variables)
     volatile int v1, v2;
 
     r1 = r2 = v1 = v2 = 1234;
-    sg_try {
+    xbt_try {
         r2 = 5678;
         v2 = 5678;
-        sg_throw(0, 0, 0);
+        xbt_throw(0, 0, 0);
     }
-    sg_catch (ex) {
+    xbt_catch (ex) {
         ts_test_check(TS_CTX, "variable preservation");
         if (r1 != 1234)
             ts_test_fail(TS_CTX, "r1=%d (!= 1234)", r1);
@@ -120,26 +120,26 @@ TS_TEST(test_defer)
     volatile int i3 = 0;
 
     ts_test_check(TS_CTX, "exception deferring");
-    if (sg_deferring)
+    if (xbt_deferring)
         ts_test_fail(TS_CTX, "unexpected deferring scope");
-    sg_try {
-        sg_defer {
-            if (!sg_deferring)
+    xbt_try {
+        xbt_defer {
+            if (!xbt_deferring)
                 ts_test_fail(TS_CTX, "unexpected non-deferring scope");
-            sg_defer {
+            xbt_defer {
                 i1 = 1;
-                sg_throw(4711, 0, NULL);
+                xbt_throw(4711, 0, NULL);
                 i2 = 2;
-                sg_throw(0, 0, NULL);
+                xbt_throw(0, 0, NULL);
                 i3 = 3;
-                sg_throw(0, 0, NULL);
+                xbt_throw(0, 0, NULL);
             }
-            sg_throw(0, 0, 0);
+            xbt_throw(0, 0, 0);
         }
         ts_test_fail(TS_CTX, "unexpected not occurred deferred throwing");
     }
-    sg_catch (ex) {
-        if (ex.code != 4711)
+    xbt_catch (ex) {
+        if (ex.category != 4711)
             ts_test_fail(TS_CTX, "caught exception with value %d, expected 4711", ex.value);
     }
     if (i1 != 1)
@@ -155,27 +155,27 @@ TS_TEST(test_shield)
     ex_t ex;
 
     ts_test_check(TS_CTX, "exception shielding");
-    if (sg_shielding)
+    if (xbt_shielding)
         ts_test_fail(TS_CTX, "unexpected shielding scope");
-    if (sg_catching)
+    if (xbt_catching)
         ts_test_fail(TS_CTX, "unexpected catching scope");
-    sg_try {
-        sg_shield {
-            if (!sg_shielding)
+    xbt_try {
+        xbt_shield {
+            if (!xbt_shielding)
                 ts_test_fail(TS_CTX, "unexpected non-shielding scope");
-            sg_throw(0, 0, 0);
+            xbt_throw(0, 0, 0);
         }
-        if (sg_shielding)
+        if (xbt_shielding)
             ts_test_fail(TS_CTX, "unexpected shielding scope");
-        if (!sg_catching)
+        if (!xbt_catching)
             ts_test_fail(TS_CTX, "unexpected non-catching scope");
     }
-    sg_catch (ex) {
+    xbt_catch (ex) {
         ts_test_fail(TS_CTX, "unexpected exception catched");
-        if (sg_catching)
+        if (xbt_catching)
             ts_test_fail(TS_CTX, "unexpected catching scope");
     }
-    if (sg_catching)
+    if (xbt_catching)
         ts_test_fail(TS_CTX, "unexpected catching scope");
 }
 
@@ -189,19 +189,19 @@ TS_TEST(test_cleanup)
 
     v1 = 1234;
     c = 0;
-    sg_try {
+    xbt_try {
         v1 = 5678;
-        sg_throw(1, 2, "blah");
+        xbt_throw(1, 2, "blah");
     }
-    sg_cleanup {
+    xbt_cleanup {
         if (v1 != 5678)
             ts_test_fail(TS_CTX, "v1 = %d (!= 5678)", v1);
         c = 1;
     }
-    sg_catch (ex) {
+    xbt_catch (ex) {
         if (v1 != 5678)
             ts_test_fail(TS_CTX, "v1 = %d (!= 5678)", v1);
-        if (!(ex.code == 1 && ex.value == 2 && !strcmp(ex.msg,"blah")))
+        if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg,"blah")))
             ts_test_fail(TS_CTX, "unexpected exception contents");
     }
     if (!c)