clean user guide

diff --git a/buildtools/Cmake/GenerateUserGuide.cmake b/buildtools/Cmake/GenerateUserGuide.cmake
index 1a8f4e1..9014e95 100644 (file)
--- a/buildtools/Cmake/GenerateUserGuide.cmake
+++ b/buildtools/Cmake/GenerateUserGuide.cmake
@@ -204,11 +204,11 @@ ADD_CUSTOM_TARGET(user_guide_pdf
     COMMAND make clean
     COMMAND make pdf || true
     COMMAND ${CMAKE_COMMAND} -E echo "XX Second pass simgrid_user_guide.pdf"
     COMMAND make clean
     COMMAND make pdf || true
     COMMAND ${CMAKE_COMMAND} -E echo "XX Second pass simgrid_user_guide.pdf"

-    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/latex/refman.pdf
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/doc/user_guide/latex/refman.pdf

     COMMAND make pdf || true
     COMMAND ${CMAKE_COMMAND} -E echo "XX Write Simgrid_documentation.pdf"
     COMMAND make pdf || true
     COMMAND ${CMAKE_COMMAND} -E echo "XX Write Simgrid_documentation.pdf"

-    COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_HOME_DIRECTORY}/doc/latex/refman.pdf ${CMAKE_HOME_DIRECTORY}/doc/latex/simgrid_documentation.pdf
+    COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_HOME_DIRECTORY}/doc/user_guide/latex/refman.pdf ${CMAKE_HOME_DIRECTORY}/doc/latex/simgrid_documentation.pdf

 
 

-    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/latex/
+    WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/latex/

 )
 add_dependencies(user_guide_pdf user_guide)
 )
 add_dependencies(user_guide_pdf user_guide)

diff --git a/doc/user_guide/doxygen/UserGuideDoxyfile.in b/doc/user_guide/doxygen/UserGuideDoxyfile.in
index 1bf013f..189a612 100644 (file)
--- a/doc/user_guide/doxygen/UserGuideDoxyfile.in
+++ b/doc/user_guide/doxygen/UserGuideDoxyfile.in
@@ -934,13 +934,13 @@ HTML_FILE_EXTENSION    = .html
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 

-HTML_HEADER            =
+HTML_HEADER            = header.html

 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 

-HTML_FOOTER            = 
+HTML_FOOTER            = footer.html

 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to


@@ -949,7 +949,7 @@ HTML_FOOTER            =
 # the style sheet file to the HTML output directory, so don't put your own
 # style sheet in the HTML output directory as well, or it will be erased!
 
 # the style sheet file to the HTML output directory, so don't put your own
 # style sheet in the HTML output directory as well, or it will be erased!
 

-HTML_STYLESHEET        =
+HTML_STYLESHEET        = stylesheet.css

 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note


@@ -1343,7 +1343,7 @@ LATEX_BATCHMODE        = NO
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 

-LATEX_HIDE_INDICES     = NO
+LATEX_HIDE_INDICES     = YES

 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.

diff --git a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
index 0dafdbc..db4ab88 100644 (file)
--- a/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
+++ b/doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
@@ -21,13 +21,6 @@
     <tab type="modules" visible="no" title="" intro="">
       <tab type="modules" visible="yes" title="Examples description" intro="In the example directory of SimGrid, you'll find usefull examples. Here's a description of the most important of them."/>
     </tab>     
     <tab type="modules" visible="no" title="" intro="">
       <tab type="modules" visible="yes" title="Examples description" intro="In the example directory of SimGrid, you'll find usefull examples. Here's a description of the most important of them."/>
     </tab>     

