-/* Copyright (c) 2004-2005, 2007, 2009-2014. The SimGrid Team.
+/* Copyright (c) 2004-2005, 2007, 2009-2014, 2016-2017. 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. */
#include "xbt/sysdep.h"
-#include "xbt/dict.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/split.hpp>
+#include <cmath>
#include <fstream>
-#include <math.h>
#include <sstream>
#include <unordered_map>
namespace tmgr = simgrid::trace_mgr;
-static std::unordered_map<const char*, tmgr::trace*> trace_list;
+static std::unordered_map<std::string, tmgr::trace*> trace_list;
static inline bool doubleEq(double d1, double d2)
{
future_evt_set::future_evt_set() = default;
simgrid::trace_mgr::future_evt_set::~future_evt_set()
{
- xbt_heap_free(p_heap);
+ xbt_heap_free(heap_);
}
}
}
-tmgr_trace_t tmgr_trace_new_from_string(const char* name, std::string input, double periodicity)
+tmgr_trace_t tmgr_trace_new_from_string(std::string name, std::string input, double periodicity)
{
int linecount = 0;
tmgr_trace_t trace = new simgrid::trace_mgr::trace();
tmgr::DatedValue* last_event = &(trace->event_list.back());
- xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name);
-
+ xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name.c_str());
std::vector<std::string> list;
boost::split(list, input, boost::is_any_of("\n\r"));
continue;
if (sscanf(val.c_str(), "PERIODICITY %lg\n", &periodicity) == 1)
continue;
- if (sscanf(val.c_str(), "WAITFOR %lg\n", &periodicity) == 1)
+ if (sscanf(val.c_str(), "LOOPAFTER %lg\n", &periodicity) == 1)
continue;
xbt_assert(sscanf(val.c_str(), "%lg %lg\n", &event.date_, &event.value_) == 2, "%s:%d: Syntax error in trace\n%s",
- name, linecount, input.c_str());
+ name.c_str(), linecount, input.c_str());
xbt_assert(last_event->date_ <= event.date_,
- "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name, linecount,
+ "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name.c_str(), linecount,
last_event->date_, event.date_, input.c_str());
last_event->date_ = event.date_ - last_event->date_;
}
}
- trace_list.insert({xbt_strdup(name), trace});
+ trace_list.insert({name, trace});
return trace;
}
-tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
+tmgr_trace_t tmgr_trace_new_from_file(std::string filename)
{
- xbt_assert(filename && filename[0], "Cannot parse a trace from the null or empty filename");
- xbt_assert(trace_list.find(filename) == trace_list.end(), "Refusing to define trace %s twice", filename);
+ xbt_assert(not filename.empty(), "Cannot parse a trace from an empty filename");
+ xbt_assert(trace_list.find(filename) == trace_list.end(), "Refusing to define trace %s twice", filename.c_str());
std::ifstream* f = surf_ifsopen(filename);
- xbt_assert(!f->fail(), "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
+ xbt_assert(not f->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(), (boost::join(surf_path, ":")).c_str());
std::stringstream buffer;
buffer << f->rdbuf();
- tmgr_trace_t trace = tmgr_trace_new_from_string(filename, buffer.str(), -1);
-
delete f;
- return trace;
-}
-
-void tmgr_trace_free(tmgr_trace_t trace)
-{
- delete trace;
+ return tmgr_trace_new_from_string(filename, buffer.str(), -1);
}
/** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */
xbt_assert((trace_iterator->idx < trace->event_list.size()), "Your trace should have at least one event!");
- xbt_heap_push(p_heap, trace_iterator, 0. /*start_time*/);
+ xbt_heap_push(heap_, trace_iterator, 0. /*start_time*/);
return trace_iterator;
}
/** @brief returns the date of the next occurring event (pure function) */
double simgrid::trace_mgr::future_evt_set::next_date() const
{
- if (xbt_heap_size(p_heap))
- return (xbt_heap_maxkey(p_heap));
- else
- return -1.0;
+ if (xbt_heap_size(heap_))
+ return (xbt_heap_maxkey(heap_));
+ return -1.0;
}
/** @brief Retrieves the next occurring event, or nullptr if none happens before #date */
if (event_date > date)
return nullptr;
- tmgr_trace_event_t trace_iterator = (tmgr_trace_event_t)xbt_heap_pop(p_heap);
+ tmgr_trace_event_t trace_iterator = (tmgr_trace_event_t)xbt_heap_pop(heap_);
if (trace_iterator == nullptr)
return nullptr;
*value = dateVal.value_;
if (trace_iterator->idx < trace->event_list.size() - 1) {
- xbt_heap_push(p_heap, trace_iterator, event_date + dateVal.date_);
+ xbt_heap_push(heap_, trace_iterator, event_date + dateVal.date_);
trace_iterator->idx++;
} else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
- xbt_heap_push(p_heap, trace_iterator, event_date + dateVal.date_);
+ xbt_heap_push(heap_, trace_iterator, event_date + dateVal.date_);
trace_iterator->idx = 1; /* idx=0 is a placeholder to store when events really start */
} else { /* If we don't loop, we don't need this trace_event anymore */
trace_iterator->free_me = 1;
void tmgr_finalize()
{
- for (auto kv : trace_list) {
- xbt_free((char*)kv.first);
+ for (auto const& kv : trace_list)
delete kv.second;
- }
+ trace_list.clear();
}
void tmgr_trace_event_unref(tmgr_trace_event_t* trace_event)
