Cleanups

- please sonar (no macro name should start with a _)
- please clang-format (unclutter the code to clutter my diffs)
- kill some empty files
- fix some copyright lines

diff --git a/include/xbt/config.h b/include/xbt/config.h
index aa14952..fa0b5d4 100644 (file)
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -1,18 +1,16 @@
-/* config - Dictionary where the type of each cell is provided.            */
-
+/* config - Dictionary where the type of each cell is provided.             */

 /* This is useful to build named structs, like option or property sets.     */
 
 /* This is useful to build named structs, like option or property sets.     */
 

-/* Copyright (c) 2004-2007, 2009-2014. 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 _XBT_CONFIG_H_
-#define _XBT_CONFIG_H_
+#ifndef XBT_CONFIG_H
+#define XBT_CONFIG_H

 
 

-#include "xbt/dynar.h"

 #include <stdarg.h>
 #include <stdarg.h>

+#include <xbt/dynar.h>

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 


@@ -145,4 +143,4 @@ XBT_PUBLIC(int)    xbt_cfg_get_boolean(const char *name);
 /** @} */
 
 SG_END_DECL()
 /** @} */
 
 SG_END_DECL()

-#endif                          /* _XBT_CONFIG_H_ */
+#endif /* XBT_CONFIG_H */

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 8200bf0..4e0e222 100644 (file)
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 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. */
 
 
 /* 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 _XBT_CONFIG_HPP_
-#define _XBT_CONFIG_HPP_
+#ifndef XBT_CONFIG_HPP
+#define XBT_CONFIG_HPP

 
 #include <xbt/base.h>
 
 
 #include <xbt/base.h>
 

diff --git a/include/xbt/cunit.h b/include/xbt/cunit.h
index 6bfa6a0..cf7a3ec 100644 (file)
--- a/include/xbt/cunit.h
+++ b/include/xbt/cunit.h
@@ -1,15 +1,14 @@
 /* cunit - A little C Unit facility                                         */
 
 /* cunit - A little C Unit facility                                         */
 

-/* Copyright (c) 2005-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2005-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 is partially inspired from the OSSP ts (Test Suite Library)         */
 
 
 /* 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 is partially inspired from the OSSP ts (Test Suite Library)         */
 

-#ifndef _XBT_CUNIT_H_
-#define _XBT_CUNIT_H_
+#ifndef XBT_CUNIT_H_
+#define XBT_CUNIT_H_

 
 #include "xbt/sysdep.h"         /* XBT_GNU_PRINTF */
 #include "xbt/ex.h"
 
 #include "xbt/sysdep.h"         /* XBT_GNU_PRINTF */
 #include "xbt/ex.h"


@@ -137,4 +136,4 @@ XBT_PUBLIC(void) xbt_test_skip();
 /** @} */
 
 SG_END_DECL()
 /** @} */
 
 SG_END_DECL()

-#endif                          /* _XBT_CUNIT_H_ */
+#endif /* XBT_CUNIT_H_ */

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index 4f6e061..f1eb29e 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -1,13 +1,12 @@
 /* xbt/dict.h -- api to a generic dictionary                                */
 
 /* xbt/dict.h -- api to a generic dictionary                                */
 

-/* Copyright (c) 2004-2014. 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 _XBT_DICT_H
-#define _XBT_DICT_H
+#ifndef XBT_DICT_H
+#define XBT_DICT_H

 
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/dynar.h"          /* void_f_pvoid_t */
 
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/dynar.h"          /* void_f_pvoid_t */