-    <tab type="user" visible="yes" url="../../doc/index.html" title="Home"/>
-    <tab type="user" url="../../ref_guide/html/index.html" title="Reference Manual"/>
-    <tab type="mainpage" visible="no" title="User Guide"/>
-    <tab type="user" url="http://simgrid.gforge.inria.fr/tutorials/" title="Tutorials"/>
-    <tab type="user" url="https://gforge.inria.fr/projects/simgrid" title="Forge"/>
-    <tab type="user" url="http://simgrid.gforge.inria.fr/" title="Website"/>
-    <tab type="examples" visible="no" title="" intro=""/>  

   </navindex>
 
   <!-- Layout definition for a class page -->
   </navindex>
 
   <!-- Layout definition for a class page -->

diff --git a/doc/user_guide/doxygen/bindings.doc b/doc/user_guide/doxygen/bindings.doc
index 97ffbfa..7206402 100644 (file)
--- a/doc/user_guide/doxygen/bindings.doc
+++ b/doc/user_guide/doxygen/bindings.doc
@@ -48,7 +48,7 @@ this function return directly the task recevied.
 
 \dontinclude lua/masterslave/master_slave.lua
 \li Set Environmenet and run application
 
 \dontinclude lua/masterslave/master_slave.lua
 \li Set Environmenet and run application

-\until simgrid.clean()
+\until end-of-master-slave

 
 \subsection bindings_binding_lua_example_data Exchanging Data
 You can also exchange data between Process using lua. for that, you have to deal with lua task as a table,
 
 \subsection bindings_binding_lua_example_data Exchanging Data
 You can also exchange data between Process using lua. for that, you have to deal with lua task as a table,


@@ -154,105 +154,105 @@ the full example is distributed in the file examples/lua/master_slave_bypass.lua
 
 \subsection MSG_ex_master_slave_lua Master/slave Lua application
 
 
 \subsection MSG_ex_master_slave_lua Master/slave Lua application
 

-    Simulation of a master-slave application using lua bindings    
-       - \ref MSG_ext_ms_master_lua
-       - \ref MSG_ext_ms_slave_lua
-       - \ref MSG_ext_ms_core_lua
+Simulation of a master-slave application using lua bindings    
+- \ref MSG_ext_ms_master_lua
+- \ref MSG_ext_ms_slave_lua
+- \ref MSG_ext_ms_core_lua
+- \ref MSG_ext_ms_helping
+- \ref MSG_ext_ms_application
+- \ref MSG_ext_ms_platform

 
 

-     - \ref MSG_ext_ms_helping
-       - \ref MSG_ext_ms_application
-       - \ref MSG_ext_ms_platform

 
 

-
-      \dontinclude lua/masterslave/master_slave.lua

      
      

+\subsubsection MSG_ext_ms_master_lua Master code

 
 

-      \subsubsection MSG_ext_ms_master_lua Master code
-
-            as described in the C native master/Slave example, this function has to be assigned to a msg_process_t that will behave as the master.
-
-      Lua style arguments (...) in for the master are interpreted as:
-       - the number of tasks to distribute
-       - the computation size of each task
-       - the size of the files associated to each task
-       - a list of host that will accept those tasks.
-
-      Tasks are dumbly sent in a round-robin style.
-
-      \until end_of_master
-
+as described in the C native master/Slave example, this function has to be assigned to a msg_process_t that will behave as the master.

 
 

-      \subsubsection MSG_ext_ms_slave_lua Slave code
+Lua style arguments (...) in for the master are interpreted as:
+- the number of tasks to distribute
+- the computation size of each task
+- the size of the files associated to each task
+- a list of host that will accept those tasks.

 
 

-      This function has to be assigned to a #msg_process_t that has to behave as a slave.
-      This function keeps waiting for tasks and executes them as it receives them.
+Tasks are dumbly sent in a round-robin style.
+\dontinclude lua/masterslave/master.lua
+\skip Dispatch the tasks
+\until Done sending
+\until end

 
 

-      \until end_of_slave
-         \subsubsection MSG_ext_ms_core_lua Simulation core

 
 

-      in this section the core of the simulation which start by including the simgrid lib for bindings
-      : <i>require "simgrid" </i>
+\subsubsection MSG_ext_ms_slave_lua Slave code

 
 

