X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f34ca502a5eb4e4c15cfa6cd36d4ee4da88bc5e1..ad97d1d1268484d2cc55d601977f5a34f0b0a9fa:/include/surf/surf_routing.h diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h index 655b2b4da1..9b52f4ed8e 100644 --- a/include/surf/surf_routing.h +++ b/include/surf/surf_routing.h @@ -4,34 +4,20 @@ /* 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. */ -#ifndef _SURF_SURF_ROUTING_H -#define _SURF_SURF_ROUTING_H +#ifndef SURF_SURF_ROUTING_H +#define SURF_SURF_ROUTING_H #include "xbt/lib.h" -#include "simgrid/platf.h" SG_BEGIN_DECL() -XBT_PUBLIC_DATA(xbt_lib_t) host_lib; -XBT_PUBLIC_DATA(int) SURF_HOST_LEVEL; //Surf workstation level -XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level -XBT_PUBLIC_DATA(int) SD_STORAGE_LEVEL; //Simdag storage level -XBT_PUBLIC_DATA(int) COORD_HOST_LEVEL; //Coordinates level -XBT_PUBLIC_DATA(int) NS3_HOST_LEVEL; //host node for ns3 +// FIXME: this header file should die -XBT_PUBLIC_DATA(xbt_lib_t) as_router_lib; -XBT_PUBLIC_DATA(int) ROUTING_ASR_LEVEL; //Routing level -XBT_PUBLIC_DATA(int) COORD_ASR_LEVEL; //Coordinates level -XBT_PUBLIC_DATA(int) NS3_ASR_LEVEL; //host node for ns3 -XBT_PUBLIC_DATA(int) ROUTING_PROP_ASR_LEVEL; //Properties for AS and router +XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level XBT_PUBLIC_DATA(xbt_lib_t) storage_lib; XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL; //Routing storage level -XBT_PUBLIC_DATA(int) ROUTING_STORAGE_HOST_LEVEL; XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL; // Surf storage level -XBT_PUBLIC_DATA(xbt_lib_t) file_lib; -XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib; -XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL; //Routing storage_type level SG_END_DECL()