git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8056
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties);
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties);
+ void (*add_traces)(void);
} s_surf_model_extension_cpu_t;
/* Network model */
} s_surf_model_extension_cpu_t;
/* Network model */
double (*get_link_latency) (const void *link);
int (*link_shared) (const void *link);
void (*create_resource) (char *name,double bw_initial,double lat_initial);
double (*get_link_latency) (const void *link);
int (*link_shared) (const void *link);
void (*create_resource) (char *name,double bw_initial,double lat_initial);
+ void (*add_traces)(void);
} s_surf_model_extension_network_t;
/** \brief Workstation model extension public
} s_surf_model_extension_network_t;
/** \brief Workstation model extension public
*/
XBT_PUBLIC(void) surf_route_add_host(char * host_id);
*/
XBT_PUBLIC(void) surf_route_add_host(char * host_id);
+/**
+ * add traces
+ */
+XBT_PUBLIC(void) surf_add_trace_cpu(void);
+XBT_PUBLIC(void) surf_add_trace_link(void);
+
#include "surf/surf_resource.h"
#include "surf/surf_resource_lmm.h"
#include "surf/surf_resource.h"
#include "surf/surf_resource_lmm.h"
surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = add_traces_cpu;
if (!cpu_maxmin_system)
cpu_maxmin_system = lmm_system_new();
if (!cpu_maxmin_system)
cpu_maxmin_system = lmm_system_new();
static void cpu_im_add_traces_cpu(void)
{
static void cpu_im_add_traces_cpu(void)
{
+ INFO0("cpu_im_add_traces_cpu");
xbt_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
xbt_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
double value, double date)
{
cpu_Cas01_im_t cpu = id;
double value, double date)
{
cpu_Cas01_im_t cpu = id;
if (event_type == cpu->power_event) {
cpu->power_scale = value;
lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
if (event_type == cpu->power_event) {
cpu->power_scale = value;
lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
surf_cpu_model->extension.cpu.get_speed = cpu_im_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_im_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_im_create_resource;
surf_cpu_model->extension.cpu.get_speed = cpu_im_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_im_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_im_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = cpu_im_add_traces_cpu;
if (!cpu_im_maxmin_system) {
sg_maxmin_selective_update = 1;
if (!cpu_im_maxmin_system) {
sg_maxmin_selective_update = 1;
surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_ti_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_ti_create_resource;
surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_ti_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_ti_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = add_traces_cpu_ti;
cpu_ti_action_heap = xbt_heap_new(8, NULL);
xbt_heap_set_update_callback(cpu_ti_action_heap, cpu_ti_action_update_index_heap);
cpu_ti_action_heap = xbt_heap_new(8, NULL);
xbt_heap_set_update_callback(cpu_ti_action_heap, cpu_ti_action_update_index_heap);