From: Arnaud Giersch Date: Thu, 5 Dec 2019 21:06:21 +0000 (+0100) Subject: Replace non-breaking spaces. X-Git-Tag: v3.25~334^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6c8dd229d394fdaf20facf604f7be86a5df1e368?hp=52f3898881606b361670261250f095b0680c76de Replace non-breaking spaces. --- diff --git a/.travis.yml b/.travis.yml index b3d83be8c7..075e11e2d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# NS3 is disabled because the version in ubuntu precise does not lead +# NS3 is disabled because the version in ubuntu precise does not lead # to the same timings (precision error?) # Reenable with # cmake -Denable_ns3 diff --git a/BuildSimGrid.sh b/BuildSimGrid.sh index 526f3f09f4..811199fad2 100755 --- a/BuildSimGrid.sh +++ b/BuildSimGrid.sh @@ -5,7 +5,7 @@ # # Copyright (c) 2017-2019 The SimGrid Team. Licence: LGPL of WDFPL, as you want. -if [ ! -e Makefile ] ; then +if [ ! -e Makefile ] ; then if [ -e build/default/Makefile ] ; then cd build/default else diff --git a/ChangeLog b/ChangeLog index 7092bc12bd..60b9e1eb34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -670,7 +670,7 @@ SimGrid (3.18) Released December 24 2017 - #230: segfaults when exit() without run() - #225: s4u::Actor::kill() doesn not really kill victims in a join() - #223: MSG_task_get_flops_amount() not working with parallel tasks - - #222: Actor::kill() doesn't really kill and segfaults + - #222: Actor::kill() doesn't really kill and segfaults - #221: odd LMM warning when killing an actor - #120: Memory leak when the processes are forcefully killed diff --git a/README.md b/README.md index ef6d3b1813..1a9091edac 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Documentation: [online](https://simgrid.org/doc/latest/Installing_SimGrid.html#i [local copy](docs/source/Installing_SimGrid.rst). TL;DR: ``` cmake -DCMAKE_INSTALL_PREFIX=/opt/simgrid . -# Check the full list of options with `cmake -LH` +# Check the full list of options with `cmake -LH` make make install ``` diff --git a/docs/Build.sh b/docs/Build.sh index 8bb15b214d..6ef952ae57 100755 --- a/docs/Build.sh +++ b/docs/Build.sh @@ -3,18 +3,18 @@ # Simplistic script to rebuild our documentation with sphinx-build # Python needs to find simgrid on my machine, but not ctest -- sorry for the hack -if [ -e /opt/simgrid ] ; then chmod +x /opt/simgrid; fi +if [ -e /opt/simgrid ] ; then chmod +x /opt/simgrid; fi set -e -if [ "x$1" != 'xdoxy' -a -e build/xml ] ; then +if [ "x$1" != 'xdoxy' -a -e build/xml ] ; then echo "Doxygen not rerun: 'doxy' was not provided as an argument" else rm -rf build/xml source/api/ cd source; doxygen; cd .. fi -if [ "x$1" != 'xjava' -a -e source/java ] ; then +if [ "x$1" != 'xjava' -a -e source/java ] ; then echo "javasphinx not rerun: 'java' was not provided as an argument" else rm -rf source/java @@ -54,7 +54,7 @@ do done set +e # Don't fail -if [ -e /usr/bin/linkchecker ] ; then +if [ -e /usr/bin/linkchecker ] ; then linkchecker --no-status -o csv --ignore-url='.*\.css$' --ignore-url=build/html/_modules --ignore-url=public/java/org build/html \ | grep -v '^#' \ | grep -v 'urlname;parentname;baseref;result;warningstring' diff --git a/docs/source/conf.py b/docs/source/conf.py index 1839d11d5c..eee9b19573 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,7 +15,7 @@ import os import subprocess -# Search for our extensions too +# Search for our extensions too import sys sys.path.append(os.path.abspath('_ext')) diff --git a/docs/source/index.rst b/docs/source/index.rst index 590292ff5c..ce04250361 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -63,21 +63,21 @@ of every page. Bugs in the code should be reported :caption: User Manual: Introduction -    Installing SimGrid -    Start your Own Project + Installing SimGrid + Start your Own Project Describing your Application -    The S4U Interface -    The SMPI Interface -    The MSG Interface + The S4U Interface + The SMPI Interface + The MSG Interface Describing the Simulated Platform -    Examples -    Modeling Hints -    XML Reference + Examples + Modeling Hints + XML Reference Describing the Experimental Setup -    Configuring SimGrid -    Deploying your Application + Configuring SimGrid + Deploying your Application The SimGrid Models -    ns-3 as a SimGrid model + ns-3 as a SimGrid model SimGrid Plugins Simulation Outcomes The SimGrid Community diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index 29ecf4fbdd..7565b6ca22 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -1,5 +1,5 @@ -# Regular examples: with only one source and tested with all factories +# Regular examples: with only one source and tested with all factories ###################################################################### foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill @@ -32,7 +32,7 @@ foreach (example actor-create actor-daemon actor-exiting actor-join actor-kill endforeach() -# Model-checking examples: with only one source and tested with all factories but thread +# Model-checking examples: with only one source and tested with all factories but thread ###################################################################### foreach (example mc-failing-assert) diff --git a/sonar-project.properties b/sonar-project.properties index ee9764b026..4fbd2e31bf 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -22,17 +22,17 @@ sonar.issue.ignore.multicriteria.j1.ruleKey=squid:ObjectFinalizeOverridenCheck sonar.issue.ignore.multicriteria.j1.resourceKey=**/*.java # Throwable.printStackTrace(...) should not be called -# But we don't have no better mechanism, and our Java apps are not rocket science +# But we don't have no better mechanism, and our Java apps are not rocket science sonar.issue.ignore.multicriteria.j2.ruleKey=squid:S1148 sonar.issue.ignore.multicriteria.j2.resourceKey=**/*.java # Using command line arguments is security-sensitive -# But the authors of the applications using our library will be their only users, so there is no security concern +# But the authors of the applications using our library will be their only users, so there is no security concern sonar.issue.ignore.multicriteria.j3.ruleKey=squid:S4823 sonar.issue.ignore.multicriteria.j3.resourceKey=**/*.java # Standard outputs should not be used directly to log anything -# But this file is used before SimGrid is initialized +# But this file is used before SimGrid is initialized sonar.issue.ignore.multicriteria.j4.ruleKey=squid:S106 sonar.issue.ignore.multicriteria.j4.resourceKey=src/bindings/java/org/simgrid/NativeLib.java diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 82d9aa5b05..123b4c167e 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -87,7 +87,7 @@ class Simcall(object): def accessors(self): res = [] res.append('') - regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$") #  to compute the raw type + regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$") # to compute the raw type # Arguments getter/setters for i in range(len(self.args)): arg = self.args[i] diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in index b8d6d401f9..dafc8806c8 100755 --- a/src/smpi/smpicxx.in +++ b/src/smpi/smpicxx.in @@ -81,7 +81,7 @@ list_add_not_empty CMDLINE "${CMDARGS}" list_add_not_empty CMDLINE "${LINKARGS}" eval $(list_get CMDLINE) -if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then +if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then echo "$@" [ "x$show" = x1 ] && exit 0 fi diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake index 8ae23e59a5..14540fbbe3 100644 --- a/tools/cmake/Modules/FindLibunwind.cmake +++ b/tools/cmake/Modules/FindLibunwind.cmake @@ -26,11 +26,11 @@ endif() # - Calls include_directories() on where libunwind.h lives # - Calls link_directories() on where the libs live -# Of course also need the core lib +# Of course also need the core lib set(LIBUNWIND_COMPONENTS ${LIBUNWIND_COMPONENTS} "unwind") message(STATUS "Looking for libunwind:") -# Let's assume we have it, and invalidate if parts are missing +# Let's assume we have it, and invalidate if parts are missing SET(HAVE_LIBUNWIND 1) # diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index b430dea117..9c4da5b978 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -65,7 +65,7 @@ MACRO(ADD_TESH_FACTORIES NAME FACTORIES) LIST(REMOVE_AT ARGR 0) ENDFOREACH() FOREACH(FACTORY ${FACTORIES}) - if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads + if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads (${FACTORY} STREQUAL "boost" AND HAVE_BOOST_CONTEXTS) OR (${FACTORY} STREQUAL "raw" AND HAVE_RAW_CONTEXTS) OR (${FACTORY} STREQUAL "ucontext" AND HAVE_UCONTEXT_CONTEXTS)) @@ -81,7 +81,7 @@ MACRO(SET_TESH_PROPERTIES NAME FACTORIES) LIST(REMOVE_AT ARGR 0) ENDFOREACH() FOREACH(FACTORY ${FACTORIES}) - if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads + if ((${FACTORY} STREQUAL "thread" ) OR # Always available, thanks to C++11 threads (${FACTORY} STREQUAL "boost" AND HAVE_BOOST_CONTEXTS) OR (${FACTORY} STREQUAL "raw" AND HAVE_RAW_CONTEXTS) OR (${FACTORY} STREQUAL "ucontext" AND HAVE_UCONTEXT_CONTEXTS))