X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/963b8d1182796bce58318c92742863a8d3f32b37..ac151e89b9b3cad0074cd85f01334a3404132082:/include/surf/surf_routing.h diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h index 86379ba18c..95984aaac7 100644 --- a/include/surf/surf_routing.h +++ b/include/surf/surf_routing.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,15 +8,19 @@ #define _SURF_SURF_ROUTING_H #include "xbt/lib.h" -#include "simgrid/platf_interface.h" +#include "simgrid/platf.h" + +SG_BEGIN_DECL() XBT_PUBLIC(xbt_lib_t) host_lib; XBT_PUBLIC(int) ROUTING_HOST_LEVEL; //Routing level XBT_PUBLIC(int) SURF_CPU_LEVEL; //Surf cpu level XBT_PUBLIC(int) SURF_WKS_LEVEL; //Surf workstation level -XBT_PUBLIC(int) SIMIX_HOST_LEVEL; //Simix level +XBT_PUBLIC(int) SIMIX_HOST_LEVEL; //Simix host level +XBT_PUBLIC(int) SIMIX_STORAGE_LEVEL; //Simix storage level XBT_PUBLIC(int) MSG_HOST_LEVEL; //Msg level -XBT_PUBLIC(int) SD_HOST_LEVEL; //Simdag level +XBT_PUBLIC(int) SD_HOST_LEVEL; //Simdag host level +XBT_PUBLIC(int) SD_STORAGE_LEVEL; //Simdag storage level XBT_PUBLIC(int) COORD_HOST_LEVEL; //Coordinates level XBT_PUBLIC(int) NS3_HOST_LEVEL; //host node for ns3 @@ -34,8 +38,8 @@ XBT_PUBLIC(int) ROUTING_PROP_ASR_LEVEL; //Properties for AS and router XBT_PUBLIC(xbt_lib_t) storage_lib; XBT_PUBLIC(int) ROUTING_STORAGE_LEVEL; //Routing storage level XBT_PUBLIC(int) ROUTING_STORAGE_HOST_LEVEL; -XBT_PUBLIC(int) SURF_STORAGE_LEVEL; - +XBT_PUBLIC(int) SURF_STORAGE_LEVEL; // Surf storage level +XBT_PUBLIC(xbt_lib_t) file_lib; XBT_PUBLIC(xbt_lib_t) storage_type_lib; XBT_PUBLIC(int) ROUTING_STORAGE_TYPE_LEVEL; //Routing storage_type level @@ -45,4 +49,6 @@ void routing_AS_end(sg_platf_AS_cbarg_t AS); void routing_cluster_add_backbone(void* bb); +SG_END_DECL() + #endif /* _SURF_SURF_H */