autogenerated

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

diff --git a/src/dynar_unit.c b/src/dynar_unit.c
index d7ecb19..735921c 100644 (file)
--- a/src/dynar_unit.c
+++ b/src/dynar_unit.c
@@ -8,14 +8,14 @@
 /* GENERATED FILE, DO NOT EDIT */
 /*******************************/
 
-# 606 "xbt/dynar.c" 
+# 709 "xbt/dynar.c" 
 
 #define NB_ELEM 5000
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
 XBT_LOG_DEFAULT_CATEGORY(xbt_dyn);
 
-XBT_TEST_UNIT("int",test_dynar_int,"Dyars of integers") {
+XBT_TEST_UNIT("int",test_dynar_int,"Dynars of integers") {
    /* Vars_decl [doxygen cruft] */
    xbt_dynar_t d;
    int i,cpt,cursor;
@@ -158,8 +158,10 @@ XBT_TEST_UNIT("int",test_dynar_int,"Dyars of integers") {
    xbt_dynar_free(&d);
    xbt_dynar_free(&d);
 }
-
-XBT_TEST_UNIT("double",test_dynar_double,"Dyars of doubles") {
+/*******************************************************************************/
+/*******************************************************************************/
+/*******************************************************************************/
+XBT_TEST_UNIT("double",test_dynar_double,"Dynars of doubles") {
    xbt_dynar_t d;
    int cpt,cursor;
    double d1,d2;
@@ -276,6 +278,9 @@ static void free_string(void *d){
   free(*(void**)d);
 }
 
+/*******************************************************************************/
+/*******************************************************************************/
+/*******************************************************************************/
 XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
    xbt_dynar_t d;
    int cpt;
@@ -413,6 +418,54 @@ XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
    }
    xbt_dynar_free(&d); /* end_of_doxygen */
 }
+
+
+/*******************************************************************************/
+/*******************************************************************************/
+/*******************************************************************************/
+#include "xbt/synchro.h"
+static void pusher_f(void *a) {
+   xbt_dynar_t d=(xbt_dynar_t)a;
+   int i;
+   for (i=0; i<500; i++) {
+      xbt_dynar_push(d,&i);
+   }
+}
+static void poper_f(void *a) {
+   xbt_dynar_t d=(xbt_dynar_t)a;
+   int i;
+   int data;
+   xbt_ex_t e;
+   
+   for (i=0; i<500; i++) {
+      TRY {     
+        xbt_dynar_pop(d,&data);
+      } CATCH(e) {
+        if (e.category == bound_error) {
+           xbt_ex_free(e);
+           i--;
+        } else {
+           RETHROW;
+        }
+      }
+   }
+}
+
+   
+XBT_TEST_UNIT("synchronized int",test_dynar_sync_int,"Synchronized dynars of integers") {
+   /* Vars_decl [doxygen cruft] */
+   xbt_dynar_t d;
+   xbt_thread_t pusher,poper;
+   
+   xbt_test_add0("==== Have a pusher and a popper on the dynar");
+   d=xbt_dynar_new_sync(sizeof(int),NULL);
+   pusher = xbt_thread_create(pusher_f,d);
+   poper = xbt_thread_create(poper_f,d);
+   xbt_thread_join(pusher);
+   xbt_thread_join(poper);
+   xbt_dynar_free(&d);
+}
+
 /*******************************/
 /* GENERATED FILE, DO NOT EDIT */
 /*******************************/

diff --git a/src/simgrid_units_main.c b/src/simgrid_units_main.c
index ff18a51..0a9271f 100644 (file)
--- a/src/simgrid_units_main.c
+++ b/src/simgrid_units_main.c
@@ -24,6 +24,7 @@ extern xbt_test_unit_t _xbt_current_unit;
     void test_dynar_int(void);
     void test_dynar_double(void);
     void test_dynar_string(void);
+    void test_dynar_sync_int(void);
   /* SGU: END FILE */
 
   /* SGU: BEGIN FILE xbt/dict.c */
@@ -55,6 +56,7 @@ extern xbt_test_unit_t _xbt_current_unit;
     void test_config_use(void);
   /* SGU: END FILE */
 
+/* SGU: END PROTOTYPES */
 
 /*******************************/
 /* GENERATED FILE, DO NOT EDIT */
@@ -81,9 +83,10 @@ int main(int argc, char *argv[]) {
 
     /* SGU: BEGIN FILE xbt/dynar.c */
       suite = xbt_test_suite_by_name("dynar","Dynar data container");
-      xbt_test_suite_push(suite, "int", test_dynar_int, "Dyars of integers");
-      xbt_test_suite_push(suite, "double", test_dynar_double, "Dyars of doubles");
+      xbt_test_suite_push(suite, "int", test_dynar_int, "Dynars of integers");
+      xbt_test_suite_push(suite, "double", test_dynar_double, "Dynars of doubles");
       xbt_test_suite_push(suite, "string", test_dynar_string, "Dyars of strings");
+      xbt_test_suite_push(suite, "synchronized int", test_dynar_sync_int, "Synchronized dynars of integers");
     /* SGU: END FILE */
 
     /* SGU: BEGIN FILE xbt/dict.c */
@@ -122,6 +125,8 @@ int main(int argc, char *argv[]) {
 
   /* SGU: END SUITES DECLARATION */
       
+  xbt_init(&argc,argv);
+    
   /* Search for the tests to do */
     selection[0]='\0';
     for (i=1;i<argc;i++) {