A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated features for next release.
[simgrid.git]
/
src
/
msg
/
msg_private.hpp
diff --git
a/src/msg/msg_private.hpp
b/src/msg/msg_private.hpp
index
8b0378e
..
25da958
100644
(file)
--- a/
src/msg/msg_private.hpp
+++ b/
src/msg/msg_private.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
21
. 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. */
/* 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. */
@@
-10,19
+10,22
@@
#include "simgrid/msg.h"
#include "src/kernel/activity/CommImpl.hpp"
#include <simgrid/modelchecker.h>
#include "simgrid/msg.h"
#include "src/kernel/activity/CommImpl.hpp"
#include <simgrid/modelchecker.h>
+#include <xbt/Extendable.hpp>
#include <cmath>
/**************** datatypes **********************************/
namespace simgrid {
#include <cmath>
/**************** datatypes **********************************/
namespace simgrid {
+
+extern template class XBT_PUBLIC xbt::Extendable<msg::Task>;
+
namespace msg {
namespace msg {
-class Task {
+class Task
: public xbt::Extendable<Task>
{
std::string name_ = "";
std::string tracing_category_ = "";
std::string name_ = "";
std::string tracing_category_ = "";
- void* userdata_ = nullptr;
long long int id_;
long long int id_;
- double timeout_ =
0.0;
+ double timeout_ =
-1; /* Default timeout is infinite */
double priority_ = 1.0;
double bound_ = 0.0; /* Capping for CPU resource, or 0 for no capping */
double rate_ = -1; /* Capping for network resource, or -1 for no capping*/
double priority_ = 1.0;
double bound_ = 0.0; /* Capping for CPU resource, or 0 for no capping */
double rate_ = -1; /* Capping for network resource, or -1 for no capping*/
@@
-46,32
+49,29
@@
public:
Task(const Task&) = delete;
Task& operator=(const Task&) = delete;
Task(const Task&) = delete;
Task& operator=(const Task&) = delete;
- ~Task() = default;
- bool is_used() { return is_used_; }
- bool is_parallel() { return parallel_; }
+ bool is_used()
const
{ return is_used_; }
+ bool is_parallel()
const
{ return parallel_; }
void set_used();
void set_not_used() { this->is_used_ = false; }
const std::string& get_name() const { return name_; }
void set_used();
void set_not_used() { this->is_used_ = false; }
const std::string& get_name() const { return name_; }
- const char* get_cname() { return name_.c_str(); }
+ const char* get_cname()
const
{ return name_.c_str(); }
void set_name(const char* new_name) { name_ = std::string(new_name); }
void set_name(const char* new_name) { name_ = std::string(new_name); }
- void set_tracing_category(const char* category) { tracing_category_ = category ?
std::string(category)
: ""; }
- const std::string& get_tracing_category() { return tracing_category_; }
+ void set_tracing_category(const char* category) { tracing_category_ = category ?
category
: ""; }
+ const std::string& get_tracing_category()
const
{ return tracing_category_; }
bool has_tracing_category() { return not tracing_category_.empty(); }
bool has_tracing_category() { return not tracing_category_.empty(); }
- void* get_user_data() { return userdata_; }
- void set_user_data(void* data) { userdata_ = data; }
- long long int get_id() { return id_; }
- double get_priority() { return priority_; }
+ long long int get_id() const { return id_; }
+ double get_priority() const { return priority_; }
void set_priority(double priority);
void set_bound(double bound) { bound_ = bound; }
void set_priority(double priority);
void set_bound(double bound) { bound_ = bound; }
- double get_bound() { return bound_; }
+ double get_bound()
const
{ return bound_; }
void set_rate(double rate) { rate_ = rate; }
void set_rate(double rate) { rate_ = rate; }
- double get_rate() { return rate_; }
+ double get_rate()
const
{ return rate_; }
void set_timeout(double timeout) { timeout_ = timeout; }
void set_timeout(double timeout) { timeout_ = timeout; }
- s4u::Actor* get_sender();
- s4u::Host* get_source();
+ s4u::Actor* get_sender()
const
;
+ s4u::Host* get_source()
const
;
s4u::ExecPtr compute = nullptr; /* S4U modeling of computation */
s4u::CommPtr comm = nullptr; /* S4U modeling of communication */
s4u::ExecPtr compute = nullptr; /* S4U modeling of computation */
s4u::CommPtr comm = nullptr; /* S4U modeling of communication */
@@
-98,7
+98,7
@@
public:
bool test();
msg_error_t wait_for(double timeout);
void set_status(msg_error_t status) { status_ = status; }
bool test();
msg_error_t wait_for(double timeout);
void set_status(msg_error_t status) { status_ = status; }
- msg_error_t get_status() { return status_; }
+ msg_error_t get_status()
const
{ return status_; }
};
} // namespace msg
};
} // namespace msg