Commit fecd4247 authored by Dominik Charousset's avatar Dominik Charousset

Remove last RIAC references from core module

parent 41c47164
...@@ -46,9 +46,3 @@ max-consecutive-reads=50 ...@@ -46,9 +46,3 @@ max-consecutive-reads=50
; heartbeat message interval in ms (0 disables heartbeating) ; heartbeat message interval in ms (0 disables heartbeating)
heartbeat-interval=0 heartbeat-interval=0
; when loading riac::probe
[probe]
; denotes the hostname or IP address to reach the Nexus
nexus-host=""
; denotes the port where the Nexus actor is published
nexus-port=0
...@@ -118,7 +118,8 @@ std::string get_rtti_from_mpi(const uniform_type_info_map& types) { ...@@ -118,7 +118,8 @@ std::string get_rtti_from_mpi(const uniform_type_info_map& types) {
return f(types); return f(types);
} }
/// /// Actor environment including scheduler, registry, and optional components
/// such as a middleman.
class actor_system { class actor_system {
public: public:
friend class abstract_actor; friend class abstract_actor;
...@@ -134,7 +135,6 @@ public: ...@@ -134,7 +135,6 @@ public:
scheduler, scheduler,
middleman, middleman,
opencl_manager, opencl_manager,
riac_probe,
num_ids num_ids
}; };
...@@ -243,13 +243,6 @@ public: ...@@ -243,13 +243,6 @@ public:
/// Returns `true` if the opencl module is available, `false` otherwise. /// Returns `true` if the opencl module is available, `false` otherwise.
bool has_opencl_manager() const; bool has_opencl_manager() const;
/// Returns `true` if the RIAC probe module is available, `false` otherwise.
bool has_probe() const;
/// Returns the RIAC probe instance.
/// @throws `std::logic_error` if module is not loaded.
riac::probe& probe();
/// Returns a dummy execution unit that forwards /// Returns a dummy execution unit that forwards
/// everything to the scheduler. /// everything to the scheduler.
scoped_execution_unit* dummy_execution_unit(); scoped_execution_unit* dummy_execution_unit();
...@@ -471,7 +464,6 @@ private: ...@@ -471,7 +464,6 @@ private:
io::middleman* middleman_; io::middleman* middleman_;
scoped_execution_unit dummy_execution_unit_; scoped_execution_unit dummy_execution_unit_;
opencl::manager* opencl_manager_; opencl::manager* opencl_manager_;
riac::probe* probe_;
bool await_actors_before_shutdown_; bool await_actors_before_shutdown_;
strong_actor_ptr config_serv_; strong_actor_ptr config_serv_;
strong_actor_ptr spawn_serv_; strong_actor_ptr spawn_serv_;
......
...@@ -247,10 +247,6 @@ public: ...@@ -247,10 +247,6 @@ public:
size_t middleman_max_consecutive_reads; size_t middleman_max_consecutive_reads;
size_t middleman_heartbeat_interval; size_t middleman_heartbeat_interval;
// Config parameters of RIAC probes.
std::string nexus_host;
uint16_t nexus_port;
// Config parameters of the OpenCL module. // Config parameters of the OpenCL module.
std::string opencl_device_ids; std::string opencl_device_ids;
......
...@@ -130,14 +130,6 @@ class manager; ...@@ -130,14 +130,6 @@ class manager;
} // namespace opencl } // namespace opencl
// -- RIAC classes -------------------------------------------------------------
namespace riac {
class probe;
} // namespace riac
// -- scheduler classes -------------------------------------------------------- // -- scheduler classes --------------------------------------------------------
namespace scheduler { namespace scheduler {
......
...@@ -62,9 +62,7 @@ enum class sec : uint8_t { ...@@ -62,9 +62,7 @@ enum class sec : uint8_t {
/// Middleman could not open requested port. /// Middleman could not open requested port.
cannot_open_port, cannot_open_port,
/// A remote spawn failed because the provided types did not match. /// A remote spawn failed because the provided types did not match.
cannot_spawn_actor_from_arguments, cannot_spawn_actor_from_arguments
/// Requested RIAC information about a node that does not exist.
no_such_riac_node
}; };
/// @relates sec /// @relates sec
......
...@@ -227,9 +227,6 @@ actor_system::actor_system(actor_system_config* ptr, bool owns_ptr) ...@@ -227,9 +227,6 @@ actor_system::actor_system(actor_system_config* ptr, bool owns_ptr)
auto& clptr = modules_[module::opencl_manager]; auto& clptr = modules_[module::opencl_manager];
if (clptr) if (clptr)
opencl_manager_ = reinterpret_cast<opencl::manager*>(clptr->subtype_ptr()); opencl_manager_ = reinterpret_cast<opencl::manager*>(clptr->subtype_ptr());
auto& pptr = modules_[module::riac_probe];
if (pptr)
probe_ = reinterpret_cast<riac::probe*>(pptr->subtype_ptr());
auto& sched = modules_[module::scheduler]; auto& sched = modules_[module::scheduler];
using share = scheduler::coordinator<policy::work_sharing>; using share = scheduler::coordinator<policy::work_sharing>;
using steal = scheduler::coordinator<policy::work_stealing>; using steal = scheduler::coordinator<policy::work_stealing>;
...@@ -366,17 +363,6 @@ opencl::manager& actor_system::opencl_manager() const { ...@@ -366,17 +363,6 @@ opencl::manager& actor_system::opencl_manager() const {
return *opencl_manager_; return *opencl_manager_;
} }
bool actor_system::has_probe() const {
return probe_ != nullptr;
}
riac::probe& actor_system::probe() {
if (! probe_)
throw std::logic_error("cannot access RIAC probe: module not loaded");
return *probe_;
}
scoped_execution_unit* actor_system::dummy_execution_unit() { scoped_execution_unit* actor_system::dummy_execution_unit() {
return &dummy_execution_unit_; return &dummy_execution_unit_;
} }
......
...@@ -98,7 +98,6 @@ actor_system_config::actor_system_config() ...@@ -98,7 +98,6 @@ actor_system_config::actor_system_config()
middleman_enable_automatic_connections = false; middleman_enable_automatic_connections = false;
middleman_max_consecutive_reads = 50; middleman_max_consecutive_reads = 50;
middleman_heartbeat_interval = 0; middleman_heartbeat_interval = 0;
nexus_port = 0;
// fill our options vector for creating INI and CLI parsers // fill our options vector for creating INI and CLI parsers
opt_group{options_, "scheduler"} opt_group{options_, "scheduler"}
.add(scheduler_policy, "policy", .add(scheduler_policy, "policy",
...@@ -139,11 +138,6 @@ actor_system_config::actor_system_config() ...@@ -139,11 +138,6 @@ actor_system_config::actor_system_config()
"sets the maximum number of consecutive I/O reads per broker") "sets the maximum number of consecutive I/O reads per broker")
.add(middleman_heartbeat_interval, "heartbeat-interval", .add(middleman_heartbeat_interval, "heartbeat-interval",
"sets the interval (ms) of heartbeat, 0 (default) means disabling it"); "sets the interval (ms) of heartbeat, 0 (default) means disabling it");
opt_group{options_, "probe"}
.add(nexus_host, "nexus-host",
"sets the hostname or IP address for connecting to the Nexus")
.add(nexus_port, "nexus-port",
"sets the port for connecting to the Nexus");
opt_group(options_, "opencl") opt_group(options_, "opencl")
.add(opencl_device_ids, "device-ids", .add(opencl_device_ids, "device-ids",
"restricts which OpenCL devices are accessed by CAF"); "restricts which OpenCL devices are accessed by CAF");
......
...@@ -40,15 +40,14 @@ const char* sec_strings[] = { ...@@ -40,15 +40,14 @@ const char* sec_strings[] = {
"cannot_close_invalid_port", "cannot_close_invalid_port",
"cannot_connect_to_node", "cannot_connect_to_node",
"cannot_open_port", "cannot_open_port",
"cannot_spawn_actor_from_arguments", "cannot_spawn_actor_from_arguments"
"no_such_riac_node"
}; };
} // namespace <anonymous> } // namespace <anonymous>
const char* to_string(sec x) { const char* to_string(sec x) {
auto index = static_cast<size_t>(x); auto index = static_cast<size_t>(x);
if (index > static_cast<size_t>(sec::no_such_riac_node)) if (index > static_cast<size_t>(sec::cannot_spawn_actor_from_arguments))
return "<unknown>"; return "<unknown>";
return sec_strings[index]; return sec_strings[index];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment