X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e18a7b043d161b29d0bf3f5743cb7a570241576a..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/simix/simcalls.in diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index 83970631aa..a657616435 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2016. 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. @@ -20,8 +20,8 @@ # The `nohandler` is used to disable handlers. # I wish we could completely remove the handlers as their only use is # to adapt the interface between the exported symbol that is visible -# by the user applications and the internal symbol that is implemented -# by the kernel. +# by the user applications and the internal symbol that is implemented +# by the kernel. # The only remaining use of that mechanism is to add the caller # identity as a parameter of internal call, but that could be # automated too (eg by having a special parameter type called "self") @@ -30,51 +30,40 @@ # you should complete the libsmx.c file by adding the corresponding function # (a.k.a. stub). Anyway, if you omit to do it, the invocation of ./simcalls.py will notify you ;) # If you want to remove an handler, it is important to remove although -# the corresponding code (simcall_HANDLER_name_of_simcall(xxx) (note that comment the code +# the corresponding code (simcall_HANDLER_name_of_simcall(xxx) (note that comment the code # is not sufficient, the python script does not check whether the code is commented or not). # Last but not the least, you should declare the new simix call in # ./include/simgrid/simix.h (otherwise you will get a warning at compile time) -void process_killall(int reset_pid); -void process_cleanup(smx_actor_t process) [[nohandler]]; void process_suspend(smx_actor_t process) [[block]]; int process_join(smx_actor_t process, double timeout) [[block]]; int process_sleep(double duration) [[block]]; -boost::intrusive_ptr execution_start(const char* name, double flops_amount, double priority, double bound); -boost::intrusive_ptr execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate, double timeout) [[nohandler]]; -int execution_wait(boost::intrusive_ptr execution) [[block]]; +int execution_wait(simgrid::kernel::activity::ExecImpl* execution) [[block]]; +int execution_test(simgrid::kernel::activity::ExecImpl* execution) [[block]]; -void process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) [[nohandler]]; - -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); void mutex_unlock(smx_mutex_t mutex); -smx_cond_t cond_init() [[nohandler]]; -void cond_signal(smx_cond_t cond) [[nohandler]]; void cond_wait(smx_cond_t cond, smx_mutex_t mutex) [[block]]; -void cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) [[block]]; -void cond_broadcast(smx_cond_t cond) [[nohandler]]; +int cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) [[block]]; void sem_acquire(smx_sem_t sem) [[block]]; -void sem_acquire_timeout(smx_sem_t sem, double timeout) [[block]]; +int sem_acquire_timeout(smx_sem_t sem, double timeout) [[block]]; -sg_size_t file_read(surf_file_t fd, sg_size_t size) [[block]]; -sg_size_t file_write(surf_file_t fd, sg_size_t size) [[block]]; +sg_size_t io_wait(simgrid::kernel::activity::IoImpl* io) [[block]]; int mc_random(int min, int max); -void set_category(boost::intrusive_ptr synchro, const char* category) [[nohandler]]; void run_kernel(std::function const* code) [[nohandler]]; void run_blocking(std::function const* code) [[block,nohandler]];