X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a69dbf9a2522d0ccde10350b49c5866ed9d731bd..3203ed1f4fb6f4617e94d5351661ba07e8b8f833:/src/simix/simcalls.py diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py index 7adcb74767..e65b78a757 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): @@ -48,19 +48,15 @@ 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, handler, res, args, call_kind): self.name = name self.res = res self.args = args - self.has_answer = has_answer + self.need_handler = handler + self.call_kind = call_kind 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 +64,58 @@ 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.need_handler: + 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 + else: + if (self.name in self.simcalls_PRE): + print '# ERROR: You have a function called simcall_HANDLER_%s, but that simcall is not using any handler'%self.name + print '# Either change your simcall definition, or kill that function' + 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,62 +123,66 @@ 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); - %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);\n ' if self.has_answer else ' ') + res = [] + res.append('case SIMCALL_%s:'%(self.name.upper())) + if self.need_handler: + res.append(' %ssimcall_HANDLER_%s(simcall %s);'%('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)))) + else: + res.append(' %sSIMIX_%s(%s);'%('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)))) + res.append(' %sbreak; \n'%('SIMIX_simcall_answer(simcall);\n ' if self.call_kind != 'Blck' else ' ')) + return '\n'.join(res) def body(self): - return ''' -inline static %s simcall_BODY_%s(%s) { - smx_process_t self = SIMIX_process_self(); - - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_%s(%s); - /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */ - - self->simcall.call = SIMCALL_%s; - memset(&self->simcall.result, 0, sizeof(self->simcall.result)); - memset(self->simcall.args, 0, sizeof(self->simcall.args)); -%s - if (self != simix_global->maestro_process) { - XBT_DEBUG("Yield process '%%s' on simcall %%s (%%d)", self->name, - SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call); - SIMIX_process_yield(self); - } else { - SIMIX_simcall_handle(&self->simcall, 0); - } - %s - }'''%(self.res.ret() - ,self.name - ,', '.join('%s %s'%(arg.ret(), arg.name) - for arg in self.args) - ,self.name - ,', '.join(["&self->simcall"]+ [arg.name for arg in self.args]) - ,self.name.upper() - ,'\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()) + res = [' '] + res.append('inline static %s simcall_BODY_%s(%s) {'%(self.res.rettype(), + self.name, + ', '.join('%s %s'%(arg.rettype(), arg.name) for arg in self.args))) + res.append(' smx_process_t self = SIMIX_process_self();') + res.append('') + res.append(' /* Go to that function to follow the code flow through the simcall barrier */') + if self.need_handler: + res.append(' if (0) simcall_HANDLER_%s(%s);'%(self.name, + ', '.join(["&self->simcall"]+ [arg.name for arg in self.args]))) + else: + res.append(' if (0) SIMIX_%s(%s);'%(self.name, + ', '.join(arg.name for arg in self.args))) + res.append(' /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */') + res.append('') + res.append(' self->simcall.call = SIMCALL_%s;'%(self.name.upper())) + res.append(' memset(&self->simcall.result, 0, sizeof(self->simcall.result));') + res.append(' memset(self->simcall.args, 0, sizeof(self->simcall.args));') + res.append('\n'.join(' self->simcall.args[%d].%s = (%s) %s;'%(i, arg.field(), arg.type, arg.name) + for i, arg in enumerate(self.args))) + res.append(' if (self != simix_global->maestro_process) {') + res.append(' XBT_DEBUG("Yield process \'%s\' on simcall %s (%d)", self->name,') + res.append(' SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);') + res.append(' SIMIX_process_yield(self);') + res.append(' } else {') + res.append(' SIMIX_simcall_handle(&self->simcall, 0);') + res.append(' } ') + if self.res.type != 'void': + res.append(' return self->simcall.result.%s;'%self.res.field()) + else: + res.append(' ') + res.append(' }') + return '\n'.join(res) + + + def handler_prototype(self): + if self.need_handler: + return "XBT_PRIVATE %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))) + else: + return "" def parse(fn): simcalls = [] @@ -187,13 +194,15 @@ def parse(fn): simcalls_guarded[re.search(r'## *(.*)', line).group(1)] = resdi if line.startswith('#') or not line: continue - match = re.match(r'(\S*?) *(\S*?) *\((.*?)(?:, *(.*?))?\) *(.*)', line) + match = re.match(r'(\S*?) *(\S*?) *(\S*?) *\((.*?)(?:, *(.*?))?\) *(.*)', line) assert match, line - name, ans, rest, resc, args = match.groups() + ans, handler, 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) + assert (handler == 'H' or handler == '-'),"Invalid need_handler indication: '%s'. Faulty line:\n%s\n"%(handler,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, handler=='H', Arg('result', rest, resc), sargs, ans) if resdi is None: simcalls.append(sim) else: @@ -218,7 +227,9 @@ def header(name): return fd def handle(fd,func, simcalls, guarded_simcalls): - fd.write('\n'.join(func(simcall) for simcall in simcalls)) + def nonempty(e): return e != '' + fd.write('\n'.join( filter(nonempty, (func(simcall) for simcall in simcalls)))) + for guard, list in guarded_simcalls.items(): fd.write('\n#ifdef %s\n'%(guard)) fd.write('\n'.join(func(simcall) for simcall in list)) @@ -242,6 +253,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() ### @@ -266,9 +279,10 @@ if __name__=='__main__': fd = header("popping_generated.c") + fd.write('#include \n'); fd.write('#include "smx_private.h"\n'); fd.write('#ifdef HAVE_MC\n'); - fd.write('#include "mc/mc_private.h"\n'); + fd.write('#include "src/mc/mc_forward.h"\n'); fd.write('#endif\n'); fd.write('\n'); fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n'); @@ -315,7 +329,7 @@ if __name__=='__main__': ### fd = header('popping_bodies.c') fd.write('#include "smx_private.h"\n') - fd.write('#include "mc/mc_interface.h"\n') + fd.write('#include "src/mc/mc_forward.h"\n') fd.write('#include "xbt/ex.h"\n') handle(fd, Simcall.body, simcalls, simcalls_dict) fd.close()