From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 11 Dec 2015 12:36:00 +0000 (+0100)
Subject: [msg] Switch MSG to .cpp
X-Git-Tag: v3_13~1460
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2d62f02c44fd56836ab5c3a6183d6a89aa01be26

[msg] Switch MSG to .cpp
---

diff --git a/src/msg/instr_msg_process.c b/src/msg/instr_msg_process.cpp
similarity index 100%
rename from src/msg/instr_msg_process.c
rename to src/msg/instr_msg_process.cpp
diff --git a/src/msg/instr_msg_task.c b/src/msg/instr_msg_task.cpp
similarity index 100%
rename from src/msg/instr_msg_task.c
rename to src/msg/instr_msg_task.cpp
diff --git a/src/msg/instr_msg_vm.c b/src/msg/instr_msg_vm.cpp
similarity index 100%
rename from src/msg/instr_msg_vm.c
rename to src/msg/instr_msg_vm.cpp
diff --git a/src/msg/msg_actions.c b/src/msg/msg_actions.cpp
similarity index 100%
rename from src/msg/msg_actions.c
rename to src/msg/msg_actions.cpp
diff --git a/src/msg/msg_deployment.c b/src/msg/msg_deployment.cpp
similarity index 100%
rename from src/msg/msg_deployment.c
rename to src/msg/msg_deployment.cpp
diff --git a/src/msg/msg_environment.c b/src/msg/msg_environment.cpp
similarity index 91%
rename from src/msg/msg_environment.c
rename to src/msg/msg_environment.cpp
index 4fa76e9189..b1123b3f39 100644
--- a/src/msg/msg_environment.c
+++ b/src/msg/msg_environment.cpp
@@ -69,10 +69,10 @@ xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
 
 const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
 {
-  xbt_dict_t dict = xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), ROUTING_PROP_ASR_LEVEL);
+  xbt_dict_t dict = (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), ROUTING_PROP_ASR_LEVEL);
   if (dict==NULL)
     return NULL;
