-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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. */
#ifndef SURF_HOST_INTERFACE_HPP_
#define SURF_HOST_INTERFACE_HPP_
-#include "StorageImpl.hpp"
-#include "cpu_interface.hpp"
-#include "network_interface.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
#include "src/surf/PropertyHolder.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/network_interface.hpp"
#include <vector>
public:
HostModel() : Model(Model::UpdateAlgo::FULL) {}
- virtual void ignore_empty_vm_in_pm_LMM();
- virtual kernel::resource::Action* execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
- double* bytes_amount, double rate);
+ virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
+ const double* flops_amount, const double* bytes_amount,
+ double rate);
};
/************
/** @brief Get the vector of storages (by names) attached to the Host */
virtual std::vector<const char*> get_attached_storages();
- std::map<std::string, simgrid::surf::StorageImpl*> storage_;
- simgrid::s4u::Host* piface_ = nullptr;
+ std::map<std::string, kernel::resource::StorageImpl*> storage_;
+ s4u::Host* piface_ = nullptr;
void turn_on();
void turn_off();
std::vector<s4u::ActorPtr> get_all_actors();
- int get_actor_count();
+ size_t get_actor_count();
typedef boost::intrusive::list<
kernel::actor::ActorImpl,
// FIXME: make these private
ActorList process_list_;
- std::map<std::string, kernel::actor::ProcessArg*> actors_at_boot_;
+ std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
};
}
}