Merge s4u wait_any

diff --cc include/simgrid/simix.h
index f996f13,dd789b2..6b7f31b
--- 1/include/simgrid/simix.h
--- 2/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@@ -359,10 -359,10 +359,10 @@@ XBT_PUBLIC(smx_synchro_t) simcall_comm_
  XBT_PUBLIC(void) simcall_comm_cancel(smx_synchro_t comm);
  
  /* FIXME: waitany is going to be a vararg function, and should take a timeout */
- XBT_PUBLIC(unsigned int) simcall_comm_waitany(xbt_dynar_t comms);
+ XBT_PUBLIC(unsigned int) simcall_comm_waitany(xbt_dynar_t comms, double timeout);
  XBT_PUBLIC(void) simcall_comm_wait(smx_synchro_t comm, double timeout);
  XBT_PUBLIC(int) simcall_comm_test(smx_synchro_t comm);
 -XBT_PUBLIC(int) simcall_comm_testany(xbt_dynar_t comms);
 +XBT_PUBLIC(int) simcall_comm_testany(smx_synchro_t* comms, size_t count);
  
  /************************** Tracing handling **********************************/
  XBT_PUBLIC(void) simcall_set_category(smx_synchro_t synchro, const char *category);

diff --cc src/msg/msg_gos.cpp
Simple merge

diff --cc src/simix/libsmx.cpp
Simple merge

diff --cc src/simix/popping_accessors.h
index 64db9d1,e74bb3b..dede08b
--- 1/src/simix/popping_accessors.h
--- 2/src/simix/popping_accessors.h
+++ b/src/simix/popping_accessors.h
@@@ -1185,10 -1185,10 +1191,10 @@@ XBT_PRIVATE void simcall_HANDLER_comm_s
  XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
  XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate);
  XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
- XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms);
+ XBT_PRIVATE void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t comms, double timeout);
  XBT_PRIVATE void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t comm, double timeout);
  XBT_PRIVATE void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t comm);
 -XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t comms);
 +XBT_PRIVATE void simcall_HANDLER_comm_testany(smx_simcall_t simcall, smx_synchro_t* comms, size_t count);
  XBT_PRIVATE smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall);
  XBT_PRIVATE void simcall_HANDLER_mutex_lock(smx_simcall_t simcall, smx_mutex_t mutex);
  XBT_PRIVATE int simcall_HANDLER_mutex_trylock(smx_simcall_t simcall, smx_mutex_t mutex);

diff --cc src/simix/popping_bodies.cpp
Simple merge

diff --cc src/simix/popping_generated.cpp
Simple merge

diff --cc src/simix/simcalls.in
index dbef079,185f440..476dd57
--- 1/src/simix/simcalls.in
--- 2/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@@ -72,10 -72,10 +72,10 @@@ void          comm_send(smx_process_t s
  smx_synchro_t comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
  void          comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate) [[block]];
  smx_synchro_t comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
- int           comm_waitany(xbt_dynar_t comms) [[block]];
+ int           comm_waitany(xbt_dynar_t comms, double timeout) [[block]];
  void          comm_wait(smx_synchro_t comm, double timeout) [[block]];
  int           comm_test(smx_synchro_t comm) [[block]];
 -int           comm_testany(xbt_dynar_t comms) [[block]];
 +int           comm_testany(smx_synchro_t* comms, size_t count) [[block]];
  
  smx_mutex_t mutex_init();
  void        mutex_lock(smx_mutex_t mutex) [[block]];

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

diff --cc src/smpi/smpi_base.cpp
Simple merge