-         -# Simulation settings : <i>simgrid.platform</i> creates a realistic
-            environment
-         -# Application deployment : create the processes on the right locations with
-            <i>simgrid.application</i>
-         -# The simulation is run with <i>simgrid.run</i>
+This function has to be assigned to a #msg_process_t that has to behave as a slave.
+This function keeps waiting for tasks and executes them as it receives them.
+\dontinclude lua/masterslave/slave.lua
+\until end_of_slave
+\subsubsection MSG_ext_ms_core_lua Simulation core

 
 

-      Its arguments are:
-       - <i>platform_file</i>: the name of a file containing an valid surfxml platform description.( first command line argument)
-       - <i>application_file</i>: the name of a file containing a valid surfxml application description ( second commande line argument )
+in this section the core of the simulation which start by including the simgrid lib for bindings
+: <i>require "simgrid" </i>

 
 

-      \until simgrid.clean()
+-# Simulation settings : <i>simgrid.platform</i> creates a realistic
+   environment
+-# Application deployment : create the processes on the right locations with
+    <i>simgrid.application</i>
+-# The simulation is run with <i>simgrid.run</i>

 
 

+Its arguments are:
+- <i>platform_file</i>: the name of a file containing an valid surfxml platform description.( first command line argument)
+- <i>application_file</i>: the name of a file containing a valid surfxml application description ( second commande line argument )
+\dontinclude lua/masterslave/master_slave.lua
+\skip platform
+\until run

 
 

- \subsection MSG_ex_master_slave_lua_bypass Master/slave Bypass Lua application

 
 

-    Simulation of a master-slave application using lua bindings, Bypassing the XML parser
-       - \ref MSG_ext_ms_bp_master_lua
-       - \ref MSG_ext_ms_bp_slave_lua
-       - \ref MSG_ext_ms_bp_core_lua
+\subsection MSG_ex_master_slave_lua_bypass Master/slave Bypass Lua application

 
 

+Simulation of a master-slave application using lua bindings, Bypassing the XML parser
+- \ref MSG_ext_ms_bp_master_lua
+- \ref MSG_ext_ms_bp_slave_lua
+- \ref MSG_ext_ms_bp_core_lua

 
 

-      \dontinclude lua/console/master_slave_bypass.lua

       
 
       
 

-      \subsubsection MSG_ext_ms_bp_master_lua Master code
+\subsubsection MSG_ext_ms_bp_master_lua Master code

 
 

-            as described in the C native master/Slave example, this function has to be assigned to a msg_process_t that will behave as the master.
+as described in the C native master/Slave example, this function has to be assigned to a msg_process_t that will behave as the master.

 
 

-      Lua style arguments (...) in for the master are interpreted as:
-       - the number of tasks to distribute
-       - the computation size of each task
-       - the size of the files associated to each task
-       - a list of host that will accept those tasks.
+Lua style arguments (...) in for the master are interpreted as:
+- the number of tasks to distribute
+- the computation size of each task
+- the size of the files associated to each task
+- a list of host that will accept those tasks.

 
 

-      Tasks are dumbly sent in a round-robin style.
+Tasks are dumbly sent in a round-robin style.

 
 

-      \until end_of_master
+\dontinclude lua/console/master.lua
+\until end_of_master

 
 

+\subsubsection MSG_ext_ms_bp_slave_lua Slave code

 
 

-      \subsubsection MSG_ext_ms_bp_slave_lua Slave code
+This function has to be assigned to a #msg_process_t that has to behave as a slave.
+This function keeps waiting for tasks and executes them as it receives them.

 
 

-      This function has to be assigned to a #msg_process_t that has to behave as a slave.
-      This function keeps waiting for tasks and executes them as it receives them.
+\dontinclude lua/console/slave.lua
+\until end_of_slave

 
 

