Fix some more problems in the doc + cosmetics + extend python a bit

[simgrid.git] / docs / source / app_s4u.rst

diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst
index e2c61ed..c865743 100644 (file)
--- a/docs/source/app_s4u.rst
+++ b/docs/source/app_s4u.rst
@@ -670,6 +670,9 @@ Querying info
       .. autofunction:: simgrid.this_actor.get_host
       .. autofunction:: simgrid.this_actor.set_host
 
+      .. autofunction:: simgrid.this_actor.get_pid()
+      .. autofunction:: simgrid.this_actor.get_ppid()
+
    .. group-tab:: C
 
       .. doxygenfunction:: sg_actor_self_get_data()
@@ -704,8 +707,13 @@ Logging messages
 
 .. tabs::
 
+   .. group-tab:: C++
+
+      Please refer to :ref:`the relevant documentation <logging_prog>`.
+
    .. group-tab:: Python
 
+       .. autofunction:: simgrid.this_actor.debug
        .. autofunction:: simgrid.this_actor.info
        .. autofunction:: simgrid.this_actor.error
 
@@ -798,8 +806,8 @@ Exiting
    
       .. autoclass:: simgrid.Engine
 
-Initialization
---------------
+Engin initialization
+--------------------
 
 .. tabs::
 
@@ -808,6 +816,24 @@ Initialization
       .. doxygenfunction:: simgrid::s4u::Engine::Engine(int *argc, char **argv)
       .. doxygenfunction:: simgrid::s4u::Engine::is_initialized()
       .. doxygenfunction:: simgrid::s4u::Engine::shutdown()
+      .. doxygenfunction:: simgrid::s4u::Engine::get_instance()
+
+   .. group-tab:: Python
+
+       .. automethod:: simgrid.Engine.__init__
+       .. automethod:: simgrid.Engine.instance
+
+   .. group-tab:: C
+
+      .. doxygenfunction:: simgrid_init
+
+Simulation setup
+----------------
+
+.. tabs::
+
+   .. group-tab:: C++
+
       .. doxygenfunction:: simgrid::s4u::Engine::set_config(const std::string &str)
       .. doxygenfunction:: simgrid::s4u::Engine::set_config(const std::string &name, bool value)
       .. doxygenfunction:: simgrid::s4u::Engine::set_config(const std::string &name, double value)
@@ -833,13 +859,12 @@ Initialization
 
    .. group-tab:: C
 
-      .. doxygenfunction:: simgrid_init
-
       .. doxygenfunction:: simgrid_load_deployment
       .. doxygenfunction:: simgrid_load_platform
       .. doxygenfunction:: simgrid_register_default
       .. doxygenfunction:: simgrid_register_function
 
+
 Run the simulation
 ------------------
 
@@ -921,7 +946,6 @@ Interacting with the routing
 
       .. doxygenfunction:: simgrid::s4u::Engine::get_all_netpoints
       .. doxygenfunction:: simgrid::s4u::Engine::get_filtered_netzones
-      .. doxygenfunction:: simgrid::s4u::Engine::get_instance()
       .. doxygenfunction:: simgrid::s4u::Engine::get_netzone_root
       .. doxygenfunction:: simgrid::s4u::Engine::netpoint_by_name_or_null
       .. doxygenfunction:: simgrid::s4u::Engine::netzone_by_name_or_null
@@ -1512,6 +1536,7 @@ Retrieving links
 
    .. group-tab:: Python
 
+      .. automethod:: simgrid.Link.by_name
       .. autoattribute:: simgrid.Link.name
 
    .. group-tab:: C