-  return xbt_dict_get_or_null(dict, name);
+  return (char*) xbt_dict_get_or_null(dict, name);
 }
 
 const char *MSG_environment_as_get_model(msg_as_t as) {
diff --git a/src/msg/msg_global.c b/src/msg/msg_global.cpp
similarity index 99%
rename from src/msg/msg_global.c
rename to src/msg/msg_global.cpp
index 818d331623..f0df69f01e 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.cpp
@@ -4,6 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "simgrid/msg.h"
 #include "instr/instr_interface.h"
 #include "msg_private.h"
 #include "msg_mailbox.h"
@@ -180,7 +181,7 @@ static void MSG_exit(void) {
 /** \ingroup msg_simulation
  * \brief A clock (in second).
  */
-XBT_INLINE double MSG_get_clock(void)
+double MSG_get_clock(void)
 {
   return SIMIX_get_clock();
 }
diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.cpp
similarity index 99%
rename from src/msg/msg_gos.c
rename to src/msg/msg_gos.cpp
index fcafb21976..44b5798cba 100644
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.cpp
@@ -48,7 +48,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
   xbt_ex_t e;
   simdata_task_t simdata = task->simdata;
   msg_process_t self = SIMIX_process_self();
-  simdata_process_t p_simdata = SIMIX_process_self_get_data(self);
+  simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(self);
   e_smx_state_t comp_state;
   msg_error_t status = MSG_OK;
 
@@ -395,7 +395,7 @@ msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias,
   if (t_simdata->isused != 0) {
     if (msg_global->debug_multiple_use){
       XBT_ERROR("This task is already used in there:");
-      xbt_backtrace_display(t_simdata->isused);
+      xbt_backtrace_display((xbt_ex_t*) t_simdata->isused);
       XBT_ERROR("And you try to reuse it from here:");
       xbt_backtrace_display_current();
     } else {
@@ -855,7 +855,7 @@ void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_s
 
   // notify the user callback if any
   if (msg_global->task_copy_callback) {
-    msg_task_t task = buff;
+    msg_task_t task = (msg_task_t) buff;
     msg_global->task_copy_callback(task,
         simcall_comm_get_src_proc(comm), simcall_comm_get_dst_proc(comm));
   }
@@ -1042,7 +1042,8 @@ const char *MSG_task_get_category (msg_task_t task)
  */
 const char *MSG_as_router_get_property_value(const char* asr, const char *name)
 {
-  return xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name);
+  return (char*) xbt_dict_get_or_null(
+    MSG_as_router_get_properties(asr), name);
 }
 
 /**
diff --git a/src/msg/msg_host.c b/src/msg/msg_host.cpp
similarity index 99%
rename from src/msg/msg_host.c
rename to src/msg/msg_host.cpp
index f96e1ee858..da8e2ffcb4 100644
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.cpp
@@ -273,7 +273,7 @@ xbt_swag_t MSG_host_get_process_list(msg_host_t host)
  */
 const char *MSG_host_get_property_value(msg_host_t host, const char *name)
 {
-  return xbt_dict_get_or_null(MSG_host_get_properties(host), name);
+  return (const char*) xbt_dict_get_or_null(MSG_host_get_properties(host), name);
 }
 
 /** \ingroup m_host_management
diff --git a/src/msg/msg_io.c b/src/msg/msg_io.cpp
similarity index 97%
rename from src/msg/msg_io.c
rename to src/msg/msg_io.cpp
index d762d71a1c..77f06e8387 100644
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.cpp
@@ -109,7 +109,7 @@ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
     XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->hostname, read_size);
     msg_host_t *m_host_list = NULL;
-    m_host_list = calloc(2, sizeof(msg_host_t));
+    m_host_list = (msg_host_t*) calloc(2, sizeof(msg_host_t));
 
     m_host_list[0] = MSG_host_self();
     m_host_list[1] = attached_host;
@@ -153,7 +153,7 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
     /* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
     XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->hostname, size);
     msg_host_t *m_host_list = NULL;
-    m_host_list = calloc(2, sizeof(msg_host_t));
+    m_host_list = (msg_host_t*) calloc(2, sizeof(msg_host_t));
 
     m_host_list[0] = MSG_host_self();
     m_host_list[1] = attached_host;
@@ -248,7 +248,7 @@ msg_error_t MSG_file_unlink(msg_file_t fd)
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
   msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
   int res = simcall_file_unlink(file_priv->simdata->smx_file, attached_host);
-  return res;
+  return (msg_error_t) res;
 }
 
 /** \ingroup msg_file_management
@@ -281,7 +281,7 @@ sg_size_t MSG_file_get_size(msg_file_t fd){
 msg_error_t MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin)
 {
   msg_file_priv_t priv = MSG_file_priv(fd);
-  return simcall_file_seek(priv->simdata->smx_file, offset, origin);
+  return (msg_error_t) simcall_file_seek(priv->simdata->smx_file, offset, origin);
 }
 
 /**
@@ -312,7 +312,7 @@ const char *MSG_file_get_name(msg_file_t fd) {
 msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath)
 {
   msg_file_priv_t priv = MSG_file_priv(fd);
-  return simcall_file_move(priv->simdata->smx_file, fullpath);
+  return (msg_error_t) simcall_file_move(priv->simdata->smx_file, fullpath);
 }
 
 /**
@@ -371,7 +371,7 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
 
   XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, storage_priv_src->hostname, host_name_dest);
   msg_host_t *m_host_list = NULL;
-  m_host_list = calloc(2, sizeof(msg_host_t));
+  m_host_list = (msg_host_t*) calloc(2, sizeof(msg_host_t));
 
   m_host_list[0] = attached_host;
   m_host_list[1] = host_dest;
@@ -388,7 +388,7 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
     if (transfer == MSG_TASK_CANCELED)
       XBT_WARN("Transfer error, task has been canceled!");
 
-    return -1;
+    return (msg_error_t) -1;
   }
 
   /* Create file on remote host, write it and close it */
@@ -510,7 +510,7 @@ void MSG_storage_set_property_value(msg_storage_t storage, const char *name, cha
  */
 const char *MSG_storage_get_property_value(msg_storage_t storage, const char *name)
 {
-  return xbt_dict_get_or_null(MSG_storage_get_properties(storage), name);
+  return (char*) xbt_dict_get_or_null(MSG_storage_get_properties(storage), name);
 }
 
 
diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.cpp
similarity index 98%
rename from src/msg/msg_mailbox.c
rename to src/msg/msg_mailbox.cpp
index b3a2234850..13cfe2e41f 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.cpp
@@ -169,7 +169,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
   msg_error_t ret = MSG_OK;
   simdata_task_t t_simdata = NULL;
   msg_process_t process = MSG_process_self();
-  simdata_process_t p_simdata = SIMIX_process_self_get_data(process);
+  simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(process);
 
   int call_end = TRACE_msg_task_put_start(task);    //must be after CHECK_HOST()
 
@@ -181,7 +181,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
   if (t_simdata->isused != 0) {
     if (msg_global->debug_multiple_use){
       XBT_ERROR("This task is already used in there:");
-      xbt_backtrace_display(t_simdata->isused);
+      xbt_backtrace_display((xbt_ex_t*) t_simdata->isused);
       XBT_ERROR("And you try to reuse it from here:");
       xbt_backtrace_display_current();
     } else {
diff --git a/src/msg/msg_process.c b/src/msg/msg_process.cpp
similarity index 96%
rename from src/msg/msg_process.c
rename to src/msg/msg_process.cpp
index dd02f54009..e0681b1abd 100644
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.cpp
@@ -33,11 +33,11 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
   // get the MSG process from the SIMIX process
   if (smx_proc == SIMIX_process_self()) {
     /* avoid a SIMIX request if this function is called by the process itself */
-    msg_proc = SIMIX_process_self_get_data(smx_proc);
+    msg_proc = (simdata_process_t) SIMIX_process_self_get_data(smx_proc);
     SIMIX_process_self_set_data(smx_proc, NULL);
   }
   else {
-    msg_proc = simcall_process_get_data(smx_proc);
+    msg_proc = (simdata_process_t) simcall_process_get_data(smx_proc);
     simcall_process_set_data(smx_proc, NULL);
   }
 
@@ -219,7 +219,7 @@ msg_error_t MSG_process_join(msg_process_t process, double timeout){
  */
 msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
 {
-  simdata_process_t simdata = simcall_process_get_data(process);
+  simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process);
   simdata->m_host = host;
   msg_host_t now = simdata->m_host;
   TRACE_msg_process_change_host(process, now, host);
@@ -238,7 +238,7 @@ void* MSG_process_get_data(msg_process_t process)
   xbt_assert(process != NULL, "Invalid parameter: first parameter must not be NULL!");
 
   /* get from SIMIX the MSG process data, and then the user data */
-  simdata_process_t simdata = simcall_process_get_data(process);
+  simdata_process_t simdata = (simdata_process_t) simcall_process_get_data(process);
   if (simdata)
     return simdata->data;
   else
@@ -255,7 +255,8 @@ msg_error_t MSG_process_set_data(msg_process_t process, void *data)
 {
   xbt_assert(process != NULL, "Invalid parameter: first parameter must not be NULL!");
 
-  simdata_process_t simdata = simcall_process_get_data(process);
+  simdata_process_t simdata =
+    (simdata_process_t) simcall_process_get_data(process);
   simdata->data = data;
 
   return MSG_OK;
@@ -282,10 +283,10 @@ msg_host_t MSG_process_get_host(msg_process_t process)
 {
   simdata_process_t simdata;
   if (process == NULL) {
-    simdata = SIMIX_process_self_get_data(SIMIX_process_self());
+    simdata = (simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self());
   }
   else {
-    simdata = simcall_process_get_data(process);
+    simdata = (simdata_process_t) simcall_process_get_data(process);
   }
   return simdata ? simdata->m_host : NULL;
 }
@@ -379,7 +380,7 @@ const char *MSG_process_get_name(msg_process_t process)
 const char *MSG_process_get_property_value(msg_process_t process,
                                            const char *name)
 {
-  return xbt_dict_get_or_null(MSG_process_get_properties(process), name);
+  return (char*) xbt_dict_get_or_null(MSG_process_get_properties(process), name);
 }
 
 /** \ingroup m_process_management
diff --git a/src/msg/msg_synchro.c b/src/msg/msg_synchro.cpp
similarity index 100%
rename from src/msg/msg_synchro.c
rename to src/msg/msg_synchro.cpp
diff --git a/src/msg/msg_task.c b/src/msg/msg_task.cpp
similarity index 100%
rename from src/msg/msg_task.c
rename to src/msg/msg_task.cpp
diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.cpp
similarity index 98%
rename from src/msg/msg_vm.c
rename to src/msg/msg_vm.cpp
index 357baa7827..5164171245 100644
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.cpp
@@ -218,12 +218,11 @@ msg_vm_t MSG_vm_create_core(msg_host_t ind_pm, const char *name)
   }
 
   /* Note: ind_vm and vm_workstation point to the same elm object. */
-  msg_vm_t ind_vm = NULL;
-  void *ind_vm_workstation =  NULL;
-
+  
   /* Ask the SIMIX layer to create the surf vm resource */
-  ind_vm_workstation = simcall_vm_create(name, ind_pm);
-  ind_vm = (msg_vm_t) __MSG_host_create(ind_vm_workstation);
+  sg_host_t ind_vm_workstation =  (sg_host_t) simcall_vm_create(name, ind_pm);
+
+  msg_vm_t ind_vm = (msg_vm_t) __MSG_host_create(ind_vm_workstation);
 
   XBT_DEBUG("A new VM (%s) has been created", name);
 
@@ -357,7 +356,7 @@ static int migration_rx_fun(int argc, char *argv[])
   XBT_DEBUG("mig: rx_start");
 
   // The structure has been created in the do_migration function and should only be freed in the same place ;)
-  struct migration_session *ms = MSG_process_get_data(MSG_process_self());
+  struct migration_session *ms = (migration_session *) MSG_process_get_data(MSG_process_self());
 
   s_vm_params_t params;
   simcall_host_get_params(ms->vm, &params);
@@ -578,7 +577,7 @@ void MSG_host_del_task(msg_host_t host, msg_task_t task)
 
   char *key = bprintf("%s-%p", task->name, task);
 
-  dirty_page_t dp = xbt_dict_get_or_null(priv->dp_objs, key);
+  dirty_page_t dp = (dirty_page_t) xbt_dict_get_or_null(priv->dp_objs, key);
   xbt_assert(dp->task == task);
 
   /* If we are in the middle of dirty page tracking, we record how much
@@ -702,7 +701,8 @@ static int migration_tx_fun(int argc, char *argv[])
   XBT_DEBUG("mig: tx_start");
 
   // Note that the ms structure has been allocated in do_migration and hence should be freed in the same function ;)
-  struct migration_session *ms = MSG_process_get_data(MSG_process_self());
+  migration_session *ms = 
+    (migration_session *) MSG_process_get_data(MSG_process_self());
 
   s_vm_params_t params;
   simcall_host_get_params(ms->vm, &params);
@@ -778,9 +778,7 @@ static int migration_tx_fun(int argc, char *argv[])
 
   /* Stage2: send update pages iteratively until the size of remaining states
    * becomes smaller than the threshold value. */
-  if (skip_stage2)
-    goto stage3;
-
+ if (! skip_stage2) {
 
   int stage2_round = 0;
   for (;;) {
@@ -846,7 +844,7 @@ static int migration_tx_fun(int argc, char *argv[])
     } else
       XBT_CRITICAL("bug");
   }
-
+ }
 
 stage3:
   /* Stage3: stop the VM and copy the rest of states. */
@@ -970,7 +968,7 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t new_pm)
    *  
    */
 
-  msg_host_t old_pm = simcall_vm_get_pm(vm);
+  msg_host_t old_pm = (msg_host_t) simcall_vm_get_pm(vm);
 
   if(MSG_host_is_off(old_pm))
     THROWF(vm_error, 0, "SRC host(%s) seems off, cannot start a migration", sg_host_get_name(old_pm));
@@ -1080,7 +1078,7 @@ void MSG_vm_restore(msg_vm_t vm)
  */
 msg_host_t MSG_vm_get_pm(msg_vm_t vm)
 {
-  return simcall_vm_get_pm(vm);
+  return (msg_host_t) simcall_vm_get_pm(vm);
 }
 
 
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 7cef3bc6d5..4c342f5c5a 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -415,21 +415,21 @@ set(SIMGRID_SRC
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_process.c
-  src/msg/instr_msg_task.c
-  src/msg/instr_msg_vm.c
-  src/msg/msg_actions.c
-  src/msg/msg_deployment.c
-  src/msg/msg_environment.c
-  src/msg/msg_global.c
-  src/msg/msg_gos.c
-  src/msg/msg_host.c
-  src/msg/msg_io.c
-  src/msg/msg_mailbox.c
-  src/msg/msg_process.c
-  src/msg/msg_synchro.c
-  src/msg/msg_task.c
-  src/msg/msg_vm.c
+  src/msg/instr_msg_process.cpp
+  src/msg/instr_msg_task.cpp
+  src/msg/instr_msg_vm.cpp
+  src/msg/msg_actions.cpp
+  src/msg/msg_deployment.cpp
+  src/msg/msg_environment.cpp
+  src/msg/msg_global.cpp
+  src/msg/msg_gos.cpp
+  src/msg/msg_host.cpp
+  src/msg/msg_io.cpp
+  src/msg/msg_mailbox.cpp
+  src/msg/msg_process.cpp
+  src/msg/msg_synchro.cpp
+  src/msg/msg_task.cpp
+  src/msg/msg_vm.cpp
   )
 
 set(SIMDAG_SRC