Merge branch 'master' of framagit.org:simgrid/simgrid

diff --git a/.gitignore b/.gitignore
index 826ff7e..96905b6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -91,7 +91,6 @@ doc/html
 doc/index.php
 doc/simgrid.tag
 doc/doxygen/logcategories.doc
-doc/simgrid_modules.map
 doc/javadoc
 doc/example_lists/
 ### Specific of project 

diff --git a/MANIFEST.in b/MANIFEST.in
index b2f3889..53b252d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 # This file lists the content of the python source package
 # Prepared in tools/cmake/Distrib.cmake
-include MANIFEST.in
+
 include doc/webcruft/Paje_MSG_screenshot.jpg
 include doc/webcruft/Paje_MSG_screenshot_thn.jpg
 include doc/webcruft/SGicon.gif
@@ -1738,7 +1738,10 @@ include teshsuite/xbt/signals/signals.tesh
 include tools/MSG_visualization/colorize.pl
 include tools/MSG_visualization/trace2fig.pl
 include tools/address_sanitizer.supp
+<<<<<<< HEAD
 include tools/doxygen/fig2dev_postprocessor.pl
+=======
+>>>>>>> 0e860ce2fbd8d2781d6c1129bb41cb788380f398
 include tools/fix-paje-trace.sh
 include tools/generate-dwarf-functions
 include tools/graphicator/graphicator.cpp
@@ -2778,7 +2781,6 @@ include tools/cmake/test_prog/prog_makecontext.c
 include tools/cmake/test_prog/prog_stackgrowth.c
 include tools/cmake/test_prog/prog_stacksetup.c
 include tools/cmake/test_prog/prog_tsan.cpp
-include tools/doxygen/fig2dev_postprocessor.pl
 include tools/doxygen/list_routing_models_examples.sh
 include tools/graphicator/CMakeLists.txt
 include tools/lualib.patch
@@ -2791,4 +2793,3 @@ include tools/stack-cleaner/clean-stack-filter
 include tools/stack-cleaner/compiler-wrapper
 include tools/stack-cleaner/fortran
 include tools/tesh/CMakeLists.txt
-include tools/tesh/generate_tesh

diff --git a/doc/doxygen/uhood_arch.doc b/doc/doxygen/uhood_arch.doc
index 617f89b..7ee3fde 100644 (file)
--- a/doc/doxygen/uhood_arch.doc
+++ b/doc/doxygen/uhood_arch.doc
@@ -15,9 +15,7 @@ page.
 
 @htmlonly
 <center>
-@endhtmlonly
-@htmlinclude simgrid_modules.map
-@htmlonly
+<tt>htmlinclude simgrid_modules.map<tt>
 <br><b>SimGrid Components (click to jump to API)</b>
 </center>
 @endhtmlonly

