X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da48d2595ba1a9a5879aeabebe3af3d413cdc6ff..cf1e90eacef94ed2c30fc806887f3c6e6319544e:/src/simix/simcalls.py

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