namespace mc {
ModelChecker::ModelChecker(std::unique_ptr<Process> process) :
- hostnames_(xbt_dict_new()),
page_store_(500),
process_(std::move(process)),
parent_snapshot_(nullptr)
}
-ModelChecker::~ModelChecker()
-{
- xbt_dict_free(&this->hostnames_);
-}
-
-const char* ModelChecker::get_host_name(const char* hostname)
-{
- // Lookup the host name in the dictionary (or create it):
- xbt_dictelm_t elt = xbt_dict_get_elm_or_null(this->hostnames_, hostname);
- if (!elt) {
- xbt_dict_set(this->hostnames_, hostname, nullptr, nullptr);
- elt = xbt_dict_get_elm_or_null(this->hostnames_, hostname);
- assert(elt);
- }
- return elt->key;
-}
+ModelChecker::~ModelChecker() {}
void ModelChecker::start()
{
#include <sys/types.h>
#include <poll.h>
+
#include <memory>
+#include <set>
+#include <string>
#include <simgrid_config.h>
-#include <xbt/dict.h>
#include <xbt/base.h>
#include <sys/types.h>
struct pollfd fds_[2];
/** String pool for host names */
// TODO, use std::set with heterogeneous comparison lookup (C++14)?
- xbt_dict_t /* <hostname, nullptr> */ hostnames_;
+ std::set<std::string> hostnames_;
// This is the parent snapshot of the current state:
PageStore page_store_;
std::unique_ptr<Process> process_;
{
return page_store_;
}
- const char* get_host_name(const char* name);
+
+ std::string const& get_host_name(const char* hostname)
+ {
+ return *this->hostnames_.insert(hostname).first;
+ }
+ std::string const& get_host_name(std::string const& hostname)
+ {
+ return *this->hostnames_.insert(hostname).first;
+ }
void start();
void shutdown();
simgrid::xbt::string_data remote_string = process->read(remote_string_address);
char hostname[remote_string.len];
process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
- info->hostname = mc_model_checker->get_host_name(hostname);
+ info->hostname = mc_model_checker->get_host_name(hostname).c_str();
return info->hostname;
}