-      \until end_of_slave
-         \subsubsection MSG_ext_ms_bp_core_lua Simulation core
+\subsubsection MSG_ext_ms_bp_core_lua Simulation core

 
 

-      in this section the core of the simulation which start by including the simgrid lib for bindings, then create the resources we need to set up our environment bypassing the XML parser.
-      : <i>require "simgrid" </i>
+in this section the core of the simulation which start by including the simgrid lib for bindings, then create the resources we need to set up our environment bypassing the XML parser.
+: <i>require "simgrid" </i>

 
 

-        -# Hosts : <i>simgrid.Host.new</i> instanciate a new host with an id, and power.
-        -# Links : <i>simgrid.Link.new</i> instanictae a new link that will require an id, bandwith and latency values.
-        -# Route : <i>simgrid.Route.new</i> define a route between two hosts specifying the links to use.
-         -# Simulation settings : <i>simgrid.register_platform();</i> register own platform without using the XML SURF parser.
+-# Hosts : <i>simgrid.Host.new</i> instanciate a new host with an id, and power.
+-# Links : <i>simgrid.Link.new</i> instanictae a new link that will require an id, bandwith and latency values.
+-# Route : <i>simgrid.Route.new</i> define a route between two hosts specifying the links to use.
+-# Simulation settings : <i>simgrid.register_platform();</i> register own platform without using the XML SURF parser.

 
 

-        we can also bypass the XML deployment file, and associate functions for each of defined hosts.
-       - <i>simgrid.Host.setFunction</i>: associate a function to a host, specifying arguments if needed.
-       - <i>simgrid.register_application()</i>: saving the deployment settings before running the simualtion.
+we can also bypass the XML deployment file, and associate functions for each of defined hosts.
+- <i>simgrid.Host.setFunction</i>: associate a function to a host, specifying arguments if needed.
+- <i>simgrid.register_application()</i>: saving the deployment settings before running the simualtion.

 
 

-      \until simgrid.clean()
+\include lua/console/master_slave_bypass.lua

 
 
  */
 
 
  */

diff --git a/doc/user_guide/doxygen/install.doc b/doc/user_guide/doxygen/install.doc
index 9f34aba..9269988 100644 (file)
--- a/doc/user_guide/doxygen/install.doc
+++ b/doc/user_guide/doxygen/install.doc
@@ -273,10 +273,12 @@ cmake_minimum_required(VERSION 2.6)
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib")
 
 set(EXECUTABLE_OUTPUT_PATH "./")
 set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib")
 

-add_executable(get_sender get_sender.c)                                        #add_executable(<name_of_target> <src list>)
+#add_executable(<name_of_target> <src list>)
+add_executable(get_sender get_sender.c)

 
 ### Add definitions for compile
 
 ### Add definitions for compile

-target_link_libraries(get_sender simgrid m pthread)    #target_link_libraries(<name_of_targe> <dependencies>)
+#target_link_libraries(<name_of_targe> <dependencies>)
+target_link_libraries(get_sender simgrid m pthread) 

 \endverbatim
 
 Then you have to modified <project/directory>/buildtools/Cmake/MakeExeLib.cmake and add
 \endverbatim
 
 Then you have to modified <project/directory>/buildtools/Cmake/MakeExeLib.cmake and add


@@ -362,7 +364,8 @@ compiling a source file. There are:
 \verbatim
 - HelloWorld.c         The example source file.
 - CMakeLists.txt       It allows to configure the project.
 \verbatim
 - HelloWorld.c         The example source file.
 - CMakeLists.txt       It allows to configure the project.

-- FindPCRE.cmake       This finds and links to the pcre library (Normally included into Simgrid directory "GnuWin32").
+- FindPCRE.cmake       This finds and links to the pcre library (Normally included
+                        into Simgrid directory "GnuWin32").

 - README               This explaination.
 \endverbatim
 
 - README               This explaination.
 \endverbatim
 


