X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b2d6ffdf2b2b26175ec4131de3a2e98493b84f42..d4836dbfe1376399c84e1522fc2c2a0f8e410c5c:/src/surf/surf_private.hpp diff --git a/src/surf/surf_private.hpp b/src/surf/surf_private.hpp index 33181250e1..aa48911231 100644 --- a/src/surf/surf_private.hpp +++ b/src/surf/surf_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ @@ -7,27 +7,10 @@ #define SURF_SURF_PRIVATE_HPP #include "src/surf/trace_mgr.hpp" -#include "surf/maxmin.hpp" -#include "surf/surf.h" - -#define NO_MAX_DURATION -1.0 +#include "surf/surf.hpp" extern "C" { -extern XBT_PRIVATE const char* surf_action_state_names[6]; - -/** @ingroup SURF_interface - * @brief Possible update mechanisms - */ -enum e_UM_t { - UM_FULL, /**< Full update mechanism: the remaining time of every action is recomputed at each step */ - UM_LAZY, /**< Lazy update mechanism: only the modified actions get recomputed. - It may be slower than full if your system is tightly coupled to the point where every action - gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for - a simple full update. */ - UM_UNDEFINED /**< Mechanism not defined */ -}; - /* Generic functions common to all models */ XBT_PRIVATE FILE* surf_fopen(const char* name, const char* mode); @@ -41,7 +24,7 @@ XBT_PRIVATE int __surf_is_absolute_file_path(const char* file_path); extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set* future_evt_set; -XBT_PUBLIC(void) storage_register_callbacks(); +XBT_PUBLIC void storage_register_callbacks(); XBT_PRIVATE void parse_after_config();