X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b30f00857843f1cee60814ed519ff82e8ef4787..fe832229f8b8467994bac54665117823e7ed97e9:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 7d0d1a36a5..cfa4f8afd3 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -1,10 +1,8 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */ - #ifndef _SURF_SURF_PRIVATE_H #define _SURF_SURF_PRIVATE_H @@ -24,6 +22,7 @@ extern double sg_latency_factor; extern double sg_bandwidth_factor; extern double sg_weight_S_parameter; extern int sg_maxmin_selective_update; +extern int sg_network_fullduplex; #ifdef HAVE_GTNETS extern double sg_gtnets_jitter; extern int sg_gtnets_jitter_seed; @@ -32,11 +31,6 @@ extern int sg_maxmin_selective_update; extern const char *surf_action_state_names[6]; -typedef enum { - SURF_LINK_SHARED = 1, - SURF_LINK_FATPIPE = 0 -} e_surf_link_sharing_policy_t; - typedef struct surf_model_private { int (*resource_used) (void *resource_id); /* Share the resources to the actions and return in how much time @@ -111,11 +105,18 @@ struct s_routing { }; XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback); +/* + * generic methods to create resources bypassing the parser + * FIXME : better if added to the routing model instead + */ +XBT_PUBLIC(void) routing_add_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action); +XBT_PUBLIC(void) routing_add_host(char* host_id); +XBT_PUBLIC(void) routing_set_routes(void); /* * Resource protected methods */ -XBT_PUBLIC(xbt_dict_t) surf_resource_properties(const void *resource); +xbt_dict_t surf_resource_properties(const void *resource); XBT_PUBLIC(void) surfxml_bufferstack_push(int new); XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);