From 3bf3909212b27d8a9453ecb35447f6b051eedf33 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 9 Mar 2007 17:01:22 +0000 Subject: [PATCH] do not use xbt_context_init but xbt_init; do not try to yield when there is only one context since it fails for whatever reason git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3236 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/xbt/context_usage.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testsuite/xbt/context_usage.c b/testsuite/xbt/context_usage.c index d216860567..edc617de08 100644 --- a/testsuite/xbt/context_usage.c +++ b/testsuite/xbt/context_usage.c @@ -2,10 +2,9 @@ #pragma hdrstop #endif +#include "xbt.h" #include "xbt/context.h" #include "xbt/fifo.h" -#include "stdlib.h" -#include "stdio.h" xbt_context_t cA = NULL; xbt_context_t cB = NULL; @@ -30,7 +29,7 @@ int fA(int argc, char** argv) print_args(argc,argv); printf("\tContext A: Yield\n"); - xbt_context_yield(); +// xbt_context_yield(); // FIXME: yielding to itself fails, no idea why xbt_fifo_push(fifo,cB); printf("\tPush context B from context A\n"); @@ -84,7 +83,7 @@ int main(int argc, char** argv) printf("XXX Test the simgrid context API\n"); printf(" If it fails, try another context backend.\n For example, to force the pthread backend, use:\n ./configure --with-context=pthread\n\n"); - xbt_context_init(); + xbt_init(&argc, argv); cA = xbt_context_new(fA, NULL, NULL, NULL, NULL, 0, NULL); cB = xbt_context_new(fB, NULL, NULL, NULL, NULL, 0, NULL); @@ -106,7 +105,7 @@ int main(int argc, char** argv) } xbt_fifo_free(fifo); - xbt_context_exit(); + xbt_exit(); cA=cB=cC=NULL; return 0; -- 2.20.1