diff --git a/src/mc/inspect/mc_dwarf.cpp b/src/mc/inspect/mc_dwarf.cpp
index e025303..87e6f7a 100644 (file)
--- a/src/mc/inspect/mc_dwarf.cpp
+++ b/src/mc/inspect/mc_dwarf.cpp
@@ -165,20 +165,21 @@ static FormClass classify_form(int form)
   static const std::unordered_map<int, FormClass> map = {
       {DW_FORM_addr, FormClass::Address},
 
-      {DW_FORM_block2, FormClass::Block},       {DW_FORM_block4, FormClass::Block},
-      {DW_FORM_block, FormClass::Block},        {DW_FORM_block1, FormClass::Block},
+      {DW_FORM_block2, FormClass::Block},           {DW_FORM_block4, FormClass::Block},
+      {DW_FORM_block, FormClass::Block},            {DW_FORM_block1, FormClass::Block},
 
-      {DW_FORM_data1, FormClass::Constant},     {DW_FORM_data2, FormClass::Constant},
-      {DW_FORM_data4, FormClass::Constant},     {DW_FORM_data8, FormClass::Constant},
-      {DW_FORM_udata, FormClass::Constant},     {DW_FORM_sdata, FormClass::Constant},
+      {DW_FORM_data1, FormClass::Constant},         {DW_FORM_data2, FormClass::Constant},
+      {DW_FORM_data4, FormClass::Constant},         {DW_FORM_data8, FormClass::Constant},
+      {DW_FORM_udata, FormClass::Constant},         {DW_FORM_sdata, FormClass::Constant},
+      {DW_FORM_implicit_const, FormClass::Constant},
 
-      {DW_FORM_string, FormClass::String},      {DW_FORM_strp, FormClass::String},
+      {DW_FORM_string, FormClass::String},          {DW_FORM_strp, FormClass::String},
 
-      {DW_FORM_ref_addr, FormClass::Reference}, {DW_FORM_ref1, FormClass::Reference},
-      {DW_FORM_ref2, FormClass::Reference},     {DW_FORM_ref4, FormClass::Reference},
-      {DW_FORM_ref8, FormClass::Reference},     {DW_FORM_ref_udata, FormClass::Reference},
+      {DW_FORM_ref_addr, FormClass::Reference},     {DW_FORM_ref1, FormClass::Reference},
+      {DW_FORM_ref2, FormClass::Reference},         {DW_FORM_ref4, FormClass::Reference},
+      {DW_FORM_ref8, FormClass::Reference},         {DW_FORM_ref_udata, FormClass::Reference},
 
-      {DW_FORM_flag, FormClass::Flag},          {DW_FORM_flag_present, FormClass::Flag},
+      {DW_FORM_flag, FormClass::Flag},              {DW_FORM_flag_present, FormClass::Flag},
 
       {DW_FORM_exprloc, FormClass::ExprLoc}
 

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 03f2bdc..b05f9f9 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,7 +4,6 @@ set(bin_files ${bin_files}    ${CMAKE_CURRENT_SOURCE_DIR}/fix-paje-trace.sh
                               ${CMAKE_CURRENT_SOURCE_DIR}/sg_xml_unit_converter.py
                               ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_update_xml.pl
                               ${CMAKE_CURRENT_SOURCE_DIR}/simgrid_convert_TI_traces.py
-                              ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/fig2dev_postprocessor.pl
                               ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/colorize.pl
                               ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/trace2fig.pl          PARENT_SCOPE)
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8676c72..fafbc4f 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -78,7 +78,6 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mrealloc.c
   src/xbt/mmalloc/swag.c
   src/xbt/mmalloc/swag.h
-  tools/tesh/generate_tesh
   tools/lualib.patch
   teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
@@ -980,7 +979,6 @@ set(DOC_SOURCES
   )
 
 set(DOC_TOOLS
-  tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/list_routing_models_examples.sh
   )
 

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index e8ca613..3c39e46 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -200,7 +200,6 @@ add_custom_target(dist-dir
 add_dependencies(dist-dir maintainer_files)
 
 set(dirs_in_tarball "")
-set(PYTHON_SOURCES "include MANIFEST.in")
 foreach(file ${source_to_pack})
   #message(${file})
   # This damn prefix is still set somewhere (seems to be in subdirs)

diff --git a/tools/cmake/Documentation.cmake b/tools/cmake/Documentation.cmake
index df4b530..d5a7979 100644 (file)
--- a/tools/cmake/Documentation.cmake
+++ b/tools/cmake/Documentation.cmake
@@ -53,7 +53,6 @@ if(enable_documentation)
   endforeach()
 
   ADD_CUSTOM_COMMAND(TARGET documentation
-    COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_BINARY_DIR}/doc/simgrid_modules.map
     COMMAND pwd
     COMMAND ${CMAKE_COMMAND} -E echo "XX Generate list of files in examples/ for routing models"
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc/example_lists/
@@ -69,7 +68,6 @@ if(enable_documentation)
     COMMAND ${CMAKE_HOME_DIRECTORY}/tools/doxygen/list_routing_models_examples.sh '<link_ctn ' > ${CMAKE_BINARY_DIR}/doc/example_lists/example_filelist_xmltag_linkctn
     COMMAND ${CMAKE_COMMAND} -E echo "XX Run doxygen"
     COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
-    COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/doc/simgrid_modules.map
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
   )
 
@@ -82,7 +80,7 @@ if(enable_documentation)
 
     COMMAND ${RSYNC_CMD} doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/doc/ || true
 
-    COMMAND ${RSYNC_CMD} doc/html/simgrid_modules2.png doc/html/simgrid_modules.png /${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
+    COMMAND ${RSYNC_CMD} /${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
     /${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/${release_version}/
 
     COMMAND ${RSYNC_CMD} ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd scm.gforge.inria.fr:/home/groups/simgrid/htdocs/simgrid/

diff --git a/tools/doxygen/fig2dev_postprocessor.pl b/tools/doxygen/fig2dev_postprocessor.pl
deleted file mode 100755 (executable)
index 9d6c70d..0000000
--- a/tools/doxygen/fig2dev_postprocessor.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env perl
-
-# Copyright (c) 2010-2021. 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.
-
-use strict;
-
-my $print = 0;
-my $line;
-
-while($line=<STDIN>) {
-    chomp $line;
-    if($line=~/IMG/) {$print=1;}
-    if($print) {print $line."\n";}
-    if($line=~/\/MAP/) {$print=0;}
-}
-#perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g'