-/* A crash few tests for the maxmin library */
+/* A few crash tests for the maxmin library */
-/* Copyright (c) 2004-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2020. 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 "surf/maxmin.h"
-#include "simgrid/msg.h"
+#include "src/kernel/lmm/maxmin.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "xbt/module.h"
+#include "xbt/random.hpp"
#include "xbt/sysdep.h" /* time manipulation for benchmarking */
#include "xbt/xbt_os_time.h"
-#define MYRANDMAX 1000
-
#include <cstdint>
#include <cstdio>
#include <cstdlib>
double date;
-int64_t seedx = 0;
-
-static int myrand() {
- seedx=seedx * 16807 % 2147483647;
- return static_cast<int32_t>(seedx%1000);
-}
-
-static double float_random(double max)
-{
- return ((max * myrand()) / (MYRANDMAX + 1.0));
-}
-
-static unsigned int int_random(int max)
-{
- return static_cast<uint32_t>(((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_constraint_t cnst[nb_cnst];
- lmm_variable_t var[nb_var];
- int used[nb_cnst];
+ simgrid::kernel::lmm::Constraint** cnst = new simgrid::kernel::lmm::Constraint*[nb_cnst];
+ simgrid::kernel::lmm::Variable** var = new simgrid::kernel::lmm::Variable*[nb_var];
+ int* used = new int[nb_cnst];
- lmm_system_t Sys = lmm_system_new(1);
+ /* We cannot activate the selective update as we pass nullptr as an Action when creating the variables */
+ simgrid::kernel::lmm::System* Sys = new simgrid::kernel::lmm::System(false);
for (int i = 0; i < nb_cnst; i++) {
- cnst[i] = lmm_constraint_new(Sys, NULL, float_random(10.0));
+ cnst[i] = Sys->constraint_new(NULL, simgrid::xbt::random::uniform_real(0.0, 10.0));
int l;
- if(rate_no_limit>float_random(1.0))
- //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]
- l=(1<<pw_base_limit)+(1<<int_random(pw_max_limit));
-
- lmm_constraint_concurrency_limit_set(cnst[i],l );
+ if (rate_no_limit > simgrid::xbt::random::uniform_real(0.0, 1.0)) {
+ // 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]
+ l = (1 << pw_base_limit) + (1 << simgrid::xbt::random::uniform_int(0, pw_max_limit - 1));
+ }
+ cnst[i]->set_concurrency_limit(l);
}
for (int i = 0; i < nb_var; i++) {
- var[i] = lmm_variable_new(Sys, NULL, 1.0, -1.0, nb_elem);
+ var[i] = Sys->variable_new(NULL, 1.0, -1.0, nb_elem);
//Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases)
- int concurrency_share = 1 + int_random(max_share);
- lmm_variable_concurrency_share_set(var[i],concurrency_share);
+ int concurrency_share = 1 + simgrid::xbt::random::uniform_int(0, max_share - 1);
+ var[i]->set_concurrency_share(concurrency_share);
for (int j = 0; j < nb_cnst; j++)
used[j] = 0;
for (int j = 0; j < nb_elem; j++) {
- int k = int_random(nb_cnst);
+ int k = simgrid::xbt::random::uniform_int(0, nb_cnst - 1);
if (used[k]>=concurrency_share) {
j--;
continue;
}
- lmm_expand(Sys, cnst[k], var[i], float_random(1.5));
- lmm_expand_add(Sys, cnst[k], var[i], float_random(1.5));
+ Sys->expand(cnst[k], var[i], simgrid::xbt::random::uniform_real(0.0, 1.5));
+ Sys->expand_add(cnst[k], var[i], simgrid::xbt::random::uniform_real(0.0, 1.5));
used[k]++;
}
}
- fprintf(stderr,"Starting to solve(%i)\n",myrand()%1000);
+ fprintf(stderr, "Starting to solve(%i)\n", simgrid::xbt::random::uniform_int(0, 999));
date = xbt_os_time() * 1000000;
- lmm_solve(Sys);
+ Sys->solve();
date = xbt_os_time() * 1000000 - date;
if(mode==2){
fprintf(stderr,"Max concurrency:\n");
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]);
+ int j = cnst[i]->get_concurrency_maximum();
+ int k = cnst[i]->get_concurrency_limit();
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(not lmm_constraint_concurrency_maximum_get(cnst[i]));
+ cnst[i]->reset_concurrency_maximum();
+ xbt_assert(not cnst[i]->get_concurrency_maximum());
if(i%10==9)
fprintf(stderr,"\n");
}
fprintf(stderr,"\nTotal maximum concurrency is %i\n",l);
- lmm_print(Sys);
+ Sys->print();
}
for (int i = 0; i < nb_var; i++)
- lmm_variable_free(Sys, var[i]);
- lmm_system_free(Sys);
+ Sys->variable_free(var[i]);
+ delete Sys;
+ delete[] cnst;
+ delete[] var;
+ delete[] used;
}
unsigned int TestClasses [][4]=
int main(int argc, char **argv)
{
- MSG_init(&argc, argv);
+ simgrid::s4u::Engine e(&argc, argv);
float rate_no_limit=0.2;
float acc_date=0;
mode=3;
if(mode==1)
- xbt_log_control_set("surf/maxmin.threshold:DEBUG surf/maxmin.fmt:\'[%r]: [%c/%p] %m%n\'\
- surf.threshold:DEBUG surf.fmt:\'[%r]: [%c/%p] %m%n\' ");
+ xbt_log_control_set("surf/maxmin.threshold:DEBUG surf/maxmin.fmt:\'[%r]: [%c/%p] %m%n\' "
+ "surf.threshold:DEBUG surf.fmt:\'[%r]: [%c/%p] %m%n\' ");
if(mode==2)
xbt_log_control_set("surf/maxmin.threshold:DEBUG surf.threshold:DEBUG");
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<<pw_base_limit)+(1<<(8*pw_max_limit/10));
//nb_elem=200
for(int i=0;i<testcount;i++){
- seedx=i+1;
- fprintf(stderr, "Starting %i: (%i)\n",i,myrand()%1000);
+ simgrid::xbt::random::set_mersenne_seed(i + 1);
+ fprintf(stderr, "Starting %i: (%i)\n", i, simgrid::xbt::random::uniform_int(0, 999));
test(nb_cnst, nb_var, nb_elem, pw_base_limit, pw_max_limit, rate_no_limit,max_share,mode);
acc_date+=date;
acc_date2+=date*date;