@@ -385,8 +388,10 @@ create a target with the same name of the source.
 ################
 # FIND TARGETS #
 ################
 ################
 # FIND TARGETS #
 ################

-add_executable(TARGET_NAME SOURCES)            #It creates a target called 'TARGET_NAME.exe' with the sources 'SOURCES'
-target_link_libraries(TARGET_NAME simgrid pcre) #Links TARGET_NAME with simgrid and pcre
+#It creates a target called 'TARGET_NAME.exe' with the sources 'SOURCES'
+add_executable(TARGET_NAME SOURCES)
+#Links TARGET_NAME with simgrid and pcre
+target_link_libraries(TARGET_NAME simgrid pcre)

 \endverbatim
 \li To initialize and build your project, you'll need to run
 \verbatim
 \endverbatim
 \li To initialize and build your project, you'll need to run
 \verbatim


@@ -428,22 +433,19 @@ Suppose your simulation has the following structure (remember it is
 just an example to illustrate a possible way to compile everything;
 feel free to organize it as you want).
 
 just an example to illustrate a possible way to compile everything;
 feel free to organize it as you want).
 

-      \li <tt>sched.h</tt>: a description of the core of the
-          scheduler (i.e. which functions are can be used by the
-          agents). For example we could find the following functions
-          (master, forwarder, slave).
-
-      \li <tt>sched.c</tt>: a C file including <tt>sched.h</tt> and
-          implementing the core of the scheduler. Most of these
-          functions use the MSG functions defined in section \ref
-          msg_task_usage.
-
-      \li <tt>masterslave.c</tt>: a C file with the main function, i.e.
-          the MSG initialization (MSG_init()), the platform
-          creation (e.g. with MSG_create_environment()), the
-          deployment phase (e.g. with MSG_function_register() and
-          MSG_launch_application()) and the call to
-          MSG_main()).
+\li <tt>sched.h</tt>: a description of the core of the
+    scheduler (i.e. which functions are can be used by the
+    agents). For example we could find the following functions
+    (master, forwarder, slave).
+\li <tt>sched.c</tt>: a C file including <tt>sched.h</tt> and
+    implementing the core of the scheduler. Most of these
+    functions use the MSG functions defined in section \ref
+    msg_task_usage.
+\li <tt>masterslave.c</tt>: a C file with the main function, i.e.
+    the MSG initialization (MSG_init()), the platform
+    creation (e.g. with MSG_create_environment()), the
+    deployment phase (e.g. with MSG_function_register() and
+    MSG_launch_application()) and the call to MSG_main()).

 
 To compile such a program, we suggest to use the following
 Makefile. It is a generic Makefile that we have used many times with
 
 To compile such a program, we suggest to use the following
 Makefile. It is a generic Makefile that we have used many times with

diff --git a/doc/user_guide/doxygen/use.doc b/doc/user_guide/doxygen/use.doc
index fecf76e..c7455fe 100644 (file)
--- a/doc/user_guide/doxygen/use.doc
+++ b/doc/user_guide/doxygen/use.doc
@@ -236,34 +236,32 @@ Here are some examples on how to use GRAS.
 You should also check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 \endhtmlonly
 
 You should also check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 \endhtmlonly
 

+There is for now rather few examples of GRAS, but it's better than
+nothing, isn't it?

 
 

-
-    There is for now rather few examples of GRAS, but it's better than
-    nothing, isn't it?
-
-       - \ref GRAS_ex_ping
-       - \ref GRAS_ex_mmrpc
-       - \ref GRAS_ex_token
-       - \ref GRAS_ex_timer
+- \ref GRAS_ex_ping
+- \ref GRAS_ex_mmrpc
+- \ref GRAS_ex_token
+- \ref GRAS_ex_timer

 
 
 \subsection GRAS_ex_ping Ping-Pong
 
 
 
 \subsection GRAS_ex_ping Ping-Pong
 

-    This example implements the very classical ping-pong in GRAS. It
-    involves a client (initiating the ping-pong) and a server (answering to
-    client's requests).
+This example implements the very classical ping-pong in GRAS. It
+involves a client (initiating the ping-pong) and a server (answering to
+client's requests).

 
 

-    It works the following way:
-     - Both the client and the server register all needed messages
-     - The server registers a callback to the ping message, which sends pong
-       to the expeditor
-     - The client sends the ping message to the server, and waits for the
-       pong message as an answer.
+It works the following way:
+- Both the client and the server register all needed messages
+- The server registers a callback to the ping message, which sends pong
+  to the expeditor
+- The client sends the ping message to the server, and waits for the
+  pong message as an answer.

 
 

-    This example resides in the <b>examples/gras/ping/ping.c</b> file. Yes, both
-    the code of the client and of the server is placed in the same file. 
+This example resides in the <b>examples/gras/ping/ping.c</b> file. Yes, both
+the code of the client and of the server is placed in the same file. 

 
 

-    \subsubsection GRAS_ex_ping_toc Table of contents of the ping example
+\subsubsection GRAS_ex_ping_toc Table of contents of the ping example

       - \ref GRAS_ex_ping_common
         - \ref GRAS_ex_ping_initial
         - \ref GRAS_ex_ping_register
       - \ref GRAS_ex_ping_common
         - \ref GRAS_ex_ping_initial
         - \ref GRAS_ex_ping_register


@@ -416,24 +414,24 @@ You should also check our online <a href="http://simgrid.gforge.inria.fr/tutoria
 
 \subsection GRAS_ex_mmrpc A simple RPC for matrix multiplication
 
 
 \subsection GRAS_ex_mmrpc A simple RPC for matrix multiplication
 

-    This example implements a remote matrix multiplication. It involves a client
-    (creating the matrices and sending the multiplications requests) and a server
-    (computing the multiplication on client's behalf).
+This example implements a remote matrix multiplication. It involves a client
+(creating the matrices and sending the multiplications requests) and a server
+(computing the multiplication on client's behalf).

 
 

-    This example also constitutes a more advanced example of data description
-    mechanisms, since the message payload type is a bit more complicated than in
-    other examples such as the ping one (\ref GRAS_ex_ping).
+This example also constitutes a more advanced example of data description
+mechanisms, since the message payload type is a bit more complicated than in
+other examples such as the ping one (\ref GRAS_ex_ping).

 
 

-    It works the following way (not very different from the ping example):
-     - Both the client and the server register all needed messages and datatypes
-     - The server registers a callback to the "request" message, which computes
-       what needs to be and returns the result to the expeditor.
-     - The client creates two matrices, ask for their multiplication and check
-       the server's answer.
+It works the following way (not very different from the ping example):
+- Both the client and the server register all needed messages and datatypes
+- The server registers a callback to the "request" message, which computes
+  what needs to be and returns the result to the expeditor.
+- The client creates two matrices, ask for their multiplication and check
+  the server's answer.

 
 

-    This example resides in the <b>examples/gras/mmrpc/mmrpc.c</b> file. 
+This example resides in the <b>examples/gras/mmrpc/mmrpc.c</b> file. 

 
 

-    \subsubsection GRAS_ex_mmrpc_toc Table of contents of the mmrpc example
+\subsubsection GRAS_ex_mmrpc_toc Table of contents of the mmrpc example

       - \ref GRAS_ex_mmrpc_common
         - \ref GRAS_ex_mmrpc_header
         - \ref GRAS_ex_mmrpc_dataregister
       - \ref GRAS_ex_mmrpc_common
         - \ref GRAS_ex_mmrpc_header
         - \ref GRAS_ex_mmrpc_dataregister


@@ -555,13 +553,13 @@ You should also check our online <a href="http://simgrid.gforge.inria.fr/tutoria
 
 \subsection GRAS_ex_timer Some timer games
 
 
 \subsection GRAS_ex_timer Some timer games
 

-    This example fools around with the GRAS timers (\ref GRAS_timer). It is
-    mainly a regression test, since it uses almost all timer features.
+This example fools around with the GRAS timers (\ref GRAS_timer). It is
+mainly a regression test, since it uses almost all timer features.

 
 

-    The main program registers a repetititive task and a delayed one, and
-    then loops until the <tt>still_to_do</tt> variables of its globals reach
-    0. The delayed task set it to 5, and the repetititive one decrease it
-    each time. Here is an example of output:
+The main program registers a repetititive task and a delayed one, and
+then loops until the <tt>still_to_do</tt> variables of its globals reach
+0. The delayed task set it to 5, and the repetititive one decrease it
+each time. Here is an example of output:

 \verbatim Initialize GRAS
  Initialize XBT
  [1108335471] Programming the repetitive_action with a frequency of 1.000000 sec
 \verbatim Initialize GRAS
  Initialize XBT
  [1108335471] Programming the repetitive_action with a frequency of 1.000000 sec


@@ -604,31 +602,21 @@ You should also check our online <a href="http://simgrid.gforge.inria.fr/tutoria
     \until end_of_client
 
 \section using_smpi Using SMPI
     \until end_of_client
 
 \section using_smpi Using SMPI

-\htmlonly

 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 

-\endhtmlonly

 
 \section using_MC Using Model Checking
 
 \section using_MC Using Model Checking

-\htmlonly

 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 

-\endhtmlonly

 
 \section using_trace Using Trace
 Check out the \ref tracing section.
 
 \section using_trace Using Trace
 Check out the \ref tracing section.

-\htmlonly
+

 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 

-\endhtmlonly

 
 \section using_simdag Using SimDag
 
 \section using_simdag Using SimDag

-\htmlonly

 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 

-\endhtmlonly

 
 \section using_simix Using SIMIX
 
 \section using_simix Using SIMIX

-\htmlonly

 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 
 You should check our online <a href="http://simgrid.gforge.inria.fr/tutorials/"> tutorial section</a> that contains a dedicated tutorial. 

-\endhtmlonly
-

 
 */
 
 
 */
 

diff --git a/examples/lua/masterslave/master.lua b/examples/lua/masterslave/master.lua
index f4094d0..2ee7f41 100644 (file)
--- a/examples/lua/masterslave/master.lua
+++ b/examples/lua/masterslave/master.lua
@@ -30,5 +30,5 @@ function Master(...)
     finalize:send(alias)
   end
   simgrid.info("Everything's done.")
     finalize:send(alias)
   end
   simgrid.info("Everything's done.")

-end -- Master
+end -- end_of_master

 
 

diff --git a/examples/lua/masterslave/master_slave.lua b/examples/lua/masterslave/master_slave.lua
index 6fe6850..984dba7 100644 (file)
--- a/examples/lua/masterslave/master_slave.lua
+++ b/examples/lua/masterslave/master_slave.lua
@@ -8,4 +8,4 @@ simgrid.platform(arg[1] or "../../msg/small_platform.xml")
 simgrid.application(arg[2] or "../deploy.xml")
 simgrid.run()
 simgrid.info("Simulation's over. See you.")
 simgrid.application(arg[2] or "../deploy.xml")
 simgrid.run()
 simgrid.info("Simulation's over. See you.")

-
+-- end-of-master-slave

diff --git a/examples/lua/masterslave/slave.lua b/examples/lua/masterslave/slave.lua
index f2b8a12..8756983 100644 (file)
--- a/examples/lua/masterslave/slave.lua
+++ b/examples/lua/masterslave/slave.lua
@@ -21,5 +21,5 @@ function Slave(...)
   end
 
   simgrid.info("I'm done. See you!")
   end
 
   simgrid.info("I'm done. See you!")

-end -- Slave
+end -- end_of_slave