-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. 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. */
+#include <boost/intrusive/list.hpp>
+
#include <xbt/base.h>
#include "src/surf/cpu_interface.hpp"
#include "src/surf/trace_mgr.hpp"
-#include "surf/surf_routing.h"
/* Epsilon */
#define EPSILON 0.000000001
void setState(simgrid::surf::Action::State state) override;
int unref() override;
void cancel() override;
- void updateIndexHeap(int i);
void suspend() override;
void resume() override;
void setMaxDuration(double duration) override;
- void setPriority(double priority) override;
+ void setSharingWeight(double priority) override;
double getRemains() override;
- void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
CpuTi *cpu_;
- int indexHeap_;
- int suspended_ = 0;
-public:
+
boost::intrusive::list_member_hook<> action_ti_hook;
};
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
~CpuTi() override;
void setSpeedTrace(tmgr_trace_t trace) override;
- void apply_event(tmgr_trace_iterator_t event, double value) override;
+ void apply_event(tmgr_trace_event_t event, double value) override;
void updateActionsFinishTime(double now);
void updateRemainingAmount(double now);
void modified(bool modified);
- CpuTiTgmr *speedIntegratedTrace_ = NULL;/*< Structure with data needed to integrate trace file */
- ActionTiList *actionSet_ = NULL; /*< set with all actions running on cpu */
+ CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
+ ActionTiList *actionSet_ = nullptr; /*< set with all actions running on cpu */
double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
double currentFrequency_;
-public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
public:
CpuTiModel();
~CpuTiModel() override;
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
- double next_occuring_event(double now) override;
+ Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double>* speedPerPstate, int core) override;
+ double nextOccuringEvent(double now) override;
void updateActionsState(double now, double delta) override;
ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
CpuTiList *modifiedCpu_;
- xbt_heap_t tiActionHeap_;
-
-protected:
- void NotifyResourceTurnedOn(simgrid::surf::Resource*){};
- void NotifyResourceTurnedOff(simgrid::surf::Resource*){};
-
- void NotifyActionCancel(Action*){};
- void NotifyActionResume(Action*){};
- void NotifyActionSuspend(Action*){};
};
}