Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Remove some debug from execution
authornavarro <navarro@caraja.(none)>
Tue, 12 Jun 2012 13:43:42 +0000 (15:43 +0200)
committernavarro <navarro@caraja.(none)>
Tue, 12 Jun 2012 13:43:59 +0000 (15:43 +0200)
examples/msg/io/io.tesh
src/surf/storage.c

index 2e1816c447c27b83075bec5fe3cbc477a66f939f..b2a9bd1c1b18ead07b912f1ee6ef6a3346682e6d 100644 (file)
@@ -2,10 +2,6 @@
 
 $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Configuration change: Set 'path' to '../examples/platforms/'
 
 $ ${bindir:=.}/io/file ${srcdir:=.}/examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Configuration change: Set 'path' to '../examples/platforms/'
-> [  0.000000] (0:@) Create resource with Bconnection '150000000' Bread '100000000' Bwrite '30000000'
-> [  0.000000] (0:@) Create resource with Bconnection '150000000' Bread '100000000' Bwrite '30000000'
-> [  0.000000] (0:@) Create resource with Bconnection '150000000' Bread '100000000' Bwrite '30000000'
-> [  0.000000] (0:@) Create resource with Bconnection '150000000' Bread '100000000' Bwrite '30000000'
 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file '/home/user/Install/simgrid/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (2:1@alice)     Open file '/home/user/Install/simgrid/doc/simgrid/examples/platforms/One_cluster_no_backbone.xml'
 > [  0.000000] (0:@) Number of host '4'
 > [  0.000000] (1:0@denise)    Open file '/home/user/Install/simgrid/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.000000] (2:1@alice)     Open file '/home/user/Install/simgrid/doc/simgrid/examples/platforms/One_cluster_no_backbone.xml'
index 41011470f83467e9754097fe3bf9aee03a065f55..5bde923011f0c8d130667d7c9ee9ce110a940e86 100644 (file)
@@ -155,10 +155,10 @@ static void* storage_create_resource(const char* id, const char* model,const cha
   storage->state_current = SURF_RESOURCE_ON;
 
   storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
   storage->state_current = SURF_RESOURCE_ON;
 
   storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
-  XBT_INFO("Create resource with Bconnection '%zu' Bread '%zu' Bwrite '%zu'",Bconnection,Bread,Bwrite);
   double Bread  = atof(xbt_dict_get(storage_type->properties,"Bread"));
   double Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
   double Bconnection   = atof(xbt_dict_get(storage_type->properties,"Bconnection"));
   double Bread  = atof(xbt_dict_get(storage_type->properties,"Bread"));
   double Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
   double Bconnection   = atof(xbt_dict_get(storage_type->properties,"Bconnection"));
+  XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%ld'",Bconnection,Bread,Bwrite,storage_type->size);
   storage->constraint       = lmm_constraint_new(storage_maxmin_system, storage, Bconnection);
   storage->constraint_read  = lmm_constraint_new(storage_maxmin_system, storage, Bread);
   storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite);
   storage->constraint       = lmm_constraint_new(storage_maxmin_system, storage, Bconnection);
   storage->constraint_read  = lmm_constraint_new(storage_maxmin_system, storage, Bread);
   storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite);