sed -i -e 's/\t/ /g' *.[ch] Please people, stop using tabs in your source

[simgrid.git] / examples / msg / ns3 / ns3.c

diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c
index d0c7456..81ee74b 100644 (file)
--- a/examples/msg/ns3/ns3.c
+++ b/examples/msg/ns3/ns3.c
@@ -13,6 +13,25 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+
+/** @addtogroup MSG_examples
+ * 
+ *  @section MSG_ex_models Models-related examples
+ * 
+ *  @subsection MSG_ex_PLS Packet level simulators
+ * 
+ *  These examples demonstrate how to use the bindings to classical
+ *  Packet-Level Simulators (PLS), as explained in \ref pls. The most
+ *  interesting is probably not the C files since they are unchanged
+ *  from the other simulations, but the associated files, such as the
+ *  platform files to see how to declare a platform to be used with
+ *  the PLS bindings of SimGrid and the tesh files to see how to
+ *  actually start a simulation in these settings.
+ * 
+ * - <b>ns3</b>: Simple ping-pong using ns3 instead of the SimGrid network models. 
+ * 
+ */
+
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 int timer(int argc, char *argv[]);
@@ -21,11 +40,6 @@ MSG_error_t test_all(const char *platform_file,
 
 int timer_start; //set as 1 in the master process
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 //keep a pointer to all surf running tasks.
 #define NTASKS 1500
 int bool_printed = 0;
@@ -70,7 +84,7 @@ int master(int argc, char *argv[])
   {                             /*  Task creation.  */
     char sprintf_buffer[64] = "Task_0";
     todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL);
-    TRACE_msg_set_task_category(todo, id_alias);
+    MSG_task_set_category(todo, id_alias);
     //keep track of running tasks
     gl_task_array[id] = todo;
     gl_data_size[id] = task_comm_size;
@@ -154,8 +168,8 @@ int slave(int argc, char *argv[])
   elapsed_time = MSG_get_clock() - start_time;
   
   XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s",
-                 id,
-                 MSG_task_get_data_size(task),
+      id,
+      MSG_task_get_data_size(task),
        masternames[id],
        slavenames[id]);
 //  MSG_task_execute(task);
@@ -174,7 +188,6 @@ MSG_error_t test_all(const char *platform_file,
   /* MSG_config("workstation/model", "GTNETS"); */
   /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
     MSG_create_environment(platform_file);
   }