From: Martin Quinson Date: Sun, 2 Nov 2014 17:57:44 +0000 (+0100) Subject: better handling of blocking simcalls in the generated popping X-Git-Tag: v3_12~732^2~250 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d84e29a724c9f6a2470db8a48cd7f97c3c02c9e0?ds=sidebyside better handling of blocking simcalls in the generated popping Blocking simcalls were marked as simcalls returning void. Being explicit helps in that obscure part of the code. --- diff --git a/doc/doxygen/inside_extending.doc b/doc/doxygen/inside_extending.doc index 546a6c69ef..8dfd2121d2 100644 --- a/doc/doxygen/inside_extending.doc +++ b/doc/doxygen/inside_extending.doc @@ -131,8 +131,12 @@ The workflow of a simcall is the following: - If not, call `SIMIX_process_yield` to give back the control to maestro - ========== KERNEL MODE ========== - `SIMIX_simcall_handle` large switch (on simcall) doing for each: - - `simcall_HANDLER_(simcall, )` - - `SIMIX_simcall_answer(simcall)` + - `simcall_HANDLER_(simcall, )` (the manual code handling the simcall) + - If the simcall is not marked as "blocking" in its definition, + call `SIMIX_simcall_answer(simcall)` that adds back the issuer + process to the list of processes to run in the next scheduling round. + It is thus the responsability of the blocking simcalls to call + `SIMIX_simcall_answer(simcall)` themselves in their handler. To simplify the simcall creation, a python script generates most of the code and give helpers for the remaining stuff. That script reads diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index e211d987e4..4f79531bc8 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -1,134 +1,138 @@ -# Copyright (c) 2014. The SimGrid Team. -# All rights reserved. +# Copyright (c) 2014. 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. -# name has_answer (restype,rescast) (arg0name,arg0type,arg0cast) (arg1name,arg1type,arg1cast) -host_get_by_name True (void*, smx_host_t) (name, const char*) -host_get_name True (const char*) (host, void*, smx_host_t) -host_on True (void) (host, void*, smx_host_t) -host_off True (void) (host, void*, smx_host_t) -host_get_properties True (void*, xbt_dict_t) (host, void*, smx_host_t) -host_get_core True (int) (host, void*, smx_host_t) -host_get_process_list True (void*, xbt_swag_t) (host, void*, smx_host_t) -host_get_speed True (double) (host, void*, smx_host_t) -host_get_available_speed True (double) (host, void*, smx_host_t) -host_get_state True (int) (host, void*, smx_host_t) -host_get_current_power_peak True (double) (host, void*, smx_host_t) -host_get_power_peak_at True (double) (host, void*, smx_host_t) (pstate_index, int) -host_get_nb_pstates True (int) (host, void*, smx_host_t) -host_set_power_peak_at True (void) (host, void*, smx_host_t) (pstate_index, int) -host_get_consumed_energy True (double) (host, void*, smx_host_t) -host_execute True (void*, smx_action_t) (name, const char*) (host, void*, smx_host_t) (computation_amount, double) (priority, double) (bound, double) (affinity_mask, unsigned long) -host_parallel_execute True (void*, smx_action_t) (name, const char*) (host_nb, int) (host_list, void*, smx_host_t*) (computation_amount, void*, double*) (communication_amount, void*, double*) (amount, double) (rate, double) -host_execution_destroy True (void) (execution, void*, smx_action_t) -host_execution_cancel True (void) (execution, void*, smx_action_t) -host_execution_get_remains True (double) (execution, void*, smx_action_t) -host_execution_get_state True (int, e_smx_state_t) (execution, void*, smx_action_t) -host_execution_set_priority True (void) (execution, void*, smx_action_t) (priority, double) -host_execution_set_bound True (void) (execution, void*, smx_action_t) (bound, double) -host_execution_set_affinity True (void) (execution, void*, smx_action_t) (ws, void*, smx_host_t) (mask, unsigned long) -host_execution_wait False (int) (execution, void*, smx_action_t) -host_get_mounted_storage_list True (void*, xbt_dict_t) (host, void*, smx_host_t) -host_get_attached_storage_list True (void*, xbt_dynar_t) (host, void*, smx_host_t) -host_get_params True (void) (ind_vm, void*, smx_host_t) (params, void*, ws_params_t) -host_set_params True (void) (ind_vm, void*, smx_host_t) (params, void*, ws_params_t) -vm_create True (void*, smx_host_t) (name, const char*) (ind_pm, void*, smx_host_t) -vm_start True (void) (ind_vm, void*, smx_host_t) -vm_get_state True (int) (ind_vm, void*, smx_host_t) -vm_migrate True (void) (ind_vm, void*, smx_host_t) (ind_dst_pm, void*, smx_host_t) -vm_get_pm True (void*) (ind_vm, void*, smx_host_t) -vm_set_bound True (void) (ind_vm, void*, smx_host_t) (bound, double) -vm_set_affinity True (void) (ind_vm, void*, smx_host_t) (ind_pm, void*, smx_host_t) (mask, unsigned long) -vm_destroy True (void) (ind_vm, void*, smx_host_t) -vm_suspend True (void) (ind_vm, void*, smx_host_t) -vm_resume True (void) (ind_vm, void*, smx_host_t) -vm_shutdown True (void) (ind_vm, void*, smx_host_t) -vm_save True (void) (ind_vm, void*, smx_host_t) -vm_restore True (void) (ind_vm, void*, smx_host_t) -process_create True (void) (process, void*, smx_process_t*) (name, const char*) (code, FPtr, xbt_main_func_t) (data, void*) (hostname, const char*) (kill_time, double) (argc, int) (argv, void*, char**) (properties, void*, xbt_dict_t) (auto_restart, int) -process_kill True (void) (process, void*, smx_process_t) -process_killall True (void) (reset_pid, int) -process_cleanup True (void) (process, void*, smx_process_t) -process_change_host True (void) (process, void*, smx_process_t) (dest, void*, smx_host_t) -process_suspend False (void) (process, void*, smx_process_t) -process_resume True (void) (process, void*, smx_process_t) -process_count True (int) -process_get_PID True (int) (process, void*, smx_process_t) -process_get_PPID True (int) (process, void*, smx_process_t) -process_get_data True (void*) (process, void*, smx_process_t) -process_set_data True (void) (process, void*, smx_process_t) (data, void*) -process_get_host True (void*, smx_host_t) (process, void*, smx_process_t) -process_get_name True (const char*) (process, void*, smx_process_t) -process_is_suspended True (int) (process, void*, smx_process_t) -process_get_properties True (void*, xbt_dict_t) (process, void*, smx_process_t) -process_join False (int) (process, void*, smx_process_t) (timeout, double) -process_sleep False (int) (duration, double) -process_on_exit True (void) (process, void*, smx_process_t) (fun, FPtr, int_f_pvoid_pvoid_t) (data, void*) -process_auto_restart_set True (void) (process, void*, smx_process_t) (auto_restart, int) -process_restart True (void*, smx_process_t) (process, void*, smx_process_t) -rdv_create True (void*, smx_rdv_t) (name, const char*) -rdv_destroy True (void) (rdv, void*, smx_rdv_t) -#rdv_get_by_name True (void*, smx_host_t) (name, const char*) -rdv_comm_count_by_host True (unsigned int) (rdv, void*, smx_rdv_t) (host, void*, smx_host_t) -rdv_get_head True (void*, smx_action_t) (rdv, void*, smx_rdv_t) -rdv_set_receiver True (void) (rdv, void*, smx_rdv_t) (receiver, void*, smx_process_t) -rdv_get_receiver True (void*, smx_process_t) (rdv, void*, smx_rdv_t) -comm_iprobe True (void*, smx_action_t) (rdv, void*, smx_rdv_t) (type, int) (src, int) (tag, int) (match_fun, FPtr, simix_match_func_t) (data, void*) -comm_send False (void) (src, void*, smx_process_t) (rdv, void*, smx_rdv_t) (task_size, double) (rate, double) (src_buff, void*) (src_buff_size, size_t) (match_fun, FPtr, simix_match_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (timeout, double) -comm_isend True (void*, smx_action_t) (src, void*, smx_process_t) (rdv, void*, smx_rdv_t) (task_size, double) (rate, double) (src_buff, void*) (src_buff_size, size_t) (match_fun, FPtr, simix_match_func_t) (clean_fun, FPtr, simix_clean_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (detached, int) -comm_recv False (void) (rdv, void*, smx_rdv_t) (dst_buff, void*) (dst_buff_size, void*, size_t*) (match_fun, FPtr, simix_match_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (timeout, double) (rate, double) -comm_irecv True (void*, smx_action_t) (rdv, void*, smx_rdv_t) (dst_buff, void*) (dst_buff_size, void*, size_t*) (match_fun, FPtr, simix_match_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (rate, double) -comm_cancel True (void) (comm, void*, smx_action_t) -comm_waitany False (int) (comms, void*, xbt_dynar_t) -comm_wait False (void) (comm, void*, smx_action_t) (timeout, double) -comm_test False (int) (comm, void*, smx_action_t) -comm_testany False (int) (comms, void*, xbt_dynar_t) -comm_get_remains True (double) (comm, void*, smx_action_t) -comm_get_state True (int, e_smx_state_t) (comm, void*, smx_action_t) -comm_get_src_data True (void*) (comm, void*, smx_action_t) -comm_get_dst_data True (void*) (comm, void*, smx_action_t) -comm_get_src_proc True (void*, smx_process_t) (comm, void*, smx_action_t) -comm_get_dst_proc True (void*, smx_process_t) (comm, void*, smx_action_t) -mutex_init True (void*, smx_mutex_t) -mutex_destroy True (void) (mutex, void*, smx_mutex_t) -mutex_lock False (void) (mutex, void*, smx_mutex_t) -mutex_trylock True (int) (mutex, void*, smx_mutex_t) -mutex_unlock True (void) (mutex, void*, smx_mutex_t) -cond_init True (void*, smx_cond_t) -cond_destroy True (void) (cond, void*, smx_cond_t) -cond_signal True (void) (cond, void*, smx_cond_t) -cond_wait False (void) (cond, void*, smx_cond_t) (mutex, void*, smx_mutex_t) -cond_wait_timeout False (void) (cond, void*, smx_cond_t) (mutex, void*, smx_mutex_t) (timeout, double) -cond_broadcast True (void) (cond, void*, smx_cond_t) -sem_init True (void*, smx_sem_t) (capacity, unsigned int) -sem_destroy True (void) (sem, void*, smx_sem_t) -sem_release True (void) (sem, void*, smx_sem_t) -sem_would_block True (int) (sem, void*, smx_sem_t) -sem_acquire False (void) (sem, void*, smx_sem_t) -sem_acquire_timeout False (void) (sem, void*, smx_sem_t) (timeout, double) -sem_get_capacity True (int) (sem, void*, smx_sem_t) -file_read False (sg_size_t) (fd, void*, smx_file_t) (size, sg_size_t) (host, void*, smx_host_t) -file_write False (sg_size_t) (fd, void*, smx_file_t) (size, sg_size_t) (host, void*, smx_host_t) -file_open False (void*, smx_file_t) (fullpath, const char*) (host, void*, smx_host_t) -file_close False (int) (fd, void*, smx_file_t) (host, void*, smx_host_t) -file_unlink True (int) (fd, void*, smx_file_t) (host, void*, smx_host_t) -file_get_size True (sg_size_t) (fd, void*, smx_file_t) -file_tell True (sg_size_t) (fd, void*, smx_file_t) -file_seek True (int) (fd, void*, smx_file_t) (offset, sg_offset_t) (origin, int) -file_get_info True (void*, xbt_dynar_t) (fd, void*, smx_file_t) -file_move True (int) (fd, void*, smx_file_t) (fullpath, const char*) -storage_get_free_size True (sg_size_t) (storage, void*, smx_storage_t) -storage_get_used_size True (sg_size_t) (name, void*, smx_storage_t) -storage_get_properties True (void*, xbt_dict_t) (storage, void*, smx_storage_t) -storage_get_content True (void*, xbt_dict_t) (storage, void*, smx_storage_t) -asr_get_properties True (void*, xbt_dict_t) (name, const char*) +# CallType name (resulttype,resultcast) (arg0name,arg0type,arg0cast) (arg1name,arg1type,arg1cast) + +# CallType must be one of the three: +# - Func: returning a value immediately +# - Blck: Blocking call that does not return in the same scheduling round +# - Proc: not returning any value (but doing so immediately) + +Func host_get_by_name (void*, smx_host_t) (name, const char*) +Func host_get_name (const char*) (host, void*, smx_host_t) +Proc host_on (void) (host, void*, smx_host_t) +Proc host_off (void) (host, void*, smx_host_t) +Func host_get_properties (void*, xbt_dict_t) (host, void*, smx_host_t) +Func host_get_core (int) (host, void*, smx_host_t) +Func host_get_process_list (void*, xbt_swag_t) (host, void*, smx_host_t) +Func host_get_speed (double) (host, void*, smx_host_t) +Func host_get_available_speed (double) (host, void*, smx_host_t) +Func host_get_state (int) (host, void*, smx_host_t) +Func host_get_current_power_peak (double) (host, void*, smx_host_t) +Func host_get_power_peak_at (double) (host, void*, smx_host_t) (pstate_index, int) +Func host_get_nb_pstates (int) (host, void*, smx_host_t) +Proc host_set_power_peak_at (void) (host, void*, smx_host_t) (pstate_index, int) +Func host_get_consumed_energy (double) (host, void*, smx_host_t) +Func host_execute (void*, smx_action_t) (name, const char*) (host, void*, smx_host_t) (computation_amount, double) (priority, double) (bound, double) (affinity_mask, unsigned long) +Func host_parallel_execute (void*, smx_action_t) (name, const char*) (host_nb, int) (host_list, void*, smx_host_t*) (computation_amount, void*, double*) (communication_amount, void*, double*) (amount, double) (rate, double) +Proc host_execution_destroy (void) (execution, void*, smx_action_t) +Proc host_execution_cancel (void) (execution, void*, smx_action_t) +Func host_execution_get_remains (double) (execution, void*, smx_action_t) +Func host_execution_get_state (int, e_smx_state_t) (execution, void*, smx_action_t) +Proc host_execution_set_priority (void) (execution, void*, smx_action_t) (priority, double) +Proc host_execution_set_bound (void) (execution, void*, smx_action_t) (bound, double) +Proc host_execution_set_affinity (void) (execution, void*, smx_action_t) (ws, void*, smx_host_t) (mask, unsigned long) +Blck host_execution_wait (int) (execution, void*, smx_action_t) +Func host_get_mounted_storage_list (void*, xbt_dict_t) (host, void*, smx_host_t) +Func host_get_attached_storage_list (void*, xbt_dynar_t) (host, void*, smx_host_t) +Proc host_get_params (void) (ind_vm, void*, smx_host_t) (params, void*, ws_params_t) +Proc host_set_params (void) (ind_vm, void*, smx_host_t) (params, void*, ws_params_t) +Func vm_create (void*, smx_host_t) (name, const char*) (ind_pm, void*, smx_host_t) +Proc vm_start (void) (ind_vm, void*, smx_host_t) +Func vm_get_state (int) (ind_vm, void*, smx_host_t) +Proc vm_migrate (void) (ind_vm, void*, smx_host_t) (ind_dst_pm, void*, smx_host_t) +Func vm_get_pm (void*) (ind_vm, void*, smx_host_t) +Proc vm_set_bound (void) (ind_vm, void*, smx_host_t) (bound, double) +Proc vm_set_affinity (void) (ind_vm, void*, smx_host_t) (ind_pm, void*, smx_host_t) (mask, unsigned long) +Proc vm_destroy (void) (ind_vm, void*, smx_host_t) +Proc vm_suspend (void) (ind_vm, void*, smx_host_t) +Proc vm_resume (void) (ind_vm, void*, smx_host_t) +Proc vm_shutdown (void) (ind_vm, void*, smx_host_t) +Proc vm_save (void) (ind_vm, void*, smx_host_t) +Proc vm_restore (void) (ind_vm, void*, smx_host_t) +Proc process_create (void) (process, void*, smx_process_t*) (name, const char*) (code, FPtr, xbt_main_func_t) (data, void*) (hostname, const char*) (kill_time, double) (argc, int) (argv, void*, char**) (properties, void*, xbt_dict_t) (auto_restart, int) +Proc process_kill (void) (process, void*, smx_process_t) +Proc process_killall (void) (reset_pid, int) +Proc process_cleanup (void) (process, void*, smx_process_t) +Proc process_change_host (void) (process, void*, smx_process_t) (dest, void*, smx_host_t) +Blck process_suspend (void) (process, void*, smx_process_t) +Proc process_resume (void) (process, void*, smx_process_t) +Func process_count (int) +Func process_get_PID (int) (process, void*, smx_process_t) +Func process_get_PPID (int) (process, void*, smx_process_t) +Func process_get_data (void*) (process, void*, smx_process_t) +Proc process_set_data (void) (process, void*, smx_process_t) (data, void*) +Func process_get_host (void*, smx_host_t) (process, void*, smx_process_t) +Func process_get_name (const char*) (process, void*, smx_process_t) +Func process_is_suspended (int) (process, void*, smx_process_t) +Func process_get_properties (void*, xbt_dict_t) (process, void*, smx_process_t) +Blck process_join (int) (process, void*, smx_process_t) (timeout, double) +Blck process_sleep (int) (duration, double) +Proc process_on_exit (void) (process, void*, smx_process_t) (fun, FPtr, int_f_pvoid_pvoid_t) (data, void*) +Proc process_auto_restart_set (void) (process, void*, smx_process_t) (auto_restart, int) +Func process_restart (void*, smx_process_t) (process, void*, smx_process_t) +Func rdv_create (void*, smx_rdv_t) (name, const char*) +Proc rdv_destroy (void) (rdv, void*, smx_rdv_t) +Func rdv_comm_count_by_host (unsigned int) (rdv, void*, smx_rdv_t) (host, void*, smx_host_t) +Func rdv_get_head (void*, smx_action_t) (rdv, void*, smx_rdv_t) +Proc rdv_set_receiver (void) (rdv, void*, smx_rdv_t) (receiver, void*, smx_process_t) +Func rdv_get_receiver (void*, smx_process_t) (rdv, void*, smx_rdv_t) +Func comm_iprobe (void*, smx_action_t) (rdv, void*, smx_rdv_t) (type, int) (src, int) (tag, int) (match_fun, FPtr, simix_match_func_t) (data, void*) +Blck comm_send (void) (src, void*, smx_process_t) (rdv, void*, smx_rdv_t) (task_size, double) (rate, double) (src_buff, void*) (src_buff_size, size_t) (match_fun, FPtr, simix_match_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (timeout, double) +Func comm_isend (void*, smx_action_t) (src, void*, smx_process_t) (rdv, void*, smx_rdv_t) (task_size, double) (rate, double) (src_buff, void*) (src_buff_size, size_t) (match_fun, FPtr, simix_match_func_t) (clean_fun, FPtr, simix_clean_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (detached, int) +Blck comm_recv (void) (rdv, void*, smx_rdv_t) (dst_buff, void*) (dst_buff_size, void*, size_t*) (match_fun, FPtr, simix_match_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (timeout, double) (rate, double) +Func comm_irecv (void*, smx_action_t) (rdv, void*, smx_rdv_t) (dst_buff, void*) (dst_buff_size, void*, size_t*) (match_fun, FPtr, simix_match_func_t) (copy_data_fun, FPtr, simix_copy_data_func_t) (data, void*) (rate, double) +Proc comm_cancel (void) (comm, void*, smx_action_t) +Blck comm_waitany (int) (comms, void*, xbt_dynar_t) +Blck comm_wait (void) (comm, void*, smx_action_t) (timeout, double) +Blck comm_test (int) (comm, void*, smx_action_t) +Blck comm_testany (int) (comms, void*, xbt_dynar_t) +Func comm_get_remains (double) (comm, void*, smx_action_t) +Func comm_get_state (int, e_smx_state_t) (comm, void*, smx_action_t) +Func comm_get_src_data (void*) (comm, void*, smx_action_t) +Func comm_get_dst_data (void*) (comm, void*, smx_action_t) +Func comm_get_src_proc (void*, smx_process_t) (comm, void*, smx_action_t) +Func comm_get_dst_proc (void*, smx_process_t) (comm, void*, smx_action_t) +Func mutex_init (void*, smx_mutex_t) +Proc mutex_destroy (void) (mutex, void*, smx_mutex_t) +Blck mutex_lock (void) (mutex, void*, smx_mutex_t) +Func mutex_trylock (int) (mutex, void*, smx_mutex_t) +Proc mutex_unlock (void) (mutex, void*, smx_mutex_t) +Func cond_init (void*, smx_cond_t) +Proc cond_destroy (void) (cond, void*, smx_cond_t) +Proc cond_signal (void) (cond, void*, smx_cond_t) +Blck cond_wait (void) (cond, void*, smx_cond_t) (mutex, void*, smx_mutex_t) +Blck cond_wait_timeout (void) (cond, void*, smx_cond_t) (mutex, void*, smx_mutex_t) (timeout, double) +Proc cond_broadcast (void) (cond, void*, smx_cond_t) +Func sem_init (void*, smx_sem_t) (capacity, unsigned int) +Proc sem_destroy (void) (sem, void*, smx_sem_t) +Proc sem_release (void) (sem, void*, smx_sem_t) +Func sem_would_block (int) (sem, void*, smx_sem_t) +Blck sem_acquire (void) (sem, void*, smx_sem_t) +Blck sem_acquire_timeout (void) (sem, void*, smx_sem_t) (timeout, double) +Func sem_get_capacity (int) (sem, void*, smx_sem_t) +Blck file_read (sg_size_t) (fd, void*, smx_file_t) (size, sg_size_t) (host, void*, smx_host_t) +Blck file_write (sg_size_t) (fd, void*, smx_file_t) (size, sg_size_t) (host, void*, smx_host_t) +Blck file_open (void*, smx_file_t) (fullpath, const char*) (host, void*, smx_host_t) +Blck file_close (int) (fd, void*, smx_file_t) (host, void*, smx_host_t) +Func file_unlink (int) (fd, void*, smx_file_t) (host, void*, smx_host_t) +Func file_get_size (sg_size_t) (fd, void*, smx_file_t) +Func file_tell (sg_size_t) (fd, void*, smx_file_t) +Func file_seek (int) (fd, void*, smx_file_t) (offset, sg_offset_t) (origin, int) +Func file_get_info (void*, xbt_dynar_t) (fd, void*, smx_file_t) +Func file_move (int) (fd, void*, smx_file_t) (fullpath, const char*) +Func storage_get_free_size (sg_size_t) (storage, void*, smx_storage_t) +Func storage_get_used_size (sg_size_t) (name, void*, smx_storage_t) +Func storage_get_properties (void*, xbt_dict_t) (storage, void*, smx_storage_t) +Func storage_get_content (void*, xbt_dict_t) (storage, void*, smx_storage_t) +Func asr_get_properties (void*, xbt_dict_t) (name, const char*) ## HAVE_LATENCY_BOUND_TRACKING -comm_is_latency_bounded True (int) (comm, void*, smx_action_t) +Func comm_is_latency_bounded (int) (comm, void*, smx_action_t) ## HAVE_TRACING -set_category True (void) (action, void*, smx_action_t) (category, const char*) +Proc set_category (void) (action, void*, smx_action_t) (category, const char*) ## HAVE_MC -mc_snapshot True (void*, mc_snapshot_t) -mc_compare_snapshots True (int) (s1, void*, mc_snapshot_t) (s2, void*, mc_snapshot_t) -mc_random True (int) (min, int) (max, int) +Func mc_snapshot (void*, mc_snapshot_t) +Func mc_compare_snapshots (int) (s1, void*, mc_snapshot_t) (s2, void*, mc_snapshot_t) +Func mc_random (int) (min, int) (max, int) diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index a560cee33e..0861c1f97d 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -48,11 +48,11 @@ class Arg(object): class Simcall(object): simcalls_BODY = None simcalls_PRE = None - def __init__(self, name, res, args, has_answer=True): + def __init__(self, name, res, args, call_kind): self.name = name self.res = res self.args = args - self.has_answer = has_answer + self.call_kind = call_kind def check(self): # libsmx.c simcall_BODY_ @@ -121,11 +121,11 @@ class Simcall(object): %ssimcall_HANDLER_%s(simcall %s); %sbreak; '''%(self.name.upper(), - 'simcall->result.%s = '%self.res.field() if self.res.type != 'void' and self.has_answer else ' ', + 'simcall->result.%s = '%self.res.field() if self.call_kind == 'Func' else ' ', self.name, ''.join(', %s simcall->args[%d].%s'%(arg.cast(), i, arg.field()) for i, arg in enumerate(self.args)), - 'SIMIX_simcall_answer(simcall);\n ' if self.has_answer else ' ') + 'SIMIX_simcall_answer(simcall);\n ' if self.call_kind != 'Blck' else ' ') def body(self): return ''' @@ -160,7 +160,7 @@ inline static %s simcall_BODY_%s(%s) { ,'' if self.res.type == 'void' else 'return self->simcall.result.%s;'%self.res.field()) def handler_prototype(self): - return "%s simcall_HANDLER_%s(smx_simcall_t simcall%s);"%(self.res.rettype() if self.has_answer else 'void', self.name, ''.join(', %s %s'%(arg.rettype(), arg.name) + return "%s simcall_HANDLER_%s(smx_simcall_t simcall%s);"%(self.res.rettype() if self.call_kind == 'Func' else 'void', self.name, ''.join(', %s %s'%(arg.rettype(), arg.name) for i, arg in enumerate(self.args))) def parse(fn): @@ -175,11 +175,12 @@ def parse(fn): continue match = re.match(r'(\S*?) *(\S*?) *\((.*?)(?:, *(.*?))?\) *(.*)', line) assert match, line - name, ans, rest, resc, args = match.groups() + ans, name, rest, resc, args = match.groups() + assert (ans == 'Proc' or ans == 'Func' or ans == 'Blck'),"Invalid call type: '%s'. Faulty line:\n%s\n"%(ans,line) sargs = [] for n,t,c in re.findall(r'\((.*?), *(.*?)(?:, *(.*?))?\)', args): sargs.append(Arg(n,t,c)) - sim = Simcall(name, Arg('result', rest, resc), sargs, ans == 'True') + sim = Simcall(name, Arg('result', rest, resc), sargs, ans) if resdi is None: simcalls.append(sim) else: