From 4d348a3f60093facd6c014a1ebad368e97b57fd0 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 25 Apr 2019 17:56:47 +0200 Subject: [PATCH] Update URLs (FG #1). NOTE: * still missing: pls_ns3.html * old style (lower case): platform.html --- README.md | 2 +- docs/manpages/smpirun.1 | 2 +- examples/smpi/replay_multiple/replay_multiple.tesh | 2 +- examples/smpi/smpi_msg_masterslave/msg_smpi.tesh | 2 +- src/kernel/context/ContextSwapped.cpp | 5 +++-- src/smpi/internals/smpi_global.cpp | 6 ++++-- src/smpi/internals/smpi_shared.cpp | 13 +++++++------ src/surf/xml/simgrid.dtd | 2 +- src/surf/xml/simgrid_dtd.c | 2 +- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3d3e7e5119..f96a531dd7 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/gvcssh340fwtoc35?svg=true)](https://ci.appveyor.com/project/mquinson/simgrid) [![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=simgrid&metric=alert_status)](https://sonarcloud.io/dashboard/?id=simgrid) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bf1bdba50440485fbda2ac19f462ccc7)](https://www.codacy.com/app/mquinson/simgrid?utm_source=github.com&) -[![Doc](https://readthedocs.org/projects/pip/badge/?version=stable)](http://simgrid.gforge.inria.fr/simgrid/latest/doc/) +[![Doc](https://readthedocs.org/projects/pip/badge/?version=stable)](https://simgrid.org/doc/latest/) [![License: LGPL v3][license-badge]](COPYING) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1845/badge)](https://bestpractices.coreinfrastructure.org/projects/1845) diff --git a/docs/manpages/smpirun.1 b/docs/manpages/smpirun.1 index a3cb87140e..79a804683c 100644 --- a/docs/manpages/smpirun.1 +++ b/docs/manpages/smpirun.1 @@ -71,7 +71,7 @@ Name of the tracefile You can change many simulation parameter on the command line by passing \fB--cfg\fR=\fIparameter\fR:\fIvalue\fR after the program name. A full list of existing parameters and their meaning can be found at -http://simgrid.gforge.inria.fr/simgrid/latest/doc/options.html +https://simgrid.org/doc/latest/Configuring_SimGrid.html Here are some options commonly used with SMPI: .TP diff --git a/examples/smpi/replay_multiple/replay_multiple.tesh b/examples/smpi/replay_multiple/replay_multiple.tesh index 9ca0587915..c1376d79c0 100644 --- a/examples/smpi/replay_multiple/replay_multiple.tesh +++ b/examples/smpi/replay_multiple/replay_multiple.tesh @@ -7,7 +7,7 @@ p This test needs maxmin/concurrency-limit=100 because it starts 64 hosts on 5 m ! timeout 120 $ ./replay_multiple description_file ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${bindir:=.}/deployment.xml --log=smpi.:info --cfg=maxmin/concurrency-limit:100 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/concurrency-limit' to '100' -> [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/host-speed:" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. +> [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/host-speed:" to set its value. Check https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more information. > [0.000000] [msg_test/INFO] Initializing instance 1 of size 32 > [0.000000] [msg_test/INFO] Initializing instance 2 of size 32 > [Ginette:2:(34) 37298.251477] [smpi_replay/INFO] Simulation time 10442.494756 diff --git a/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh b/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh index 37644eede4..a6030832fb 100644 --- a/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh +++ b/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh @@ -1,7 +1,7 @@ p Test the use of SMPI+MSG in the same file, as well as several different SMPI instances at the same time $ ./masterslave_mailbox_smpi ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/deployment_masterslave_mailbox_smpi.xml --log=smpi.:info --cfg=smpi/simulate-computation:no > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/simulate-computation' to 'no' -> [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/host-speed:" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. +> [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/host-speed:" to set its value. Check https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more information. > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 1 slaves and 20 tasks to process > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "slave-0" > [Ginette:master_mpi:(3) 0.000000] [msg_test/INFO] here for rank 0 diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 3d7740ff0c..9263c633df 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -86,8 +86,9 @@ SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, "Failed to protect stack: %s.\n" "If you are running a lot of actors, you may be exceeding the amount of mappings allowed per process.\n" "On Linux systems, change this value with sudo sysctl -w vm.max_map_count=newvalue (default value: 65536)\n" - "Please see http://simgrid.gforge.inria.fr/simgrid/latest/doc/html/options.html#options_virt for more " - "info.", + "Please see " + "https://simgrid.org/doc/latest/Configuring_SimGrid.html#configuring-the-user-code-virtualization for more " + "information.", strerror(errno)); /* This is fatal. We are going to fail at some point when we try reusing this. */ } diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 53a59d3c60..15727be668 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -241,8 +241,10 @@ static void smpi_check_options() if (simgrid::config::is_default("smpi/host-speed")) { XBT_INFO("You did not set the power of the host running the simulation. " "The timings will certainly not be accurate. " - "Use the option \"--cfg=smpi/host-speed:\" to set its value." - "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information."); + "Use the option \"--cfg=smpi/host-speed:\" to set its value. " + "Check " + "https://simgrid.org/doc/latest/Configuring_SimGrid.html#automatic-benchmarking-of-smpi-code for more " + "information."); } xbt_assert(simgrid::config::get_value("smpi/cpu-threshold") >= 0, diff --git a/src/smpi/internals/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp index 642eff5557..cfc746ee9f 100644 --- a/src/smpi/internals/smpi_shared.cpp +++ b/src/smpi/internals/smpi_shared.cpp @@ -129,12 +129,13 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) { void* mem = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if(mem == MAP_FAILED) { - xbt_die( - "Failed to map fd %d with size %zu: %s\n" - "If you are running a lot of ranks, you may be exceeding the amount of mappings allowed per process.\n" - "On Linux systems, change this value with sudo sysctl -w vm.max_map_count=newvalue (default value: 65536)\n" - "Please see http://simgrid.gforge.inria.fr/simgrid/latest/doc/html/options.html#options_virt for more info.", - fd, size, strerror(errno)); + xbt_die("Failed to map fd %d with size %zu: %s\n" + "If you are running a lot of ranks, you may be exceeding the amount of mappings allowed per process.\n" + "On Linux systems, change this value with sudo sysctl -w vm.max_map_count=newvalue (default value: 65536)\n" + "Please see " + "https://simgrid.org/doc/latest/Configuring_SimGrid.html#configuring-the-user-code-virtualization for more " + "information.", + fd, size, strerror(errno)); } snprintf(loc, PTR_STRLEN, "%p", mem); meta.size = size; diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd index 65543dc6e5..6c5d0f18f8 100644 --- a/src/surf/xml/simgrid.dtd +++ b/src/surf/xml/simgrid.dtd @@ -1,7 +1,7 @@