merge conflict resolved

diff --cc include/simix/simix.h
index 3d928ba,3e5d219..7dadf97
--- 1/include/simix/simix.h
--- 2/include/simix/simix.h
+++ b/include/simix/simix.h
@@@ -131,40 -130,39 +130,42 @@@ XBT_PUBLIC(void) simcall_process_create
                                            int argc, char **argv,
                                            xbt_dict_t properties);
  
- XBT_PUBLIC(void) SIMIX_req_process_kill(smx_process_t process);
- XBT_PUBLIC(void) SIMIX_req_process_killall(void);
+ XBT_PUBLIC(void) simcall_process_kill(smx_process_t process);
+ XBT_PUBLIC(void) simcall_process_killall(void);
  
  /* Process handling */
- XBT_PUBLIC(void) SIMIX_req_process_cleanup(smx_process_t process);
- XBT_PUBLIC(void) SIMIX_req_process_change_host(smx_process_t process,
+ XBT_PUBLIC(void) simcall_process_cleanup(smx_process_t process);
+ XBT_PUBLIC(void) simcall_process_change_host(smx_process_t process,
                                               smx_host_t dest);
- XBT_PUBLIC(void) SIMIX_req_process_suspend(smx_process_t process);
- XBT_PUBLIC(void) SIMIX_req_process_resume(smx_process_t process);
+ XBT_PUBLIC(void) simcall_process_suspend(smx_process_t process);
+ XBT_PUBLIC(void) simcall_process_resume(smx_process_t process);
  
  /* Getters and Setters */
- XBT_PUBLIC(int) SIMIX_req_process_count(void);
- XBT_PUBLIC(void *) SIMIX_req_process_get_data(smx_process_t process);
- XBT_PUBLIC(void) SIMIX_req_process_set_data(smx_process_t process, void *data);
- XBT_INLINE XBT_PUBLIC(smx_host_t) SIMIX_req_process_get_host(smx_process_t process);
- XBT_PUBLIC(const char *) SIMIX_req_process_get_name(smx_process_t process);
- XBT_PUBLIC(int) SIMIX_req_process_is_suspended(smx_process_t process);
- XBT_PUBLIC(xbt_dict_t) SIMIX_req_process_get_properties(smx_process_t host);
+ XBT_PUBLIC(int) simcall_process_count(void);
+ XBT_PUBLIC(void *) simcall_process_get_data(smx_process_t process);
+ XBT_PUBLIC(void) simcall_process_set_data(smx_process_t process, void *data);
+ XBT_INLINE XBT_PUBLIC(smx_host_t) simcall_process_get_host(smx_process_t process);
+ XBT_PUBLIC(const char *) simcall_process_get_name(smx_process_t process);
+ XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process);
+ XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host);
  
  /* Sleep control */
- XBT_PUBLIC(e_smx_state_t) SIMIX_req_process_sleep(double duration);
+ XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration);
  
- /************************** Comunication Requests *****************************/
+ /************************** Comunication simcalls *****************************/
  /***** Rendez-vous points *****/
- XBT_PUBLIC(smx_rdv_t) SIMIX_req_rdv_create(const char *name);
- XBT_PUBLIC(void) SIMIX_req_rdv_destroy(smx_rdv_t rvp);
- XBT_PUBLIC(smx_rdv_t) SIMIX_req_rdv_get_by_name(const char *name);
- XBT_PUBLIC(int) SIMIX_req_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host);
- XBT_PUBLIC(smx_action_t) SIMIX_req_rdv_get_head(smx_rdv_t rdv);
++
+ XBT_PUBLIC(smx_rdv_t) simcall_rdv_create(const char *name);
+ XBT_PUBLIC(void) simcall_rdv_destroy(smx_rdv_t rvp);
+ XBT_PUBLIC(smx_rdv_t) simcall_rdv_get_by_name(const char *name);
+ XBT_PUBLIC(int) simcall_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host);
+ XBT_PUBLIC(smx_action_t) simcall_rdv_get_head(smx_rdv_t rdv);
+ 
 +XBT_PUBLIC(xbt_dict_t) SIMIX_get_rdv_points(void);
 +
- /***** Communication Requests *****/
+ /***** Communication simcalls *****/
  
- XBT_PUBLIC(void) SIMIX_req_comm_send(smx_rdv_t rdv, double task_size,
+ XBT_PUBLIC(void) simcall_comm_send(smx_rdv_t rdv, double task_size,
                                       double rate, void *src_buff,
                                       size_t src_buff_size,
                                       int (*match_fun)(void *, void *),

diff --cc src/mc/mc_checkpoint.c
Simple merge

diff --cc src/mc/mc_liveness.c
Simple merge

diff --cc src/mc/private.h
Simple merge

diff --cc src/simix/smx_network.c
Simple merge