From 90fc1acb85ecd1d429868d7f957c2be384bbc455 Mon Sep 17 00:00:00 2001 From: alegrand Date: Fri, 20 Jul 2007 16:56:26 +0000 Subject: [PATCH] Keeping interfaces clean (avoid loading maxmin_private) Cosmetics ("\n" are useless... mmh no, they're forbiden! ;) Shut lagrange's warning up from the tesh file. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3885 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/surf/simeng_usage.c | 64 ++++++++++++++++---------------- testsuite/surf/simeng_usage.tesh | 40 +++----------------- 2 files changed, 37 insertions(+), 67 deletions(-) diff --git a/testsuite/surf/simeng_usage.c b/testsuite/surf/simeng_usage.c index 9ac16734e7..17cc29e7ba 100644 --- a/testsuite/surf/simeng_usage.c +++ b/testsuite/surf/simeng_usage.c @@ -13,12 +13,13 @@ #include "xbt/sysdep.h" #include "surf/maxmin.h" -#include "surf/maxmin_private.h" - #include "xbt/log.h" #include "xbt/module.h" + + + XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,"Messages specific for surf example"); #define PRINT_VAR(var) DEBUG1(#var " = %g",lmm_variable_getvalue(var)); @@ -73,7 +74,6 @@ void test1(method_t method) lmm_update_variable_latency(Sys,R_2, 1.0); lmm_update_variable_latency(Sys,R_3, 1.0); - lmm_expand(Sys, L1, R_1_2_3, 1.0); lmm_expand(Sys, L2, R_1_2_3, 1.0); lmm_expand(Sys, L3, R_1_2_3, 1.0); @@ -163,11 +163,11 @@ void test2(method_t method) PRINT_VAR(T1); PRINT_VAR(T2); - DEBUG0("\n"); - lmm_system_free(Sys); } + + void test3(method_t method); void test3(method_t method) { @@ -360,61 +360,61 @@ int main(int argc, char **argv) xbt_init(&argc,argv); - DEBUG0("**************************** \n"); - DEBUG0("***** ***** \n"); - DEBUG0("***** TEST 1 ***** \n"); - DEBUG0("***** ***** \n"); - DEBUG0("**************************** \n"); + DEBUG0("**************************** "); + DEBUG0("***** ***** "); + DEBUG0("***** TEST 1 ***** "); + DEBUG0("***** ***** "); + DEBUG0("**************************** "); - DEBUG0("***** Test 1 (Max-Min) ***** \n"); + DEBUG0("***** Test 1 (Max-Min) ***** "); test1(MAXMIN); #ifdef HAVE_SDP - DEBUG0("***** Test 1 (SDP) ***** \n"); + DEBUG0("***** Test 1 (SDP) ***** "); test1(SDP); #endif - DEBUG0("***** Test 1 (Lagrange - Vegas) ***** \n"); + DEBUG0("***** Test 1 (Lagrange - Vegas) ***** "); test1(LAGRANGE_VEGAS); - DEBUG0("***** Test 1 (Lagrange - Reno) ***** \n"); + DEBUG0("***** Test 1 (Lagrange - Reno) ***** "); test1(LAGRANGE_RENO); - DEBUG0("**************************** \n"); - DEBUG0("***** ***** \n"); - DEBUG0("***** TEST 2 ***** \n"); - DEBUG0("***** ***** \n"); - DEBUG0("**************************** \n"); + DEBUG0("**************************** "); + DEBUG0("***** ***** "); + DEBUG0("***** TEST 2 ***** "); + DEBUG0("***** ***** "); + DEBUG0("**************************** "); - DEBUG0("***** Test 2 (Max-Min) ***** \n"); + DEBUG0("***** Test 2 (Max-Min) ***** "); test2(MAXMIN); #ifdef HAVE_SDP - DEBUG0("***** Test 2 (SDP) ***** \n"); + DEBUG0("***** Test 2 (SDP) ***** "); test2(SDP); #endif - DEBUG0("***** Test 2 (Lagrange - Vegas) ***** \n"); + DEBUG0("***** Test 2 (Lagrange - Vegas) ***** "); test2(LAGRANGE_VEGAS); - DEBUG0("***** Test 2 (Lagrange - Reno) ***** \n"); + DEBUG0("***** Test 2 (Lagrange - Reno) ***** "); test2(LAGRANGE_RENO); - DEBUG0("**************************** \n"); - DEBUG0("***** ***** \n"); - DEBUG0("***** TEST 3 ***** \n"); - DEBUG0("***** ***** \n"); - DEBUG0("**************************** \n"); + DEBUG0("**************************** "); + DEBUG0("***** ***** "); + DEBUG0("***** TEST 3 ***** "); + DEBUG0("***** ***** "); + DEBUG0("**************************** "); - DEBUG0("***** Test 3 (Max-Min) ***** \n"); + DEBUG0("***** Test 3 (Max-Min) ***** "); test3(MAXMIN); #ifdef HAVE_SDP - DEBUG0("***** Test 3 (SDP) ***** \n"); + DEBUG0("***** Test 3 (SDP) ***** "); test3(SDP); #endif - DEBUG0("***** Test 3 (Lagrange - Vegas) ***** \n"); + DEBUG0("***** Test 3 (Lagrange - Vegas) ***** "); test3(LAGRANGE_VEGAS); - DEBUG0("***** Test 3 (Lagrange - Reno) ***** \n"); + DEBUG0("***** Test 3 (Lagrange - Reno) ***** "); test3(LAGRANGE_RENO); return 0; diff --git a/testsuite/surf/simeng_usage.tesh b/testsuite/surf/simeng_usage.tesh index c42c05da5d..600ade460c 100644 --- a/testsuite/surf/simeng_usage.tesh +++ b/testsuite/surf/simeng_usage.tesh @@ -2,76 +2,48 @@ p Testing the surf network maxmin fairness model -$ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug +$ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug --log=surf_lagrange.thres:critical > [0.000000] xbt/log.c:607: [surf_test/DEBUG] Apply settings for category 'surf_test': set threshold to DEBUG (=2) > [0.000000] surf/simeng_usage.c:363: [surf_test/DEBUG] **************************** -> > [0.000000] surf/simeng_usage.c:364: [surf_test/DEBUG] ***** ***** -> > [0.000000] surf/simeng_usage.c:365: [surf_test/DEBUG] ***** TEST 1 ***** -> > [0.000000] surf/simeng_usage.c:366: [surf_test/DEBUG] ***** ***** -> > [0.000000] surf/simeng_usage.c:367: [surf_test/DEBUG] **************************** -> > [0.000000] surf/simeng_usage.c:370: [surf_test/DEBUG] ***** Test 1 (Max-Min) ***** -> > [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0.5 > [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 0.5 > [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 9.5 > [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 0.5 > [0.000000] surf/simeng_usage.c:376: [surf_test/DEBUG] ***** Test 1 (Lagrange - Vegas) ***** -> > [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0.325765 > [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 0.674235 > [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 9.67423 > [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 0.674235 > [0.000000] surf/simeng_usage.c:378: [surf_test/DEBUG] ***** Test 1 (Lagrange - Reno) ***** -> -> [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0.15045 -> [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 0.84955 -> [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 9.84955 -> [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 0.84955 +> [0.000000] surf/simeng_usage.c:104: [surf_test/DEBUG] R_1_2_3 = 0 +> [0.000000] surf/simeng_usage.c:105: [surf_test/DEBUG] R_1 = 1 +> [0.000000] surf/simeng_usage.c:106: [surf_test/DEBUG] R_2 = 10 +> [0.000000] surf/simeng_usage.c:107: [surf_test/DEBUG] R_3 = 1 > [0.000000] surf/simeng_usage.c:382: [surf_test/DEBUG] **************************** -> > [0.000000] surf/simeng_usage.c:383: [surf_test/DEBUG] ***** ***** -> > [0.000000] surf/simeng_usage.c:384: [surf_test/DEBUG] ***** TEST 2 ***** -> > [0.000000] surf/simeng_usage.c:385: [surf_test/DEBUG] ***** ***** -> > [0.000000] surf/simeng_usage.c:386: [surf_test/DEBUG] **************************** -> > [0.000000] surf/simeng_usage.c:389: [surf_test/DEBUG] ***** Test 2 (Max-Min) ***** -> > [0.000000] surf/simeng_usage.c:163: [surf_test/DEBUG] T1 = 200 > [0.000000] surf/simeng_usage.c:164: [surf_test/DEBUG] T2 = 100 -> [0.000000] surf/simeng_usage.c:166: [surf_test/DEBUG] -> > [0.000000] surf/simeng_usage.c:395: [surf_test/DEBUG] ***** Test 2 (Lagrange - Vegas) ***** -> > [0.000000] surf/simeng_usage.c:163: [surf_test/DEBUG] T1 = 200 > [0.000000] surf/simeng_usage.c:164: [surf_test/DEBUG] T2 = 100 -> [0.000000] surf/simeng_usage.c:166: [surf_test/DEBUG] -> > [0.000000] surf/simeng_usage.c:397: [surf_test/DEBUG] ***** Test 2 (Lagrange - Reno) ***** -> > [0.000000] surf/simeng_usage.c:163: [surf_test/DEBUG] T1 = 200 > [0.000000] surf/simeng_usage.c:164: [surf_test/DEBUG] T2 = 100 -> [0.000000] surf/simeng_usage.c:166: [surf_test/DEBUG] -> > [0.000000] surf/simeng_usage.c:402: [surf_test/DEBUG] **************************** -> > [0.000000] surf/simeng_usage.c:403: [surf_test/DEBUG] ***** ***** -> > [0.000000] surf/simeng_usage.c:404: [surf_test/DEBUG] ***** TEST 3 ***** -> > [0.000000] surf/simeng_usage.c:405: [surf_test/DEBUG] ***** ***** -> > [0.000000] surf/simeng_usage.c:406: [surf_test/DEBUG] **************************** -> > [0.000000] surf/simeng_usage.c:409: [surf_test/DEBUG] ***** Test 3 (Max-Min) ***** -> > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.33333 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 2 @@ -89,7 +61,6 @@ $ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1 > [0.000000] surf/simeng_usage.c:415: [surf_test/DEBUG] ***** Test 3 (Lagrange - Vegas) ***** -> > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.61019 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.33333 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 2.65418 @@ -107,7 +78,6 @@ $ $SG_TEST_EXENV surf/simeng_usage$EXEEXT --log=surf_test.thres:debug > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 1 > [0.000000] surf/simeng_usage.c:417: [surf_test/DEBUG] ***** Test 3 (Lagrange - Reno) ***** -> > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.27888 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 3.33333 > [0.000000] surf/simeng_usage.c:345: [surf_test/DEBUG] tmp_var[j] = 2.24092 -- 2.20.1