X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d0a1577e793ff234e7f12de5f13572685538d10..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/simix/simcalls.in diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index dff85032ff..a657616435 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. +# Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. # 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. @@ -39,18 +39,17 @@ void process_suspend(smx_actor_t process) [[block]]; int process_join(smx_actor_t process, double timeout) [[block]]; int process_sleep(double duration) [[block]]; -int execution_wait(boost::intrusive_ptr execution) [[block]]; -int execution_test(boost::intrusive_ptr execution) [[block]]; +int execution_wait(simgrid::kernel::activity::ExecImpl* execution) [[block]]; +int execution_test(simgrid::kernel::activity::ExecImpl* execution) [[block]]; -boost::intrusive_ptr comm_iprobe(smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data); void comm_send(smx_actor_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_copy_data_func_t copy_data_fun, void* data, double timeout) [[block]]; boost::intrusive_ptr comm_isend(smx_actor_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_actor_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]]; boost::intrusive_ptr comm_irecv(smx_actor_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, double timeout) [[block]]; -void comm_wait(boost::intrusive_ptr comm, double timeout) [[block]]; -int comm_test(boost::intrusive_ptr comm) [[block]]; -int comm_testany(boost::intrusive_ptr* comms, size_t count) [[block]]; +int comm_waitany(simgrid::kernel::activity::CommImpl** comms, size_t count, double timeout) [[block]]; +void comm_wait(simgrid::kernel::activity::CommImpl* comm, double timeout) [[block]]; +int comm_test(simgrid::kernel::activity::CommImpl* comm) [[block]]; +int comm_testany(simgrid::kernel::activity::CommImpl** comms, size_t count) [[block]]; void mutex_lock(smx_mutex_t mutex) [[block]]; int mutex_trylock(smx_mutex_t mutex); @@ -62,7 +61,7 @@ int cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) void sem_acquire(smx_sem_t sem) [[block]]; int sem_acquire_timeout(smx_sem_t sem, double timeout) [[block]]; -sg_size_t io_wait(boost::intrusive_ptr io) [[block]]; +sg_size_t io_wait(simgrid::kernel::activity::IoImpl* io) [[block]]; int mc_random(int min, int max);