X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a69dbf9a2522d0ccde10350b49c5866ed9d731bd..c3a1dd1ac6428590f64b513c07ce61c8181aeb79:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 7adcb74767..a560cee33e 100755 --- a/src/simix/simcalls.py +++ b/src/simix/simcalls.py @@ -39,7 +39,7 @@ class Arg(object): def field(self): return self.simcall_types[self.type] - def ret(self): + def rettype(self): return '%s'%self.casted if self.casted else self.type def cast(self): @@ -55,12 +55,7 @@ class Simcall(object): self.has_answer = has_answer def check(self): - # smx_user.c simcall_BODY_ - # smx_*.c void simcall_HANDLER_host_on(smx_simcall_t simcall, smx_host_t h) - self.check_body() - self.check_pre() - - def check_body(self): + # libsmx.c simcall_BODY_ if self.simcalls_BODY is None: f = open('libsmx.c') self.simcalls_BODY = set(re.findall('simcall_BODY_(.*?)\(', f.read())) @@ -68,51 +63,52 @@ class Simcall(object): if self.name not in self.simcalls_BODY: print '# ERROR: No function calling simcall_BODY_%s'%self.name print '# Add something like this to libsmx.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)) + print '%s simcall_%s(%s) {'%(self.res.rettype() ,self.name ,', '.join('%s %s'%(arg.rettype(), arg.name) for arg in self.args)) + print ' return simcall_BODY_%s(%s);'%(self.name) + print '}' + return False + + # smx_*.c void simcall_HANDLER_host_on(smx_simcall_t simcall, smx_host_t h) + 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('simcall_HANDLER_(.*?)\(', f.read())) + f.close() + if self.name not in self.simcalls_PRE: + print '# ERROR: No function called simcall_HANDLER_%s'%self.name + print '# Add something like this to the relevant C file (like smx_io.c if it\'s an IO call):' + print '%s simcall_HANDLER_%s(smx_simcall_t simcall%s) {'%(self.res.rettype() + ,self.name + ,''.join(', %s %s'%(arg.rettype(), arg.name) + for arg in self.args)) + print ' // Your code handling the simcall' + print '}' 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('simcall_HANDLER_(.*?)\(', f.read())) - f.close() - if self.name not in self.simcalls_PRE: - print '# ERROR: No function called simcall_HANDLER_%s'%self.name - print '# Add something like this to smx_.*.c:' - print '''%s simcall_HANDLER_%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()) def string(self): - return '[SIMCALL_%s] = "SIMCALL_%s",'%(self.name.upper(), self.name.upper()) + return ' [SIMCALL_%s] = "SIMCALL_%s",'%(self.name.upper(), self.name.upper()) def accessors(self): res = [] + res.append('') + # Arguments getter/setters for i in range(len(self.args)): - res.append(self.arg_getter(i)) - res.append(self.arg_setter(i)) + arg = self.args[i] + res.append('static inline %s simcall_%s__get__%s(smx_simcall_t simcall) {'%(arg.rettype(), self.name, arg.name)) + res.append(' return %s simcall->args[%i].%s;'%(arg.cast(), i, arg.field())) + res.append('}') + res.append('static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg) {'%(self.name, arg.name, arg.type)) + res.append(' simcall->args[%i].%s = arg;'%(i, arg.field())) + res.append('}') + + # Return value getter/setters if self.res.type != 'void': - res.append('static inline %s simcall_%s__get__result(smx_simcall_t simcall){'%(self.res.ret(), self.name)) + res.append('static inline %s simcall_%s__get__result(smx_simcall_t simcall){'%(self.res.rettype(), self.name)) res.append(' return %s simcall->result.%s;'%(self.res.cast(), self.res.field())) res.append('}') res.append('static inline void simcall_%s__set__result(smx_simcall_t simcall, %s result){'%(self.name, self.res.type,)) @@ -120,20 +116,6 @@ class Simcall(object): res.append('}') return '\n'.join(res) - def arg_getter(self, i): - arg = self.args[i] - return ''' -static inline %s simcall_%s__get__%s(smx_simcall_t simcall){ - return %s simcall->args[%i].%s; -}'''%(arg.ret(), self.name, arg.name, arg.cast(), i, arg.field()) - - def arg_setter(self, i): - arg = self.args[i] - return ''' -static inline void simcall_%s__set__%s(smx_simcall_t simcall, %s arg){ - simcall->args[%i].%s = arg; -}'''%(self.name, arg.name, arg.type, i, arg.field()) - def case(self): return '''case SIMCALL_%s: %ssimcall_HANDLER_%s(simcall %s); @@ -166,9 +148,9 @@ inline static %s simcall_BODY_%s(%s) { SIMIX_simcall_handle(&self->simcall, 0); } %s - }'''%(self.res.ret() + }'''%(self.res.rettype() ,self.name - ,', '.join('%s %s'%(arg.ret(), arg.name) + ,', '.join('%s %s'%(arg.rettype(), arg.name) for arg in self.args) ,self.name ,', '.join(["&self->simcall"]+ [arg.name for arg in self.args]) @@ -176,6 +158,10 @@ inline static %s simcall_BODY_%s(%s) { ,'\n'.join(' self->simcall.args[%d].%s = (%s) %s;'%(i, arg.field(), arg.type, arg.name) for i, arg in enumerate(self.args)) ,'' 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) + for i, arg in enumerate(self.args))) def parse(fn): simcalls = [] @@ -242,6 +228,8 @@ if __name__=='__main__': ### fd = header('popping_accessors.h') handle(fd, Simcall.accessors, simcalls, simcalls_dict) + fd.write("\n\n/* The prototype of all simcall handlers, automatically generated for you */\n\n") + handle(fd, Simcall.handler_prototype, simcalls, simcalls_dict) fd.close() ###