From da6335359a88e448e4a706353f33e542a2fb00e5 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 23 Mar 2017 13:27:56 +0100 Subject: [PATCH] surf_fopen to ifsopen + no need to reimplement streambuffers --- include/xbt/str.h | 2 -- src/surf/surf_interface.cpp | 1 + src/surf/trace_mgr.cpp | 33 ++++++++++++++++++++------------- src/surf/trace_mgr.hpp | 4 ++-- src/xbt/xbt_str.cpp | 19 ------------------- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/include/xbt/str.h b/include/xbt/str.h index 91669e66b0..78d7b3ba81 100644 --- a/include/xbt/str.h +++ b/include/xbt/str.h @@ -43,8 +43,6 @@ XBT_PUBLIC(char *) xbt_str_join_array(const char *const *strs, const char *sep); XBT_PUBLIC(void) xbt_str_subst(char *str, char from, char to, int amount); XBT_PUBLIC(char *) xbt_str_varsubst(const char *str, xbt_dict_t patterns); -XBT_PUBLIC(char *) xbt_str_from_file(FILE * file); - XBT_PUBLIC(long int) xbt_str_parse_int(const char* str, const char* error_msg); XBT_PUBLIC(double) xbt_str_parse_double(const char* str, const char* error_msg); diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index be75f0a219..9010a9490e 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -135,6 +135,7 @@ std::ifstream* surf_ifsopen(const char* name) if (__surf_is_absolute_file_path(name)) { /* don't mess with absolute file names */ fs->open(name, std::ifstream::in); } + /* search relative files in the path */ for (auto path_elm : surf_path) { std::string buff = path_elm + FILE_DELIM + name; diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index 5455bdbb3a..4656258c5c 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -9,19 +9,21 @@ #include "xbt/log.h" #include "xbt/str.h" -#include "src/surf/trace_mgr.hpp" #include "src/surf/surf_interface.hpp" +#include "src/surf/trace_mgr.hpp" #include "surf_private.h" #include "xbt/RngStream.h" #include #include #include +#include #include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management"); -static std::unordered_map trace_list; +static std::unordered_map trace_list; simgrid::trace_mgr::trace::trace()=default; simgrid::trace_mgr::trace::~trace()=default; @@ -32,7 +34,7 @@ simgrid::trace_mgr::future_evt_set::~future_evt_set() xbt_heap_free(p_heap); } -tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, double periodicity) +tmgr_trace_t tmgr_trace_new_from_string(const char* name, std::string input, double periodicity) { int linecount = 0; tmgr_event_t last_event = nullptr; @@ -53,13 +55,17 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, dou if (sscanf(val.c_str(), "PERIODICITY " "%lg" "\n", &periodicity) == 1) continue; - xbt_assert(sscanf(val.c_str(), "%lg" " " "%lg" "\n", &event.delta, &event.value) == 2, - "%s:%d: Syntax error in trace\n%s", name, linecount, input); + xbt_assert(sscanf(val.c_str(), "%lg" + " " + "%lg" + "\n", + &event.delta, &event.value) == 2, + "%s:%d: Syntax error in trace\n%s", name, linecount, input.c_str()); if (last_event) { xbt_assert(last_event->delta <= event.delta, - "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", - name, linecount, last_event->delta, event.delta, input); + "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name, linecount, + last_event->delta, event.delta, input.c_str()); last_event->delta = event.delta - last_event->delta; } else { @@ -86,13 +92,14 @@ tmgr_trace_t tmgr_trace_new_from_file(const char *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); - FILE *f = surf_fopen(filename, "r"); - xbt_assert(f != nullptr, "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).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()); + + std::stringstream buffer; + buffer << f->rdbuf(); + tmgr_trace_t trace = tmgr_trace_new_from_string(filename, buffer.str(), 0.); - char *tstr = xbt_str_from_file(f); - fclose(f); - tmgr_trace_t trace = tmgr_trace_new_from_string(filename, tstr, 0.); - xbt_free(tstr); + delete f; return trace; } diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp index 3260d6688b..ac19633e50 100644 --- a/src/surf/trace_mgr.hpp +++ b/src/surf/trace_mgr.hpp @@ -40,8 +40,8 @@ XBT_PUBLIC(void) tmgr_trace_event_unref(tmgr_trace_iterator_t *trace_event); XBT_PUBLIC(void) tmgr_finalize(void); -XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char *filename); -XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, const char *input, double periodicity); +XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char* filename); +XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char* id, std::string, double periodicity); SG_END_DECL() diff --git a/src/xbt/xbt_str.cpp b/src/xbt/xbt_str.cpp index 523ec91eab..8496a21281 100644 --- a/src/xbt/xbt_str.cpp +++ b/src/xbt/xbt_str.cpp @@ -461,25 +461,6 @@ char *xbt_str_join_array(const char *const *strs, const char *sep) return res; } -/** @brief creates a new string containing what can be read on a fd */ -char *xbt_str_from_file(FILE * file) -{ - xbt_strbuff_t buff = xbt_strbuff_new(); - char *res; - char bread[1024]; - memset(bread, 0, 1024); - - while (!feof(file)) { - int got = fread(bread, 1, 1023, file); - bread[got] = '\0'; - xbt_strbuff_append(buff, bread); - } - - res = buff->data; - xbt_strbuff_free_container(buff); - return res; -} - /** @brief Parse an integer out of a string, or raise an error * * The @a str is passed as argument to your @a error_msg, as follows: -- 2.20.1