@@ -175,4 +174,4 @@ xbt_dict_foreach(head, cursor, key, data) {
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _XBT_DICT_H */
+#endif /* XBT_DICT_H */

diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 9be1816..747e318 100644 (file)
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -1,18 +1,17 @@
 /* dynar - a generic dynamic array                                          */
 
 /* dynar - a generic dynamic array                                          */
 

-/* Copyright (c) 2004-2007, 2009-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 _XBT_DYNAR_H
-#define _XBT_DYNAR_H
+#ifndef XBT_DYNAR_H
+#define XBT_DYNAR_H

 
 #include <string.h>             /* memcpy */
 
 
 #include <string.h>             /* memcpy */
 

-#include "xbt/base.h"           /* SG_BEGIN_DECL */
-#include "xbt/function_types.h"
+#include <xbt/base.h> /* SG_BEGIN_DECL */
+#include <xbt/function_types.h>

 
 SG_BEGIN_DECL()
 
 
 SG_BEGIN_DECL()
 


@@ -262,4 +261,4 @@ xbt_dynar_foreach (dyn,cpt,str) {
 /** @} */
 SG_END_DECL()
 
 /** @} */
 SG_END_DECL()
 

-#endif                          /* _XBT_DYNAR_H */
+#endif /* XBT_DYNAR_H */

diff --git a/include/xbt/graph.h b/include/xbt/graph.h
index fa192a0..52087eb 100644 (file)
--- a/include/xbt/graph.h
+++ b/include/xbt/graph.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2006-2007, 2009-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-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 _XBT_GRAPH_H
-#define _XBT_GRAPH_H
+#ifndef XBT_GRAPH_H
+#define XBT_GRAPH_H

 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/dynar.h"
 SG_BEGIN_DECL()
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/dynar.h"
 SG_BEGIN_DECL()


@@ -84,5 +83,5 @@ XBT_PUBLIC(void) xbt_graph_export_graphviz(xbt_graph_t g, const char *filename,
     const char *(node_name) (xbt_node_t), const char *(edge_name) (xbt_edge_t));
 
 SG_END_DECL()
     const char *(node_name) (xbt_node_t), const char *(edge_name) (xbt_edge_t));
 
 SG_END_DECL()

-#endif                          /* _XBT_GRAPH_H */
+#endif /* XBT_GRAPH_H */

 /** @} */
 /** @} */

diff --git a/include/xbt/module.h b/include/xbt/module.h
index 398e9f7..7e00a6f 100644 (file)
--- a/include/xbt/module.h
+++ b/include/xbt/module.h
@@ -1,7 +1,6 @@
 /* module - modularize the code                                             */
 
 /* module - modularize the code                                             */
 

-/* Copyright (c) 2004-2007, 2009-2010, 2012-2014. 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. */


@@ -17,4 +16,4 @@ XBT_PUBLIC(void) xbt_init(int *argc, char **argv);
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _XBT_MODULE_H */
+#endif /* XBT_MODULE_H */

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index a0f6b3e..5c1ff35 100644 (file)
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -1,5 +1,4 @@
-/* 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. */


@@ -7,8 +6,8 @@
 /* Warning, this module is done to be efficient and performs tons of cast and dirty things. So avoid using it unless
  * you really know what you are doing. */
 
 /* Warning, this module is done to be efficient and performs tons of cast and dirty things. So avoid using it unless
  * you really know what you are doing. */
 

-#ifndef _XBT_SWAG_H
-#define _XBT_SWAG_H
+#ifndef XBT_SWAG_H
+#define XBT_SWAG_H

 
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"         /* size_t */
 
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"         /* size_t */


@@ -195,4 +194,4 @@ static inline void *xbt_swag_getFirst(xbt_swag_t swag)
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _XBT_SWAG_H */
+#endif /* XBT_SWAG_H */

diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h
index 07b895d..6c15696 100644 (file)
--- a/include/xbt/virtu.h
+++ b/include/xbt/virtu.h
@@ -1,13 +1,12 @@
-/* virtu - virtualization layer for XBT to choose between GRAS and MSG implementation */
+/* virtu - virtualization layer for the logging to know about the actors    */

 
 

-/* Copyright (c) 2007, 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2014. 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 __XBT_VIRTU_H__
-#define __XBT_VIRTU_H__
+#ifndef XBT_VIRTU_H
+#define XBT_VIRTU_H

 
 #include "xbt/misc.h"
 #include "xbt/base.h"
 
 #include "xbt/misc.h"
 #include "xbt/base.h"


@@ -26,4 +25,4 @@ XBT_PUBLIC_DATA(char*) xbt_binary_name;
 XBT_PUBLIC_DATA(xbt_dynar_t) xbt_cmdline;
 
 SG_END_DECL()
 XBT_PUBLIC_DATA(xbt_dynar_t) xbt_cmdline;
 
 SG_END_DECL()

-#endif                          /* __XBT_VIRTU_H__ */
+#endif /* XBT_VIRTU_H */

diff --git a/include/xbt/xbt_os_thread.h b/include/xbt/xbt_os_thread.h
index ecc6fa7..8890263 100644 (file)
--- a/include/xbt/xbt_os_thread.h
+++ b/include/xbt/xbt_os_thread.h
@@ -1,13 +1,12 @@
 /* xbt/xbt_os_thread.h -- Thread portability layer                          */
 
 /* xbt/xbt_os_thread.h -- Thread portability layer                          */
 

-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 _XBT_OS_THREAD_H
-#define _XBT_OS_THREAD_H
+#ifndef XBT_OS_THREAD_H
+#define XBT_OS_THREAD_H

 
 #include "xbt/base.h"
 
 
 #include "xbt/base.h"
 


@@ -74,4 +73,4 @@ XBT_PUBLIC(void) xbt_os_sem_destroy(xbt_os_sem_t sem);
 /** @} */
 
 SG_END_DECL()
 /** @} */
 
 SG_END_DECL()

-#endif                          /* _XBT_OS_THREAD_H */
+#endif /* XBT_OS_THREAD_H */

diff --git a/include/xbt/xbt_os_time.h b/include/xbt/xbt_os_time.h
index b9d9b46..0d3fa3c 100644 (file)
--- a/include/xbt/xbt_os_time.h
+++ b/include/xbt/xbt_os_time.h
@@ -1,7 +1,6 @@
 /*  xbt/xbt_os_timer.h -- system dependency on time functions               */
 
 /*  xbt/xbt_os_timer.h -- system dependency on time functions               */
 

-/* Copyright (c) 2007, 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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. */

diff --git a/src/bindings/java/jtrace.h b/src/bindings/java/jtrace.h
index adfe45c..04c582a 100644 (file)
--- a/src/bindings/java/jtrace.h
+++ b/src/bindings/java/jtrace.h
@@ -8,8 +8,8 @@
 #include <jni.h>
 /* Header for class org_simgrid_trace_Trace */
 
 #include <jni.h>
 /* Header for class org_simgrid_trace_Trace */
 

-#ifndef _Included_org_simgrid_trace_Trace
-#define _Included_org_simgrid_trace_Trace
+#ifndef Included_org_simgrid_trace_Trace
+#define Included_org_simgrid_trace_Trace

 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 2d37e15..b306717 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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 _MC_MC_H
-#define _MC_MC_H
+#ifndef MC_MC_H
+#define MC_MC_H

 
 #include <src/internal_config.h>
 #include <simgrid/simix.h>
 
 #include <src/internal_config.h>
 #include <simgrid/simix.h>


@@ -83,4 +82,4 @@ XBT_PUBLIC(void) MC_memory_init_server();
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _MC_MC_H */
+#endif /* MC_MC_H */

diff --git a/src/include/smpi/smpi_interface.h b/src/include/smpi/smpi_interface.h
index d012318..f9512d9 100644 (file)
--- a/src/include/smpi/smpi_interface.h
+++ b/src/include/smpi/smpi_interface.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-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 _SMPI_INTERFACE_H
-#define _SMPI_INTERFACE_H
+#ifndef SMPI_INTERFACE_H
+#define SMPI_INTERFACE_H

 #include "smpi/smpi.h"
 
 SG_BEGIN_DECL()
 #include "smpi/smpi.h"
 
 SG_BEGIN_DECL()


@@ -99,4 +98,4 @@ XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void);
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _SMPI_INTERFAC_H */
+#endif /* SMPI_INTERFACE_H */

