X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7f7d40b071a8c28f2582c39bf599e32802580eb..5e2dd3ecf166c2d82974beb220aeb8dd4200f105:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 95b0cf37d1..7b9c3eaff5 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 @@ -14,21 +12,24 @@ #include "xbt/log.h" #include "surf/surfxml_parse_private.h" #include "surf/random_mgr.h" +#include "instr/private.h" #define NO_MAX_DURATION -1.0 + +/* user-visible parameters */ extern double sg_tcp_gamma; +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; +#endif -extern const char *surf_action_state_names[6]; -typedef enum { - SURF_LINK_ON = 1, /* Ready */ - SURF_LINK_OFF = 0 /* Running */ -} e_surf_link_state_t; - -typedef enum { - SURF_LINK_SHARED = 1, - SURF_LINK_FATPIPE = 0 -} e_surf_link_sharing_policy_t; +extern const char *surf_action_state_names[6]; typedef struct surf_model_private { int (*resource_used) (void *resource_id); @@ -42,25 +43,18 @@ typedef struct surf_model_private { void (*finalize) (void); } s_surf_model_private_t; -/* #define pub2priv(r) ((surf_model_private_t) ((char *)(r) -(sizeof(struct surf_model_private_part)))) */ -/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_model_private_part)))) */ - -extern int use_sdp_solver; -extern int use_lagrange_solver; - double generic_maxmin_share_resources(xbt_swag_t running_actions, size_t offset, lmm_system_t sys, void (*solve) (lmm_system_t)); /* Generic functions common to all models */ -e_surf_action_state_t surf_action_state_get(surf_action_t action); -double surf_action_get_start_time(surf_action_t action); -double surf_action_get_finish_time(surf_action_t action); +e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot declare inline since we use a pointer to it */ +double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */ +double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */ void surf_action_free(surf_action_t * action); -void surf_action_state_set(surf_action_t action, - e_surf_action_state_t state); -void surf_action_data_set(surf_action_t action, void *data); +void surf_action_state_set(surf_action_t action, e_surf_action_state_t state); +void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */ FILE *surf_fopen(const char *name, const char *mode); extern tmgr_history_t history; @@ -71,6 +65,11 @@ void surf_config_finalize(void); void surf_config(const char *name, va_list pa); +void net_action_recycle(surf_action_t action); +double net_action_get_remains(surf_action_t action); +int net_get_link_latency(surf_action_t action); +void net_action_set_max_duration(surf_action_t action, double duration); + /* * Returns the initial path. On Windows the initial path is * the current directory for the current process in the other @@ -85,17 +84,117 @@ const char *__surf_get_initial_path(void); */ int __surf_is_absolute_file_path(const char *file_path); +/* + * One link routing list + */ +typedef struct { + int src_id; + int dst_id; + void *link_ptr; +}s_onelink, *s_onelink_t; + + /* * Routing logic */ -struct s_routing { + +// FIXME: the next lines cant be comented without fix the code in network.c file. +// struct s_routing { +// const char *name; +// xbt_dict_t host_id; /* char* -> int* */ +// xbt_dynar_t (*get_route)(int src, int dst); +// xbt_dict_t (*get_onelink_routes)(void); +// int (*is_router)(int id); +// void (*finalize)(void); +// int host_count; +// int router_count; +// }; + +//////////////////////////////////////////////////////////////////////////////// +// HERE START THE NEW STRUCTURES +//////////////////////////////////////////////////////////////////////////////// + +typedef enum { + SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ + SURF_NETWORK_ELEMENT_HOST, /* host type */ + SURF_NETWORK_ELEMENT_ROUTER, /* router type */ + SURF_NETWORK_ELEMENT_GATEWAY, /* gateway type of the AS */ + SURF_NETWORK_ELEMENT_AS, /* AS type */ + SURF_NETWORK_ELEMENT_AS_GATEWAY, /* gateway type for internals AS */ + SURF_NETWORK_ELEMENT_LINK /* link type */ +} e_surf_network_element_type_t; + +typedef struct s_model_type s_model_type_t, *model_type_t; +typedef struct s_network_element s_network_element_t, *network_element_t; +typedef struct s_route s_route_t, *route_t; +typedef struct s_route_limits s_route_limits_t, *route_limits_t; +typedef struct s_route_extended s_route_extended_t, *route_extended_t; +typedef struct s_routing_component s_routing_component_t, *routing_component_t; +//typedef struct s_routing_global s_routing_global_t, *routing_global_t; + +struct s_model_type { const char *name; - xbt_dict_t host_id; /* char* -> int* */ + const char *desc; + void* (*create)(); + void (*load)(); + void (*unload)(); + void (*end)(); +}; + +struct s_network_element { + int id; + e_surf_network_element_type_t type; +}; + +struct s_route { + xbt_dynar_t link_list; +}; + +struct s_route_limits { + char* src_gateway; + char* dst_gateway; +}; + +struct s_route_extended { + s_route_t generic_route; + char* src_gateway; + char* dst_gateway; +}; - xbt_dynar_t (*get_route)(int src, int dst); +struct s_routing_component { + model_type_t routing; + char *name; + struct s_routing_component* routing_father; + xbt_dict_t routing_sons; + route_extended_t (*get_route)(routing_component_t rc, const char* src, const char* dst); + xbt_dict_t (*get_network_elements)(routing_component_t rc, e_surf_network_element_type_t type); + void (*finalize)(routing_component_t rc); +}; + +struct s_routing_global { + routing_component_t root; + xbt_dict_t where_network_elements; /* char* -> s_routing_component* */ + void *loopback; + size_t size_of_link; + xbt_dynar_t (*get_route)(const char* src, const char* dst); void (*finalize)(void); - int host_count; + xbt_dynar_t last_route; }; -XBT_PUBLIC(routing_t) routing_model_full_create(size_t size_of_link,void *loopback); + +XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback); + +//////////////////////////////////////////////////////////////////////////////// +// HERE END THE NEW STRUCTURES +//////////////////////////////////////////////////////////////////////////////// + +/* + * Resource protected methods + */ +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); +XBT_PUBLIC_DATA(int) surfxml_bufferstack_size; + #endif /* _SURF_SURF_PRIVATE_H */