### SIMIX ###
# BEGIN TESH TESTS
- # BEGIN CONTEXTS FACTORY
IF(HAVE_RAWCTX)
ADD_TESH(tesh-simix-factory-default --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/check_defaults --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/check_defaults factory_raw.tesh)
ELSEIF(CONTEXT_UCONTEXT)
name);
CpuL07Ptr cpu = new CpuL07(this, name, cpu_properties,
- power_initial, power_scale, power_trace,state_initial, state_trace);
+ power_initial, power_scale, power_trace,
+ core, state_initial, state_trace);
xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast<ResourcePtr>(cpu));
}
CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props,
- double power_initial,
- double power_scale, tmgr_trace_t power_trace,
- e_surf_resource_state_t state_initial, tmgr_trace_t state_trace)
+ double power_initial, double power_scale, tmgr_trace_t power_trace,
+ int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace)
: Cpu(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, power_initial * power_scale),
- 1, power_initial, power_scale)
+ core, power_initial, power_scale)
{
xbt_assert(m_powerScale > 0, "Power has to be >0");
tmgr_trace_event_t p_powerEvent;
public:
CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties,
- double power_scale,
- double power_initial, tmgr_trace_t power_trace,
- e_surf_resource_state_t state_initial, tmgr_trace_t state_trace);
+ double power_scale, double power_initial, tmgr_trace_t power_trace,
+ int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace);
bool isUsed();
//bool isUsed() {DIE_IMPOSSIBLE;};
void updateState(tmgr_trace_event_t event_type, double value, double date);
SD_workstation_get_power(hosts[i]));
props = SD_workstation_get_properties(hosts[i]);
if (SD_workstation_get_cores(hosts[i])>1) {
- printf(" cores=\"%d\"", SD_workstation_get_cores(hosts[i]));
+ printf(" core=\"%d\"", SD_workstation_get_cores(hosts[i]));
}
if (props && !xbt_dict_is_empty(props)) {
printf(">\n");
> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
> <platform version="3">
> <AS id="AS0" routing="Full">
-> <host id="bob0.hamburger.edu" power="1000000000 core="6"/>
-> <host id="bob2.hamburger.edu" power="1000000000 core="6""/>
-> <host id="bob3.hamburger.edu" power="1000000000 core="6""/>
-> <host id="bob4.hamburger.edu" power="1000000000 core="6""/>
-> <host id="bob6.hamburger.edu" power="1000000000 core="6""/>
+> <host id="bob0.hamburger.edu" power="1000000000" core="6"/>
+> <host id="bob2.hamburger.edu" power="1000000000" core="6"/>
+> <host id="bob3.hamburger.edu" power="1000000000" core="6"/>
+> <host id="bob4.hamburger.edu" power="1000000000" core="6"/>
+> <host id="bob6.hamburger.edu" power="1000000000" core="6"/>
> <router id="bobbob_cluster_router.hamburger.edu"/>
> <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
> <link id="bob_cluster_link_0_DOWN" bandwidth="125000000" latency="0.000050000"/>