XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
"Logging specific to the SURF cpu module");
+int autoload_surf_cpu_model = 1;
+void_f_void_t surf_cpu_model_init_preparse = NULL;
+
CpuModelPtr surf_cpu_model_pm;
CpuModelPtr surf_cpu_model_vm;
-
/*************
* Callbacks *
*************/
surf_callback(void, CpuPtr) cpuCreatedCallbacks;
surf_callback(void, CpuPtr) cpuDestructedCallbacks;
-surf_callback(void, CpuPtr) cpuStateChangedCallbacks;
-surf_callback(void, CpuActionPtr) cpuActionStateChangedCallbacks;
+surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks;
+surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks;
+
+void cpu_parse_init(sg_platf_host_cbarg_t host){
+ surf_cpu_model_pm->createCpu(
+ host->id,
+ host->power_peak,
+ host->pstate,
+ host->power_scale,
+ host->power_trace,
+ host->core_amount,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
+}
+
+void cpu_add_traces(){
+ surf_cpu_model_pm->addTraces();
+}
/*********
* Model *
*********/
-
void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
{
CpuActionPtr action;
while ((xbt_heap_size(getActionHeap()) > 0)
- && (double_equals(xbt_heap_maxkey(getActionHeap()), now))) {
- action = static_cast<CpuActionPtr>(static_cast<ActionPtr>(xbt_heap_pop(getActionHeap())));
+ && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) {
+ action = static_cast<CpuActionPtr>(xbt_heap_pop(getActionHeap()));
XBT_CDEBUG(surf_kernel, "Something happened to action %p", action);
-#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
CpuPtr cpu = static_cast<CpuPtr>(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)));
TRACE_surf_host_set_utilization(cpu->getName(), action->getCategory(),
action->getLastUpdate(),
now - action->getLastUpdate());
}
-#endif
action->finish();
XBT_CDEBUG(surf_kernel, "Action %p finished", action);
action->setState(SURF_ACTION_DONE);
action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped
}
-#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
//defining the last timestamp that we can safely dump to trace file
//without losing the event ascending order (considering all CPU's)
TRACE_last_timestamp_to_dump = smaller;
}
}
-#endif
return;
}
; it != itend ; it=itNext) {
++itNext;
action = static_cast<CpuActionPtr>(&*it);
-#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
CpuPtr x = (CpuPtr) lmm_constraint_id(lmm_get_cnst_from_var
(getMaxminSystem(), action->getVariable(), 0));
delta);
TRACE_last_timestamp_to_dump = now - delta;
}
-#endif
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
xbt_free(p_constraintCoreId);
}
+double Cpu::getCurrentPowerPeak()
+{
+ return m_powerPeak;
+}
+
double Cpu::getSpeed(double load)
{
return load * m_powerPeak;
void Cpu::setState(e_surf_resource_state_t state)
{
+ e_surf_resource_state_t old = Resource::getState();
Resource::setState(state);
- surf_callback_emit(cpuStateChangedCallbacks, this);
+ surf_callback_emit(cpuStateChangedCallbacks, this, old, state);
}
/**********
* Action *
if (m_remains > 0) {
XBT_CDEBUG(surf_kernel, "Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate);
- double_update(&(m_remains), m_lastValue * delta);
+ double_update(&(m_remains), m_lastValue * delta, sg_maxmin_precision*sg_surf_precision);
-#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
CpuPtr cpu = static_cast<CpuPtr>(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0)));
TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate);
}
-#endif
XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, m_remains);
}
}
void CpuAction::setState(e_surf_action_state_t state){
+ e_surf_action_state_t old = getState();
Action::setState(state);
- surf_callback_emit(cpuActionStateChangedCallbacks, this);
+ surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state);
}