diff --git a/src/include/smpi/smpi_utils.hpp b/src/include/smpi/smpi_utils.hpp
index 8eaaa0c..0f98f38 100644 (file)
--- a/src/include/smpi/smpi_utils.hpp
+++ b/src/include/smpi/smpi_utils.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 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. */
 
 
 /* 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 _SMPI_UTILS_HPP
-#define _SMPI_UTILS_HPP
+#ifndef SMPI_UTILS_HPP
+#define SMPI_UTILS_HPP

 #include "xbt/base.h"
 #include <cstddef>
 #include <vector>
 #include "xbt/base.h"
 #include <cstddef>
 #include <vector>

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 9698c0f..393d3dd 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -1,11 +1,10 @@
-/* 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_MAXMIN_H
-#define _SURF_MAXMIN_H
+#ifndef SURF_MAXMIN_H
+#define SURF_MAXMIN_H

 
 #include "src/internal_config.h"
 #include "xbt/misc.h"
 
 #include "src/internal_config.h"
 #include "xbt/misc.h"


@@ -453,4 +452,4 @@ XBT_PUBLIC(double func_vegas_fpi) (lmm_variable_t var, double x);
 /** @} */
 SG_END_DECL()
 
 /** @} */
 SG_END_DECL()
 

-#endif                          /* _SURF_MAXMIN_H */
+#endif /* SURF_MAXMIN_H */

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index addf3d5..24cc024 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -1,11 +1,10 @@
-/* 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_H
-#define _SURF_SURF_H
+#ifndef SURF_SURF_H
+#define SURF_SURF_H

 
 #include "xbt/swag.h"
 #include "xbt/dynar.h"
 
 #include "xbt/swag.h"
 #include "xbt/dynar.h"


@@ -659,4 +658,4 @@ xbt_graph_t instr_routing_platform_graph ();
 void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
 
 SG_END_DECL()
 void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
 
 SG_END_DECL()

-#endif                          /* _SURF_SURF_H */
+#endif /* SURF_SURF_H */

