X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5daf61af49b4b767433387330f7f7d21c63e4e59..f4417e41e71fcf25feb676ae7ab0e00823d54add:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index f544d2f4c9..a51ad073e3 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -200,9 +200,9 @@ public: void setCategory(const char *category); /** @brief Get the priority of the current Action */ - double getPriority() {return priority_;}; + double getPriority() { return sharingWeight_; }; /** @brief Set the priority of the current Action */ - virtual void setPriority(double priority); + virtual void setSharingWeight(double priority); /** @brief Get the state set in which the action is */ ActionList* getStateSet() {return stateSet_;}; @@ -213,7 +213,7 @@ public: protected: ActionList* stateSet_; - double priority_ = 1.0; /**< priority (1.0 by default) */ + double sharingWeight_ = 1.0; /**< priority (1.0 by default) */ int refcount_ = 1; double remains_; /**< How much of that cost remains to be done in the currently running task */ double maxDuration_ = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */ @@ -233,7 +233,7 @@ public: void heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat); void heapRemove(xbt_heap_t heap); void heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat); - void updateIndexHeap(int i); + virtual void updateIndexHeap(int i); lmm_variable_t getVariable() {return variable_;} double getLastUpdate() {return lastUpdate_;} void refreshLastUpdate() {lastUpdate_ = surf_get_clock();}