X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a13d43daf0284cec291d65f0585fd2a44e9d87fd..ea74f5d95928a521a588737e81f1de94eef25d19:/src/surf/xml/platf.hpp

diff --git a/src/surf/xml/platf.hpp b/src/surf/xml/platf.hpp
index d001631679..e87645bcbc 100644
--- a/src/surf/xml/platf.hpp
+++ b/src/surf/xml/platf.hpp
@@ -1,46 +1,30 @@
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2022. 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. */
 
-#ifndef _SURF_SURFXML_PARSE_H
-#define _SURF_SURFXML_PARSE_H
+#ifndef SURF_SURFXML_PARSE_HPP
+#define SURF_SURFXML_PARSE_HPP
 
-#include "xbt/misc.h"
-#include "xbt/function_types.h"
-#include "xbt/dict.h"
-
-SG_BEGIN_DECL()
+#include <xbt/base.h>
+#include <xbt/signal.hpp>
+#include <vector>
 
 /* Module management functions */
-XBT_PUBLIC(void) sg_platf_init(void);
-XBT_PUBLIC(void) sg_platf_exit(void);
-
-XBT_PUBLIC(void) surf_parse_open(const char *file);
-XBT_PUBLIC(void) surf_parse_close(void);
-XBT_PUBLIC(void) surf_parse_assert(bool cond, const char *fmt, ...) XBT_ATTRIB_PRINTF(2,3);
-XBT_PUBLIC(void) XBT_ATTRIB_NORETURN surf_parse_error(const char *msg,...) XBT_ATTRIB_PRINTF(1,2);
-XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) XBT_ATTRIB_PRINTF(1,2);
-
-XBT_PUBLIC(double) surf_parse_get_double(const char *string);
-XBT_PUBLIC(int) surf_parse_get_int(const char *string);
-XBT_PUBLIC(double) surf_parse_get_time(const char *string, const char *entity_kind, const char *name);
-XBT_PUBLIC(double) surf_parse_get_size(const char *string, const char *entity_kind, const char *name);
-XBT_PUBLIC(double) surf_parse_get_bandwidth(const char *string, const char *entity_kind, const char *name);
-XBT_PUBLIC(double) surf_parse_get_speed(const char *string, const char *entity_kind, const char *name);
-
-XBT_PUBLIC_DATA(int_f_void_t) surf_parse;       /* Entry-point to the parser. Set this to your function. */
-
-
-SG_END_DECL()
+XBT_PUBLIC void sg_platf_init();
+XBT_PUBLIC void sg_platf_exit();
 
-namespace simgrid {
-namespace surf {
+XBT_PUBLIC void surf_parse_open(const std::string& file);
+XBT_PUBLIC void surf_parse_close();
+XBT_PUBLIC void surf_parse_assert(bool cond, const std::string& msg);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void surf_parse_error(const std::string& msg);
+XBT_PUBLIC void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre,
+                                           const std::string& post);
 
-extern XBT_PRIVATE xbt::signal<void(void)> on_postparse;
+XBT_PUBLIC double surf_parse_get_double(const std::string& s);
+XBT_PUBLIC int surf_parse_get_int(const std::string& s);
 
-}
-}
+XBT_PUBLIC void surf_parse(); /* Entry-point to the parser */
+XBT_PUBLIC void parse_platform_file(const std::string& file);
 
 #endif