A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tiny doc update and cosmetics
[simgrid.git]
/
src
/
surf
/
surf_private.h
diff --git
a/src/surf/surf_private.h
b/src/surf/surf_private.h
index
b68c575
..
5a53d7a
100644
(file)
--- a/
src/surf/surf_private.h
+++ b/
src/surf/surf_private.h
@@
-1,16
+1,14
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-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. */
/* 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_SURF_PRIVATE_H
-#define
_
SURF_SURF_PRIVATE_H
+#ifndef SURF_SURF_PRIVATE_H
+#define SURF_SURF_PRIVATE_H
#include "surf/surf.h"
#include "surf/maxmin.h"
#include "src/surf/trace_mgr.hpp"
#include "surf/surf.h"
#include "surf/maxmin.h"
#include "src/surf/trace_mgr.hpp"
-#include <stdio.h>
#define NO_MAX_DURATION -1.0
#define NO_MAX_DURATION -1.0
@@
-35,6
+33,7
@@
typedef enum {
/* Generic functions common to all models */
XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
/* Generic functions common to all models */
XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
+XBT_PRIVATE std::ifstream* surf_ifsopen(const char* name);
/* The __surf_is_absolute_file_path() returns 1 if
* file_path is a absolute file path, in the other
/* The __surf_is_absolute_file_path() returns 1 if
* file_path is a absolute file path, in the other
@@
-42,16
+41,12
@@
XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
*/
XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
*/
XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path);
-/**
- * Routing logic
- */
-
extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
XBT_PUBLIC(void) storage_register_callbacks();
extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
XBT_PUBLIC(void) storage_register_callbacks();
-XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
AS
_t rc);
+XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
sg_netzone
_t rc);
XBT_PRIVATE void parse_after_config();
/********** Tracing **********/
XBT_PRIVATE void parse_after_config();
/********** Tracing **********/
@@
-61,4
+56,4
@@
void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
SG_END_DECL()
SG_END_DECL()
-#endif
/* _SURF_SURF_PRIVATE_H */
+#endif