merge conflicts

[simgrid.git] / src / gras / Virtu / sg_process.c

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 766daa2..3d70daa 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -38,6 +38,7 @@ void gras_agent_spawn(const char *name,
 
 void gras_process_init()
 {
+  smx_process_t self = SIMIX_process_self();
   gras_hostdata_t *hd =
       (gras_hostdata_t *) SIMIX_host_self_get_data();
   gras_procdata_t *pd = xbt_new0(gras_procdata_t, 1);
@@ -54,13 +55,13 @@ void gras_process_init()
     hd->refcount++;
   }
 
-  SIMIX_process_self_set_data((void *) pd);
+  SIMIX_process_self_set_data(self, (void *) pd);
   gras_procdata_init();
 
   trp_pd = (gras_trp_procdata_t) gras_libdata_by_name("gras_trp");
   pd->pid = pid;
 
-  if (SIMIX_process_self() != NULL) {
+  if (self != NULL) {
     pd->ppid = gras_os_getpid();
   } else
     pd->ppid = -1;
@@ -70,7 +71,7 @@ void gras_process_init()
   trp_pd->meas_selectable_sockets =
       xbt_queue_new(0, sizeof(gras_socket_t));
 
-  VERB2("Creating process '%s' (%d)", SIMIX_process_self_get_name(),
+  XBT_VERB("Creating process '%s' (%d)", SIMIX_process_self_get_name(),
       gras_os_getpid());
 }
 
@@ -95,19 +96,19 @@ void gras_process_exit()
   xbt_queue_free(&trp_pd->meas_selectable_sockets);
 
 
-  xbt_assert0(hd, "Run gras_process_init (ie, gras_init)!!");
+  xbt_assert(hd, "Run gras_process_init (ie, gras_init)!!");
 
-  VERB2("GRAS: Finalizing process '%s' (%d)",
+  XBT_VERB("GRAS: Finalizing process '%s' (%d)",
         SIMIX_req_process_get_name(SIMIX_process_self()), gras_os_getpid());
 
-  if (xbt_dynar_length(msg_pd->msg_queue)) {
+  if (!xbt_dynar_is_empty(msg_pd->msg_queue)) {
     unsigned int cpt;
     s_gras_msg_t msg;
-    WARN2
+    XBT_WARN
         ("process %d terminated, but %ld messages are still queued. Message list:",
          gras_os_getpid(), xbt_dynar_length(msg_pd->msg_queue));
     xbt_dynar_foreach(msg_pd->msg_queue, cpt, msg) {
-      WARN5("   Message %s (%s) from %s@%s:%d", msg.type->name,
+      XBT_WARN("   Message %s (%s) from %s@%s:%d", msg.type->name,
             e_gras_msg_kind_names[msg.kind],
             gras_socket_peer_proc(msg.expe),
             gras_socket_peer_name(msg.expe),
@@ -118,7 +119,7 @@ void gras_process_exit()
   /* if each process has its sockets list, we need to close them when the
      process finish */
   xbt_dynar_foreach(sockets, cursor, sock_iter) {
-    VERB1("Closing the socket %p left open on exit. Maybe a socket leak?",
+    XBT_VERB("Closing the socket %p left open on exit. Maybe a socket leak?",
           sock_iter);
     gras_socket_close(sock_iter);
   }
@@ -139,7 +140,7 @@ gras_procdata_t *gras_procdata_get(void)
   gras_procdata_t *pd =
       (gras_procdata_t *) SIMIX_req_process_get_data(SIMIX_process_self());
 
-  xbt_assert0(pd, "Run gras_process_init! (ie, gras_init)");
+  xbt_assert(pd, "Run gras_process_init! (ie, gras_init)");
 
   return pd;
 }
@@ -148,7 +149,7 @@ void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p)
 {
   gras_procdata_t *pd = (gras_procdata_t *) SIMIX_req_process_get_data(p);
 
-  xbt_assert2(pd,
+  xbt_assert(pd,
               "process '%s' on '%s' didn't run gras_process_init! (ie, gras_init)",
               SIMIX_req_process_get_name(p),
               SIMIX_req_host_get_name(SIMIX_req_process_get_host(p)));
@@ -179,7 +180,7 @@ xbt_dict_t gras_process_properties(void)
 int gras_os_getpid(void)
 {
   gras_procdata_t *data;
-  data = (gras_procdata_t *) SIMIX_process_self_get_data();
+  data = (gras_procdata_t *) SIMIX_process_self_get_data(SIMIX_process_self());
   if (data != NULL)
     return data->pid;
 
@@ -195,7 +196,7 @@ const char *gras_os_host_property_value(const char *name)
                            name);
 }
 
-/** @brief retrieve the host properties dictionnary
+/** @brief retrieve the host properties dictionary
  *  @warning it's the original one, not a copy. Don't mess with it
  */
 xbt_dict_t gras_os_host_properties(void)