diff --git a/src/kernel/activity/SynchroComm.hpp b/src/kernel/activity/SynchroComm.hpp
index 37a4b96..7a56db9 100644 (file)
--- a/src/kernel/activity/SynchroComm.hpp
+++ b/src/kernel/activity/SynchroComm.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _SIMIX_SYNCHRO_COMM_HPP
-#define _SIMIX_SYNCHRO_COMM_HPP
+#ifndef SIMIX_SYNCHRO_COMM_HPP
+#define SIMIX_SYNCHRO_COMM_HPP

 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"

diff --git a/src/kernel/activity/SynchroExec.hpp b/src/kernel/activity/SynchroExec.hpp
index 9269975..ad3e1fa 100644 (file)
--- a/src/kernel/activity/SynchroExec.hpp
+++ b/src/kernel/activity/SynchroExec.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _SIMIX_SYNCHRO_EXEC_HPP
-#define _SIMIX_SYNCHRO_EXEC_HPP
+#ifndef SIMIX_SYNCHRO_EXEC_HPP
+#define SIMIX_SYNCHRO_EXEC_HPP

 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"

diff --git a/src/kernel/activity/SynchroIo.hpp b/src/kernel/activity/SynchroIo.hpp
index 59f307f..b9c405d 100644 (file)
--- a/src/kernel/activity/SynchroIo.hpp
+++ b/src/kernel/activity/SynchroIo.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _SIMIX_SYNCHRO_IO_HPP
-#define _SIMIX_SYNCHRO_IO_HPP
+#ifndef SIMIX_SYNCHRO_IO_HPP
+#define SIMIX_SYNCHRO_IO_HPP

 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"

diff --git a/src/kernel/activity/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp
index 035d295..b85e06f 100644 (file)
--- a/src/kernel/activity/SynchroRaw.hpp
+++ b/src/kernel/activity/SynchroRaw.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _SIMIX_SYNCHRO_RAW_HPP
-#define _SIMIX_SYNCHRO_RAW_HPP
+#ifndef SIMIX_SYNCHRO_RAW_HPP
+#define SIMIX_SYNCHRO_RAW_HPP

 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"

diff --git a/src/kernel/activity/SynchroSleep.hpp b/src/kernel/activity/SynchroSleep.hpp
index 0edef63..aca0471 100644 (file)
--- a/src/kernel/activity/SynchroSleep.hpp
+++ b/src/kernel/activity/SynchroSleep.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _SIMIX_SYNCHRO_SLEEP_HPP
-#define _SIMIX_SYNCHRO_SLEEP_HPP
+#ifndef SIMIX_SYNCHRO_SLEEP_HPP
+#define SIMIX_SYNCHRO_SLEEP_HPP

 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include "surf/surf.h"
 #include "src/kernel/activity/ActivityImpl.hpp"

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index 1bbcd8b..fec402e 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
-#define _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP

 
 #include <functional>
 #include <memory>
 
 #include <functional>
 #include <memory>


@@ -23,7 +23,6 @@
 #include "xbt/config.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/function_types.h"
 #include "xbt/config.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/function_types.h"

-#include "src/xbt/ex_interface.h"

 #include "src/instr/instr_private.h"
 #include "src/simix/smx_host_private.h"
 #include "src/simix/smx_io_private.h"
 #include "src/instr/instr_private.h"
 #include "src/simix/smx_host_private.h"
 #include "src/simix/smx_io_private.h"

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index e7b5ada..404b384 100644 (file)
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-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. */


@@ -23,7 +23,6 @@
 #include "src/internal_config.h"
 
 #include "src/xbt/mmalloc/mmprivate.h"
 #include "src/internal_config.h"
 
 #include "src/xbt/mmalloc/mmprivate.h"

-#include "src/xbt/ex_interface.h"

 
 #if HAVE_SMPI
 #include "src/smpi/private.h"
 
 #if HAVE_SMPI
 #include "src/smpi/private.h"

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index e6e2a77..cc57a3c 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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. */


