X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f4bed3fb2576b91f23b89c4a94ed087b9ba09a2..77bbf3027c4240a2e833209a3a3f186589da8577:/teshsuite/surf/maxmin_bench/maxmin_bench.cpp diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp index dc907a9a5e..d3408b10fe 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -1,29 +1,29 @@ /* A crash few tests for the maxmin library */ -/* Copyright (c) 2004-2015. The SimGrid Team. +/* Copyright (c) 2004-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/include/surf/surf.h" -#include "surf/maxmin.h" +#include "surf/maxmin.hpp" +#include "simgrid/msg.h" #include "xbt/module.h" +#include "xbt/sysdep.h" /* time manipulation for benchmarking */ #include "xbt/xbt_os_time.h" -#include "xbt/sysdep.h" /* time manipulation for benchmarking */ #define MYRANDMAX 1000 -#include -#include -#include +#include +#include +#include double date; -int64_t seedx= 0; +int64_t seedx = 0; -static int myrand(void) { +static int myrand() { seedx=seedx * 16807 % 2147483647; - return (int32_t) seedx%1000; + return static_cast(seedx%1000); } static double float_random(double max) @@ -33,28 +33,23 @@ static double float_random(double max) static unsigned int int_random(int max) { - return (uint32_t) (((max * 1.0) * myrand()) / (MYRANDMAX + 1.0)); + return static_cast(((max * 1.0) * myrand()) / (MYRANDMAX + 1.0)); } static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limit, unsigned int pw_max_limit, float rate_no_limit, int max_share, int mode) { - lmm_system_t Sys = NULL; - lmm_constraint_t *cnst = xbt_new0(lmm_constraint_t, nb_cnst); - lmm_variable_t *var = xbt_new0(lmm_variable_t, nb_var); - int *used = xbt_new0(int, nb_cnst); - int i; - int j; - int k; - int l; - int concurrency_share; - - Sys = lmm_system_new(1); - - for (i = 0; i < nb_cnst; i++) { + lmm_constraint_t cnst[nb_cnst]; + lmm_variable_t var[nb_var]; + int used[nb_cnst]; + + lmm_system_t Sys = lmm_system_new(1); + + for (int i = 0; i < nb_cnst; i++) { cnst[i] = lmm_constraint_new(Sys, NULL, float_random(10.0)); + int l; if(rate_no_limit>float_random(1.0)) - //Look at what happens when there is no concurrency limit + //Look at what happens when there is no concurrency limit l=-1; else //Badly logarithmically random concurrency limit in [2^pw_base_limit+1,2^pw_base_limit+2^pw_max_limit] @@ -63,16 +58,16 @@ static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi lmm_constraint_concurrency_limit_set(cnst[i],l ); } - for (i = 0; i < nb_var; i++) { + for (int i = 0; i < nb_var; i++) { var[i] = lmm_variable_new(Sys, NULL, 1.0, -1.0, nb_elem); //Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases) - concurrency_share=1+int_random(max_share); + int concurrency_share = 1 + int_random(max_share); lmm_variable_concurrency_share_set(var[i],concurrency_share); - for (j = 0; j < nb_cnst; j++) + for (int j = 0; j < nb_cnst; j++) used[j] = 0; - for (j = 0; j < nb_elem; j++) { - k = int_random(nb_cnst); + for (int j = 0; j < nb_elem; j++) { + int k = int_random(nb_cnst); if (used[k]>=concurrency_share) { j--; continue; @@ -90,16 +85,16 @@ static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi if(mode==2){ fprintf(stderr,"Max concurrency:\n"); - l=0; - for (i = 0; i < nb_cnst; i++) { - j=lmm_constraint_concurrency_maximum_get(cnst[i]); - k=lmm_constraint_concurrency_limit_get(cnst[i]); + int l=0; + for (int i = 0; i < nb_cnst; i++) { + int j=lmm_constraint_concurrency_maximum_get(cnst[i]); + int k=lmm_constraint_concurrency_limit_get(cnst[i]); xbt_assert(k<0 || j<=k); if(j>l) l=j; fprintf(stderr,"(%i):%i/%i ",i,j,k); lmm_constraint_concurrency_maximum_reset(cnst[i]); - xbt_assert(!lmm_constraint_concurrency_maximum_get(cnst[i])); + xbt_assert(not lmm_constraint_concurrency_maximum_get(cnst[i])); if(i%10==9) fprintf(stderr,"\n"); } @@ -108,24 +103,23 @@ static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi lmm_print(Sys); } - for (i = 0; i < nb_var; i++) + for (int i = 0; i < nb_var; i++) lmm_variable_free(Sys, var[i]); lmm_system_free(Sys); - free(cnst); - free(var); - free(used); } unsigned int TestClasses [][4]= - //Nbcnst Nbvar Baselimit Maxlimit + //Nbcnst Nbvar Baselimit Maxlimit {{ 10 ,10 ,1 ,2 }, //small { 100 ,100 ,3 ,6 }, //medium { 2000,2000 ,5 ,8 }, //big { 20000,20000 ,7 ,10} //huge - }; + }; int main(int argc, char **argv) { + MSG_init(&argc, argv); + float rate_no_limit=0.2; float acc_date=0; float acc_date2=0; @@ -137,14 +131,14 @@ int main(int argc, char **argv) } //what class? - if(!strcmp(argv[1],"small")) - testclass=0; - else if(!strcmp(argv[1],"medium")) - testclass=1; - else if(!strcmp(argv[1],"big")) - testclass=2; - else if(!strcmp(argv[1],"huge")) - testclass=3; + if (not strcmp(argv[1], "small")) + testclass = 0; + else if (not strcmp(argv[1], "medium")) + testclass = 1; + else if (not strcmp(argv[1], "big")) + testclass = 2; + else if (not strcmp(argv[1], "huge")) + testclass = 3; else { fprintf(stderr, "Unknown class \"%s\", aborting!\n",argv[1]); return -2; @@ -173,15 +167,13 @@ int main(int argc, char **argv) unsigned int nb_var= TestClasses[testclass][1]; unsigned int pw_base_limit= TestClasses[testclass][2]; unsigned int pw_max_limit= TestClasses[testclass][3]; - unsigned int max_share=2; //1<<(pw_base_limit/2+1); + unsigned int max_share = 2; // 1<<(pw_base_limit/2+1) //If you want to test concurrency, you need nb_elem >> 2^pw_base_limit: unsigned int nb_elem= (1<