From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 10 Mar 2017 23:07:51 +0000 (+0100)
Subject: cosmetics
X-Git-Tag: v3_15~146
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/703b349243a29f180d73b48ed666b94a222c226b?ds=sidebyside

cosmetics

- make processes' names symmetrical in an example
- improve changelog
---

diff --git a/ChangeLog b/ChangeLog
index 77ee0e4883..a3f35c5741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,7 @@ SimGrid (3.15) UNRELEASED; urgency=low
    That's a point in the routing algorithm, let's avoid wrong simplifications.
 
  MSG
- - New: MSG_process_yield()
+ - New: MSG_process_yield(). Stop and yield to other processes.
  - New: MSG_process_daemon(). Daemon processes are automatically killed 
    when the last non-daemon process terminates
  - Renamed MSG_energy_plugin_init() -> MSG_host_energy_plugin_init()
diff --git a/examples/msg/process-daemon/process-daemon.c b/examples/msg/process-daemon/process-daemon.c
index 92260e3816..63b77374bf 100644
--- a/examples/msg/process-daemon/process-daemon.c
+++ b/examples/msg/process-daemon/process-daemon.c
@@ -8,7 +8,7 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_process_daemon, "Messages specific for this msg example");
 
 /* The worker process, working for a while before leaving */
-static int worker(int argc, char* argv[])
+static int worker_process(int argc, char* argv[])
 {
   XBT_INFO("Let's do some work (for 10 sec on Boivin).");
   msg_task_t task = MSG_task_create("easy work", 980.95e6, 0, NULL);
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
 
   MSG_create_environment(argv[1]);
   xbt_dynar_t hosts = MSG_hosts_as_dynar();
-  MSG_process_create("worker", worker, NULL, xbt_dynar_getfirst_as(hosts, msg_host_t));
+  MSG_process_create("worker", worker_process, NULL, xbt_dynar_getfirst_as(hosts, msg_host_t));
   MSG_process_create("daemon", daemon_process, NULL, xbt_dynar_getlast_as(hosts, msg_host_t));
   xbt_dynar_free(&hosts);
   msg_error_t res = MSG_main();