@@ -32,9 +31,7 @@
 #include "src/mc/Process.hpp"
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/mc_smx.h"
 #include "src/mc/Process.hpp"
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/mc_smx.h"

-#endif

 
 

-#if HAVE_MC

 using simgrid::mc::remote;
 #endif
 
 using simgrid::mc::remote;
 #endif
 

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index e62b9c6..1d4dd5f 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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. */

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index 4464b61..5986a19 100644 (file)
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -3,8 +3,8 @@
 /* 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 _SIMIX_ACTORIMPL_H
-#define _SIMIX_ACTORIMPL_H
+#ifndef SIMIX_ACTORIMPL_H
+#define SIMIX_ACTORIMPL_H

 
 #include "simgrid/s4u/Actor.hpp"
 #include "src/simix/popping_private.h"
 
 #include "simgrid/s4u/Actor.hpp"
 #include "src/simix/popping_private.h"

diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h
index 542adbf..abbc756 100644 (file)
--- a/src/simix/popping_private.h
+++ b/src/simix/popping_private.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 _POPPING_PRIVATE_H
-#define _POPPING_PRIVATE_H
+#ifndef SG_POPPING_PRIVATE_H
+#define SG_POPPING_PRIVATE_H

 
 #include <xbt/base.h>
 #include <simgrid/simix.h>
 
 #include <xbt/base.h>
 #include <simgrid/simix.h>

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 2edefd4..b382461 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -1,7 +1,6 @@
 /* a fast and simple context switching library                              */
 
 /* a fast and simple context switching library                              */
 

-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-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. */

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index e94f3cb..1844725 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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. */

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 72a46cc..7b85ee2 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 _SIMIX_HOST_PRIVATE_H
-#define _SIMIX_HOST_PRIVATE_H
+#ifndef SIMIX_HOST_PRIVATE_H
+#define SIMIX_HOST_PRIVATE_H

 
 #include <vector>
 #include <functional>
 
 #include <vector>
 #include <functional>

diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h
index d518efd..b0079cd 100644 (file)
--- a/src/simix/smx_io_private.h
+++ b/src/simix/smx_io_private.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 _SIMIX_IO_PRIVATE_H
-#define _SIMIX_IO_PRIVATE_H
+#ifndef SIMIX_IO_PRIVATE_H
+#define SIMIX_IO_PRIVATE_H

 
 #include <xbt/base.h>
 
 
 #include <xbt/base.h>
 

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index c238e2e..c3a0c34 100644 (file)
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 _SIMIX_NETWORK_PRIVATE_H
-#define _SIMIX_NETWORK_PRIVATE_H
+#ifndef SIMIX_NETWORK_PRIVATE_H
+#define SIMIX_NETWORK_PRIVATE_H

 
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/MailboxImpl.hpp"
 
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/MailboxImpl.hpp"

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 83f295a..f0072b9 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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 _SIMIX_PRIVATE_H
-#define _SIMIX_PRIVATE_H
+#ifndef SIMIX_PRIVATE_H
+#define SIMIX_PRIVATE_H

 
 #include <signal.h>
 #include "src/kernel/context/Context.hpp"
 
 #include <signal.h>
 #include "src/kernel/context/Context.hpp"

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index a8c4dad..c7f882b 100644 (file)
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -3,8 +3,8 @@
 /* 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 _SIMIX_SYNCHRO_PRIVATE_H
-#define _SIMIX_SYNCHRO_PRIVATE_H
+#ifndef SIMIX_SYNCHRO_PRIVATE_H
+#define SIMIX_SYNCHRO_PRIVATE_H

 
 #include "simgrid/s4u/conditionVariable.hpp"
 #include "xbt/swag.h"
 
 #include "simgrid/s4u/conditionVariable.hpp"
 #include "xbt/swag.h"


@@ -83,4 +83,5 @@ XBT_PRIVATE XBT_PRIVATE smx_sem_t SIMIX_sem_init(unsigned int value);
 XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem);
 XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem);
 XBT_PRIVATE int SIMIX_sem_get_capacity(smx_sem_t sem);
 XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem);
 XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem);
 XBT_PRIVATE int SIMIX_sem_get_capacity(smx_sem_t sem);

+

 #endif
 #endif

diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp
index eabf183..8c8bfbb 100644 (file)
--- a/src/surf/maxmin_private.hpp
+++ b/src/surf/maxmin_private.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2004-2014. 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_MAXMIN_PRIVATE_H
-#define _SURF_MAXMIN_PRIVATE_H
+#ifndef SURF_MAXMIN_PRIVATE_H
+#define SURF_MAXMIN_PRIVATE_H

 
 #include "surf/maxmin.h"
 #include "xbt/swag.h"
 
 #include "surf/maxmin.h"
 #include "xbt/swag.h"


@@ -146,6 +145,4 @@ extern XBT_PRIVATE double (*func_f_def) (lmm_variable_t, double);
 extern XBT_PRIVATE double (*func_fp_def) (lmm_variable_t, double);
 extern XBT_PRIVATE double (*func_fpi_def) (lmm_variable_t, double);
 
 extern XBT_PRIVATE double (*func_fp_def) (lmm_variable_t, double);
 extern XBT_PRIVATE double (*func_fpi_def) (lmm_variable_t, double);
 

-#endif                          /* _SURF_MAXMIN_PRIVATE_H */
-
-
+#endif /* SURF_MAXMIN_PRIVATE_H */

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index 4603ebc..e667ade 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 _NS3_INTERFACE_H
-#define _NS3_INTERFACE_H
+#ifndef NS3_INTERFACE_H
+#define NS3_INTERFACE_H

 
 #include <simgrid/s4u/host.hpp>
 
 
 #include <simgrid/s4u/host.hpp>
 

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 2847a60..a72264e 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2015. 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 _NS3_SIM_H
-#define _NS3_SIM_H
+#ifndef NS3_SIM_H
+#define NS3_SIM_H

 
 #include <cstdint>
 
 
 #include <cstdint>
 

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 0e59409..c7f25d9 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -1,10 +1,10 @@
-/* Copyright (c) 2004-2016. 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 "surf/surf.h"
 #include "surf/maxmin.h"


@@ -55,4 +55,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 /* SURF_SURF_PRIVATE_H */

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
deleted file mode 100644 (file)
index 1bf0d25..0000000
--- a/src/surf/surf_routing.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2009-2016. 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/dict.h"
-

diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp
index bf45199..3260d66 100644 (file)
--- a/src/surf/trace_mgr.hpp
+++ b/src/surf/trace_mgr.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2004-2007, 2009-2014. 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_TMGR_H
-#define _SURF_TMGR_H
+#ifndef SURF_TMGR_H
+#define SURF_TMGR_H

 
 #include "xbt/heap.h"
 #include "simgrid/forward.h"
 
 #include "xbt/heap.h"
 #include "simgrid/forward.h"


@@ -94,4 +93,4 @@ private:
 }} // namespace simgrid::trace_mgr
 #endif /* C++ only */
 
 }} // namespace simgrid::trace_mgr
 #endif /* C++ only */
 

-#endif                          /* _SURF_TMGR_H */
+#endif /* SURF_TMGR_H */

diff --git a/src/surf/xml/platf.hpp b/src/surf/xml/platf.hpp
index 8c9f25a..3804aba 100644 (file)
--- a/src/surf/xml/platf.hpp
+++ b/src/surf/xml/platf.hpp
@@ -1,11 +1,10 @@
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-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_SURFXML_PARSE_H
-#define _SURF_SURFXML_PARSE_H
+#ifndef SURF_SURFXML_PARSE_H
+#define SURF_SURFXML_PARSE_H

 
 #include <xbt/dict.h>
 #include <xbt/function_types.h>
 
 #include <xbt/dict.h>
 #include <xbt/function_types.h>

diff --git a/src/xbt/backtrace_dummy.cpp b/src/xbt/backtrace_dummy.cpp
index 439686c..a9e8246 100644 (file)
--- a/src/xbt/backtrace_dummy.cpp
+++ b/src/xbt/backtrace_dummy.cpp
@@ -1,14 +1,12 @@
 /* backtrace_dummy -- stubs of this module for non-supported archs          */
 
 /* backtrace_dummy -- stubs of this module for non-supported archs          */
 

-/* Copyright (c) 2008-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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/ex.h"
 #include "src/xbt_modinter.h"
 
 /* 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/ex.h"
 #include "src/xbt_modinter.h"

-#include "src/xbt/ex_interface.h"

 
 #include <xbt/backtrace.hpp>
 
 
 #include <xbt/backtrace.hpp>
 

diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp
index e3ec640..cb8ef6d 100644 (file)
--- a/src/xbt/backtrace_linux.cpp
+++ b/src/xbt/backtrace_linux.cpp
@@ -1,8 +1,7 @@
 /* backtrace_linux - backtrace displaying on linux platform                 */
 /* This file is included by ex.cpp on need (have execinfo.h, popen & addrline)*/
 
 /* backtrace_linux - backtrace displaying on linux platform                 */
 /* This file is included by ex.cpp on need (have execinfo.h, popen & addrline)*/
 

