From: Paul Bédaride Date: Thu, 30 Jan 2014 12:24:06 +0000 (+0100) Subject: Add checking for simcalls X-Git-Tag: v3_11_beta~116 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cf1e90eacef94ed2c30fc806887f3c6e6319544e?hp=da48d2595ba1a9a5879aeabebe3af3d413cdc6ff Add checking for simcalls --- diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index e0f9a2e19f..8ecb03347d 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import re +import re, glob types = [('TCHAR', 'char', 'c') ,('TSTRING', 'const char*', 'cc') @@ -39,12 +39,60 @@ class Arg(object): return '(%s)'%self.casted if self.casted else '' class Simcall(object): + simcalls_BODY = None + simcalls_PRE = None def __init__(self, name, res, args, has_answer=True): self.name = name self.res = res self.args = args self.has_answer = has_answer + def check(self): + # smx_user.c simcall_BODY_ + # smx_*.c void SIMIX_pre_host_on(smx_simcall_t simcall, smx_host_t h) + self.check_body() + self.check_pre() + + def check_body(self): + if self.simcalls_BODY is None: + f = open('smx_user.c') + self.simcalls_BODY = set(re.findall('simcall_BODY_(.*?)\(', f.read())) + f.close() + if self.name not in self.simcalls_BODY: + print '# ERROR: No function calling simcall_BODY_%s'%self.name + print '# Add something like this to smx_user.c:' + print '''%s simcall_%s(%s) +{ + return simcall_BODY_%s(%s); +}\n'''%(self.res.ret() + ,self.name + ,', '.join('%s %s'%(arg.ret(), arg.name) + for arg in self.args) + ,self.name + ,', '.join(arg.name for arg in self.args)) + return False + return True + + def check_pre(self): + if self.simcalls_PRE is None: + self.simcalls_PRE = set() + for fn in glob.glob('smx_*') + glob.glob('../mc/*'): + f = open(fn) + self.simcalls_PRE |= set(re.findall('SIMIX_pre_(.*?)\(', f.read())) + f.close() + if self.name not in self.simcalls_PRE: + print '# ERROR: No function called SIMIX_pre_%s'%self.name + print '# Add something like this to smx_.*.c:' + print '''%s SIMIX_pre_%s(smx_simcall_t simcall%s) +{ + // Your code handling the simcall +}\n'''%(self.res.ret() + ,self.name + ,''.join(', %s %s'%(arg.ret(), arg.name) + for arg in self.args)) + return False + return True + def enum(self): return 'SIMCALL_%s,'%(self.name.upper()) @@ -86,14 +134,13 @@ class Simcall(object): def case(self): return '''case SIMCALL_%s: %sSIMIX_pre_%s(simcall %s); - %s - break; + %sbreak; '''%(self.name.upper(), 'simcall->result.%s = '%self.res.field() if self.res.type != 'void' and self.has_answer 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);' if self.has_answer else ' ') + 'SIMIX_simcall_answer(simcall);\n ' if self.has_answer else ' ') def body(self): return ''' inline static %s simcall_BODY_%s(%s) { @@ -144,18 +191,31 @@ def parse(fn): def write(fn, func, scs, scd): f = open(fn, 'w') + f.write('/*********************************************\n') + f.write(' * File Generated by src/simix/simcalls.py *\n') + f.write(' * from src/simix/simcalls.in *\n') + f.write(' * Do not modify this file, add new simcalls *\n') + f.write(' * in src/simix/simcalls.in *\n') + f.write(' *********************************************/\n\n') f.write('\n'.join(func(sc) for sc in scs)) for k, v in scd.items(): f.write('\n#ifdef %s\n%s\n#endif\n'%(k, '\n'.join(func(sc) for sc in v))) f.close() if __name__=='__main__': + import sys simcalls, simcalls_dict = parse('simcalls.in') + + ok = True + ok &= all(map(Simcall.check, simcalls)) + for k,v in simcalls_dict.items(): + ok &= all(map(Simcall.check, v)) + #if not ok: + # sys.exit(1) write('simcalls_generated_enum.h', Simcall.enum, simcalls, simcalls_dict) write('simcalls_generated_string.c', Simcall.string, simcalls, simcalls_dict) write('simcalls_generated_res_getter_setter.h', Simcall.result_getter_setter, simcalls, simcalls_dict) write('simcalls_generated_args_getter_setter.h', Simcall.args_getter_setter, simcalls, simcalls_dict) write('simcalls_generated_case.c', Simcall.case, simcalls, simcalls_dict) - write('simcalls_generated_body.c', Simcall.body, simcalls, simcalls_dict) - + write('simcalls_generated_body.c', Simcall.body, simcalls, simcalls_dict) \ No newline at end of file diff --git a/src/simix/simcalls_generated_args_getter_setter.h b/src/simix/simcalls_generated_args_getter_setter.h index 155b57dede..0db1cc8210 100644 --- a/src/simix/simcalls_generated_args_getter_setter.h +++ b/src/simix/simcalls_generated_args_getter_setter.h @@ -1,3 +1,10 @@ +/********************************************* + * File Generated by src/simix/simcalls.py * + * from src/simix/simcalls.in * + * Do not modify this file, add new simcalls * + * in src/simix/simcalls.in * + *********************************************/ + static inline const char* simcall_host_get_by_name__get__name(smx_simcall_t simcall){ return simcall->args[0].cc; } diff --git a/src/simix/simcalls_generated_body.c b/src/simix/simcalls_generated_body.c index b75571bab5..fe4a838f4a 100644 --- a/src/simix/simcalls_generated_body.c +++ b/src/simix/simcalls_generated_body.c @@ -1,3 +1,10 @@ +/********************************************* + * File Generated by src/simix/simcalls.py * + * from src/simix/simcalls.in * + * Do not modify this file, add new simcalls * + * in src/simix/simcalls.in * + *********************************************/ + inline static smx_host_t simcall_BODY_host_get_by_name(const char* name) { smx_process_t self = SIMIX_process_self(); self->simcall.call = SIMCALL_HOST_GET_BY_NAME; diff --git a/src/simix/simcalls_generated_case.c b/src/simix/simcalls_generated_case.c index 0bca529464..d9842190cb 100644 --- a/src/simix/simcalls_generated_case.c +++ b/src/simix/simcalls_generated_case.c @@ -1,3 +1,10 @@ +/********************************************* + * File Generated by src/simix/simcalls.py * + * from src/simix/simcalls.in * + * Do not modify this file, add new simcalls * + * in src/simix/simcalls.in * + *********************************************/ + case SIMCALL_HOST_GET_BY_NAME: simcall->result.dp = SIMIX_pre_host_get_by_name(simcall , simcall->args[0].cc); SIMIX_simcall_answer(simcall); @@ -130,8 +137,7 @@ case SIMCALL_HOST_EXECUTION_SET_AFFINITY: case SIMCALL_HOST_EXECUTION_WAIT: SIMIX_pre_host_execution_wait(simcall , (smx_action_t) simcall->args[0].dp); - - break; + break; case SIMCALL_HOST_GET_STORAGE_LIST: simcall->result.dp = SIMIX_pre_host_get_storage_list(simcall , (smx_host_t) simcall->args[0].dp); @@ -245,8 +251,7 @@ case SIMCALL_PROCESS_CHANGE_HOST: case SIMCALL_PROCESS_SUSPEND: SIMIX_pre_process_suspend(simcall , (smx_process_t) simcall->args[0].dp); - - break; + break; case SIMCALL_PROCESS_RESUME: SIMIX_pre_process_resume(simcall , (smx_process_t) simcall->args[0].dp); @@ -300,8 +305,7 @@ case SIMCALL_PROCESS_GET_PROPERTIES: case SIMCALL_PROCESS_SLEEP: SIMIX_pre_process_sleep(simcall , simcall->args[0].d); - - break; + break; case SIMCALL_PROCESS_ON_EXIT: SIMIX_pre_process_on_exit(simcall , (smx_process_t) simcall->args[0].dp, (int_f_pvoid_t) simcall->args[1].fp, simcall->args[2].dp); @@ -360,8 +364,7 @@ case SIMCALL_COMM_IPROBE: case SIMCALL_COMM_SEND: SIMIX_pre_comm_send(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].d, simcall->args[2].d, simcall->args[3].dp, simcall->args[4].sz, (simix_match_func_t) simcall->args[5].fp, simcall->args[6].dp, simcall->args[7].d); - - break; + break; case SIMCALL_COMM_ISEND: simcall->result.dp = SIMIX_pre_comm_isend(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].d, simcall->args[2].d, simcall->args[3].dp, simcall->args[4].sz, (simix_match_func_t) simcall->args[5].fp, (simix_clean_func_t) simcall->args[6].fp, simcall->args[7].dp, simcall->args[8].i); @@ -370,8 +373,7 @@ case SIMCALL_COMM_ISEND: case SIMCALL_COMM_RECV: SIMIX_pre_comm_recv(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].dp, (size_t*) simcall->args[2].dp, (simix_match_func_t) simcall->args[3].fp, simcall->args[4].dp, simcall->args[5].d); - - break; + break; case SIMCALL_COMM_IRECV: simcall->result.dp = SIMIX_pre_comm_irecv(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].dp, (size_t*) simcall->args[2].dp, (simix_match_func_t) simcall->args[3].fp, simcall->args[4].dp); @@ -380,8 +382,7 @@ case SIMCALL_COMM_IRECV: case SIMCALL_COMM_RECV_BOUNDED: SIMIX_pre_comm_recv_bounded(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].dp, (size_t*) simcall->args[2].dp, (simix_match_func_t) simcall->args[3].fp, simcall->args[4].dp, simcall->args[5].d, simcall->args[6].d); - - break; + break; case SIMCALL_COMM_IRECV_BOUNDED: simcall->result.dp = SIMIX_pre_comm_irecv_bounded(simcall , (smx_rdv_t) simcall->args[0].dp, simcall->args[1].dp, (size_t*) simcall->args[2].dp, (simix_match_func_t) simcall->args[3].fp, simcall->args[4].dp, simcall->args[5].d); @@ -400,23 +401,19 @@ case SIMCALL_COMM_CANCEL: case SIMCALL_COMM_WAITANY: SIMIX_pre_comm_waitany(simcall , (xbt_dynar_t) simcall->args[0].dp); - - break; + break; case SIMCALL_COMM_WAIT: SIMIX_pre_comm_wait(simcall , (smx_action_t) simcall->args[0].dp, simcall->args[1].d); - - break; + break; case SIMCALL_COMM_TEST: SIMIX_pre_comm_test(simcall , (smx_action_t) simcall->args[0].dp); - - break; + break; case SIMCALL_COMM_TESTANY: SIMIX_pre_comm_testany(simcall , (xbt_dynar_t) simcall->args[0].dp); - - break; + break; case SIMCALL_COMM_GET_REMAINS: simcall->result.d = SIMIX_pre_comm_get_remains(simcall , (smx_action_t) simcall->args[0].dp); @@ -460,8 +457,7 @@ case SIMCALL_MUTEX_DESTROY: case SIMCALL_MUTEX_LOCK: SIMIX_pre_mutex_lock(simcall , (smx_mutex_t) simcall->args[0].dp); - - break; + break; case SIMCALL_MUTEX_TRYLOCK: simcall->result.i = SIMIX_pre_mutex_trylock(simcall , (smx_mutex_t) simcall->args[0].dp); @@ -490,13 +486,11 @@ case SIMCALL_COND_SIGNAL: case SIMCALL_COND_WAIT: SIMIX_pre_cond_wait(simcall , (smx_cond_t) simcall->args[0].dp, (smx_mutex_t) simcall->args[1].dp); - - break; + break; case SIMCALL_COND_WAIT_TIMEOUT: SIMIX_pre_cond_wait_timeout(simcall , (smx_cond_t) simcall->args[0].dp, (smx_mutex_t) simcall->args[1].dp, simcall->args[2].d); - - break; + break; case SIMCALL_COND_BROADCAST: SIMIX_pre_cond_broadcast(simcall , (smx_cond_t) simcall->args[0].dp); @@ -525,13 +519,11 @@ case SIMCALL_SEM_WOULD_BLOCK: case SIMCALL_SEM_ACQUIRE: SIMIX_pre_sem_acquire(simcall , (smx_sem_t) simcall->args[0].dp); - - break; + break; case SIMCALL_SEM_ACQUIRE_TIMEOUT: SIMIX_pre_sem_acquire_timeout(simcall , (smx_sem_t) simcall->args[0].dp, simcall->args[1].d); - - break; + break; case SIMCALL_SEM_GET_CAPACITY: simcall->result.i = SIMIX_pre_sem_get_capacity(simcall , (smx_sem_t) simcall->args[0].dp); @@ -550,23 +542,19 @@ case SIMCALL_FILE_SET_DATA: case SIMCALL_FILE_READ: SIMIX_pre_file_read(simcall , (smx_file_t) simcall->args[0].dp, simcall->args[1].sgsz); - - break; + break; case SIMCALL_FILE_WRITE: SIMIX_pre_file_write(simcall , (smx_file_t) simcall->args[0].dp, simcall->args[1].sgsz); - - break; + break; case SIMCALL_FILE_OPEN: SIMIX_pre_file_open(simcall , simcall->args[0].cc, simcall->args[1].cc); - - break; + break; case SIMCALL_FILE_CLOSE: SIMIX_pre_file_close(simcall , (smx_file_t) simcall->args[0].dp); - - break; + break; case SIMCALL_FILE_UNLINK: simcall->result.i = SIMIX_pre_file_unlink(simcall , (smx_file_t) simcall->args[0].dp); @@ -575,8 +563,7 @@ case SIMCALL_FILE_UNLINK: case SIMCALL_FILE_LS: SIMIX_pre_file_ls(simcall , simcall->args[0].cc, simcall->args[1].cc); - - break; + break; case SIMCALL_FILE_GET_SIZE: simcall->result.sgsz = SIMIX_pre_file_get_size(simcall , (smx_file_t) simcall->args[0].dp); diff --git a/src/simix/simcalls_generated_enum.h b/src/simix/simcalls_generated_enum.h index 5202b3beea..4336f1b29b 100644 --- a/src/simix/simcalls_generated_enum.h +++ b/src/simix/simcalls_generated_enum.h @@ -1,3 +1,10 @@ +/********************************************* + * File Generated by src/simix/simcalls.py * + * from src/simix/simcalls.in * + * Do not modify this file, add new simcalls * + * in src/simix/simcalls.in * + *********************************************/ + SIMCALL_HOST_GET_BY_NAME, SIMCALL_HOST_GET_NAME, SIMCALL_HOST_ON, diff --git a/src/simix/simcalls_generated_res_getter_setter.h b/src/simix/simcalls_generated_res_getter_setter.h index f4f9181e15..f526cd887d 100644 --- a/src/simix/simcalls_generated_res_getter_setter.h +++ b/src/simix/simcalls_generated_res_getter_setter.h @@ -1,3 +1,10 @@ +/********************************************* + * File Generated by src/simix/simcalls.py * + * from src/simix/simcalls.in * + * Do not modify this file, add new simcalls * + * in src/simix/simcalls.in * + *********************************************/ + static inline smx_host_t simcall_host_get_by_name__get__result(smx_simcall_t simcall){ return (smx_host_t) simcall->result.dp; } diff --git a/src/simix/simcalls_generated_string.c b/src/simix/simcalls_generated_string.c index de06b0d48c..2c4d1e272b 100644 --- a/src/simix/simcalls_generated_string.c +++ b/src/simix/simcalls_generated_string.c @@ -1,3 +1,10 @@ +/********************************************* + * File Generated by src/simix/simcalls.py * + * from src/simix/simcalls.in * + * Do not modify this file, add new simcalls * + * in src/simix/simcalls.in * + *********************************************/ + [SIMCALL_HOST_GET_BY_NAME] = "SIMCALL_HOST_GET_BY_NAME", [SIMCALL_HOST_GET_NAME] = "SIMCALL_HOST_GET_NAME", [SIMCALL_HOST_ON] = "SIMCALL_HOST_ON",