-/* $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. */
XBT_PUBLIC(void *) surf_action_new(size_t size, double cost,
surf_model_t model, int failed);
+/**
+ * FIXME : this should be done in the binding code !!
+ */
+XBT_PUBLIC(void) network_create_resource(char *name,
+ double initial_bandwidth,double initial_latency);
/** \brief Resource model description
*/
typedef struct surf_model_description {
const char *name;
+ const char *description;
surf_model_t model;
void (*model_init_preparse) (const char *filename);
void (*model_init_postparse) (void);
surf_model_t model);
XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
const char *name);
+XBT_PUBLIC(void) model_help(const char* category, s_surf_model_description_t * table);
/** \brief Action structure
* \ingroup SURF_actions
e_surf_resource_state_t(*get_state) (void *cpu);
double (*get_speed) (void *cpu, double load);
double (*get_available_speed) (void *cpu);
+ void (*create_resource)(char *name, double power_peak,
+ double power_scale,
+ tmgr_trace_t power_trace,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties);
} s_surf_model_extension_cpu_t;
/* Network model */
double (*get_link_bandwidth) (const void *link);
double (*get_link_latency) (const void *link);
int (*link_shared) (const void *link);
+ void (*create_resource) (char *name,double bw_initial,double lat_initial);
} s_surf_model_extension_network_t;
/** \brief Workstation model extension public
*/
XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(const char *filename);
+/**brief Initialise the cpu_im model bypassing the parser
+ *
+ */
+XBT_PUBLIC(void) surf_cpu_model_init_bypass_im(const char*id,double power);
+
/** \brief The list of all available cpu model models
* \ingroup SURF_models
*/
XBT_PUBLIC(void) create_workstations(void);
+/**\brief create new host bypass the parser
+ *
+ */
+
+
/** \brief The network model
* \ingroup SURF_models
*
*/
XBT_PUBLIC_DATA(surf_model_t) surf_network_model;
+/** \brief Same as network model 'LagrangeVelho', only with different correction factors.
+ * \ingroup SURF_models
+ * \param filename XML platform file name
+ *
+ * This model is proposed by Pierre-Nicolas Clauss and Martin Quinson and Stéphane Génaud
+ * based on the model 'LV08' and different correction factors depending on the communication
+ * size (< 1KiB, < 64KiB, >= 64KiB).
+ *
+ * \see surf_workstation_model_init_SMPI()
+ */
+XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename);
+
/** \brief Initializes the platform with the network model 'LagrangeVelho'
* \ingroup SURF_models
* \param filename XML platform file name
*/
XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_Vivaldi(const char *filename);
+
/** \brief Initializes the platform with the network model CM02
* \ingroup SURF_models
* \param filename XML platform file name
*/
XBT_PUBLIC(void) surf_network_model_init_CM02(const char *filename);
+/**
+ * brief initialize the the network model bypassing the XML parser
+ */
+XBT_PUBLIC(void) surf_network_model_init_bypass(const char* id,double initial_bw,double initial_lat);
+
#ifdef HAVE_GTNETS
/** \brief Initializes the platform with the network model GTNETS
* \ingroup SURF_models
XBT_PUBLIC(double) get_cpu_power(const char *power);
+/*public interface to create resource bypassing the parser via cpu/network model
+ *
+ * see surfxml_parse.c
+ * */
+XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak,
+ double power_scale,
+ tmgr_trace_t power_trace,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties);
+
+/**
+ * create link resource
+ * see network.c
+ * FIXME : shoudl have the same prototype as net_link_new
+ */
+XBT_PUBLIC(void) surf_link_create_resouce(char *name,
+ double bw_initial,double lat_initial);
+
+/**
+ * add route element (link_ctn) bypassing the parser
+ *
+ * see surfxml_parse.c
+ *
+ */
+XBT_PUBLIC(void) surf_add_route_element(char *link_ctn_id);
+
+/**
+ * set route src_id,dest_id, and create a route resource
+ *
+ * see surf_routing.c
+ */
+XBT_PUBLIC(void) surf_route_set_resource(char* src_id,char *dest_id,xbt_dynar_t links_id,int action);
+
+/**
+ * add host to routing model ( xbt_dict )
+ *
+ */
+XBT_PUBLIC(void) surf_route_add_host(char * host_id);
+
#include "surf/surf_resource.h"
#include "surf/surf_resource_lmm.h"