-/* Copyright (c) 2008-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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. */


@@ -21,7 +20,6 @@
 #include <xbt/string.hpp>
 #include <xbt/backtrace.hpp>
 #include "xbt/ex.h"
 #include <xbt/string.hpp>
 #include <xbt/backtrace.hpp>
 #include "xbt/ex.h"

-#include "src/xbt/ex_interface.h"

 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/module.h"         /* xbt_binary_name */
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/module.h"         /* xbt_binary_name */

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 0b4e57f..dd21a45 100644 (file)
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,14 +1,13 @@
 /* dict_elm - elements of generic dictionnaries                             */
 /* dict_elm - elements of generic dictionnaries                             */

-/* This file is not to be loaded from anywhere but dict.cpp                   */
+/* This file is not to be loaded from anywhere but dict.cpp                 */

 
 

-/* Copyright (c) 2004-2011, 2013-2014. 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 _XBT_DICT_PRIVATE_H__
-#define _XBT_DICT_PRIVATE_H__
+#ifndef XBT_DICT_PRIVATE_H
+#define XBT_DICT_PRIVATE_H

 
 #include "xbt/base.h"
 #include "xbt/sysdep.h"
 
 #include "xbt/base.h"
 #include "xbt/sysdep.h"


@@ -56,4 +55,4 @@ XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, vo
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* _XBT_DICT_PRIVATE_H_ */
+#endif /* XBT_DICT_PRIVATE_H */

diff --git a/src/xbt/ex.cpp b/src/xbt/ex.cpp
index da1dc69..f6db218 100644 (file)
--- a/src/xbt/ex.cpp
+++ b/src/xbt/ex.cpp
@@ -1,7 +1,6 @@
 /* ex - Exception Handling                                                  */
 
 /* ex - Exception Handling                                                  */
 

-/* Copyright (c) 2005-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2005-2017. The SimGrid Team. All rights reserved.          */

 
 /*  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>       */
 /*  Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/>         */
 
 /*  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>       */
 /*  Copyright (c) 2002-2004 The OSSP Project <http://www.ossp.org/>         */


@@ -56,7 +55,6 @@
 #include "xbt/str.h"
 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
 
 #include "xbt/str.h"
 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
 

-#include "src/xbt/ex_interface.h"

 #include "simgrid/sg_config.h"  /* Configuration mechanism of SimGrid */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");
 #include "simgrid/sg_config.h"  /* Configuration mechanism of SimGrid */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");

diff --git a/src/xbt/ex_interface.h b/src/xbt/ex_interface.h
deleted file mode 100644 (file)
index 3c7599e..0000000
--- a/src/xbt/ex_interface.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ex -- exception handling                                                 */
-/* This file is to loaded in any location defining exception handlers       */
-/* (such as context.c), to exchange them.        */
-
-/* Copyright (c) 2006-2007, 2009-2010, 2012-2014. 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 _XBT_EX_INTERFACE_H_
-#define _XBT_EX_INTERFACE_H_
-
-#include <cstddef>
-
-#include <vector>
-#include <string>
-
-#include "xbt/base.h"
-#include "xbt/backtrace.h"
-
-namespace simgrid {
-namespace xbt {
-
-}
-}
-
-#endif                          /* _XBT_EX_INTERFACE_H_ */

diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h
index 3fc5791..1f2887e 100644 (file)
--- a/src/xbt/graph_private.h
+++ b/src/xbt/graph_private.h
@@ -1,11 +1,10 @@
-/* Copyright (c) 2006, 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-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 _XBT_GRAPH_PRIVATE_H
-#define _XBT_GRAPH_PRIVATE_H
+#ifndef XBT_GRAPH_PRIVATE_H
+#define XBT_GRAPH_PRIVATE_H

 
 #include "xbt/base.h"
 #include "xbt/dynar.h"
 
 #include "xbt/base.h"
 #include "xbt/dynar.h"


@@ -13,4 +12,4 @@
 
 XBT_PRIVATE void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d, xbt_node_t * p);
 
 
 XBT_PRIVATE void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d, xbt_node_t * p);
 

-#endif                          /* _XBT_GRAPH_PRIVATE_H */
+#endif /* XBT_GRAPH_PRIVATE_H */

diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h
index 0186ee1..aa47023 100644 (file)
--- a/src/xbt/heap_private.h
+++ b/src/xbt/heap_private.h
@@ -1,15 +1,14 @@
-/* Copyright (c) 2004-2005, 2007, 2009-2014. 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 _XBT_HEAP_PRIVATE_H
-#define _XBT_HEAP_PRIVATE_H
+#ifndef XBT_HEAP_PRIVATE_H
+#define XBT_HEAP_PRIVATE_H

 
 

-#include "xbt/dynar.h"          /* void_f_pvoid_t */
-#include "xbt/heap.h"

 #include <float.h>
 #include <float.h>

+#include <xbt/dynar.h>
+#include <xbt/heap.h>

 
 typedef struct xbt_heap_item {
   void *content;
 
 typedef struct xbt_heap_item {
   void *content;


@@ -33,4 +32,4 @@ typedef struct xbt_heap {
 
 #define MIN_KEY_VALUE -DBL_MAX
 
 
 #define MIN_KEY_VALUE -DBL_MAX
 

-#endif                          /* _XBT_HEAP_PRIVATE_H */
+#endif /* XBT_HEAP_PRIVATE_H */

diff --git a/src/xbt/mallocator_private.h b/src/xbt/mallocator_private.h
index 3bc4d8c..ec34658 100644 (file)
--- a/src/xbt/mallocator_private.h
+++ b/src/xbt/mallocator_private.h
@@ -1,13 +1,12 @@
 /* mallocator - recycle objects to avoid malloc() / free()                  */
 
 /* mallocator - recycle objects to avoid malloc() / free()                  */
 

-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-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 _XBT_MALLOCATOR_PRIVATE_H__
-#define _XBT_MALLOCATOR_PRIVATE_H__
+#ifndef XBT_MALLOCATOR_PRIVATE_H
+#define XBT_MALLOCATOR_PRIVATE_H

 
 #include <xbt/function_types.h>
 
 
 #include <xbt/function_types.h>
 


@@ -21,4 +20,4 @@ typedef struct s_xbt_mallocator {
   int lock;                     /* lock to ensure the mallocator is thread-safe */
 } s_xbt_mallocator_t;
 
   int lock;                     /* lock to ensure the mallocator is thread-safe */
 } s_xbt_mallocator_t;
 

-#endif                          /* _XBT_MALLOCATOR_PRIVATE_H__ */
+#endif /* XBT_MALLOCATOR_PRIVATE_H */

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index cba3208..6171035 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -1,7 +1,6 @@
 /* Declarations for `mmalloc' and friends. */
 
 /* Declarations for `mmalloc' and friends. */
 

-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-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. */


@@ -11,8 +10,8 @@
    Written May 1989 by Mike Haertel.
    Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */
 
    Written May 1989 by Mike Haertel.
    Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */
 

-#ifndef __MMPRIVATE_H
-#define __MMPRIVATE_H 1
+#ifndef XBR_MMPRIVATE_H
+#define XBT_MMPRIVATE_H 1

 
 #include <xbt/base.h>
 #include <xbt/misc.h>
 
 #include <xbt/base.h>
 #include <xbt/misc.h>


@@ -322,4 +321,4 @@ XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_
 
 SG_END_DECL()
 
 
 SG_END_DECL()
 

-#endif                          /* __MMPRIVATE_H */
+#endif /* XBT_MMPRIVATE_H */

diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp
index 074b53c..67ed936 100644 (file)
--- a/src/xbt/parmap.cpp
+++ b/src/xbt/parmap.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2005, 2007, 2009-2014. 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. */

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 496cc47..f042417 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,7 +1,6 @@
 /* module handling                                                          */
 
 /* module handling                                                          */
 

-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-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. */

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f4f901e..2a28a03 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -77,7 +77,6 @@ set(EXTRA_DIST
   src/xbt/backtrace_dummy.cpp
   src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h
   src/xbt/backtrace_dummy.cpp
   src/xbt/backtrace_linux.cpp
   src/xbt/dict_private.h

-  src/xbt/ex_interface.h

   src/xbt/graph_private.h
   src/xbt/heap_private.h
   src/xbt/log_private.h
   src/xbt/graph_private.h
   src/xbt/heap_private.h
   src/xbt/log_private.h


@@ -325,7 +324,6 @@ set(SURF_SRC
   src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp
   src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp

-  src/surf/surf_routing.cpp

   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp