Kill popping_{enum,generated}

[simgrid.git] / src / simix / simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 0671a0c3bbf7edafa107258a24da72632a52947e..5d47f0fad412254f05ee8923202a91ee4731554a 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -63,9 +63,6 @@ class Simcall:
                 return False
         return True
 
-    def enum(self):
-        return '  %s,' % (self.name.upper())
-
     def string(self):
         return '    "Simcall::%s",' % self.name.upper()
 
@@ -114,8 +111,7 @@ class Simcall:
     def case(self):
         res = []
         indent = '    '
-        args = ["simgrid::simix::unmarshal<%s>(simcall_.args_[%d])" % (arg.rettype(), i)
-                for i, arg in enumerate(self.args)]
+        args = ["simcall_.code_"]
         res.append(indent + 'case Simcall::%s:' % (self.name.upper()))
         if self.need_handler:
             call = "simcall_HANDLER_%s(&simcall_%s%s)" % (self.name,
@@ -123,10 +119,7 @@ class Simcall:
                                                           ', '.join(args))
         else:
             call = "SIMIX_%s(%s)" % (self.name, ', '.join(args))
-        if self.call_kind == 'Func':
-            res.append(indent + "  simgrid::simix::marshal<%s>(simcall_.result_, %s);" % (self.res.rettype(), call))
-        else:
-            res.append(indent + "  " + call + ";")
+        res.append(indent + "  " + call + ";")
         if self.call_kind != 'Blck':
             res.append(indent + '  simcall_answer();')
         res.append(indent + '  break;')
@@ -135,8 +128,7 @@ class Simcall:
 
     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,
+            return "XBT_PRIVATE void simcall_HANDLER_%s(smx_simcall_t simcall%s);" % (self.name,
                                                                                     ''.join(', %s %s' % (arg.rettype(), arg.name)
                                                                                             for i, arg in enumerate(self.args)))
         return ""
@@ -166,10 +158,9 @@ def parse(fn):
                 t = t.strip()
                 n = n.strip()
                 sargs.append(Arg(n, t))
-        if ret == "void":
-            ans = "Proc"
-        else:
-            ans = "Func"
+        if ret != "void":
+            raise Exception ("Func simcalls (ie, returning a value) not supported anymore")
+        ans = 'Proc'
         handler = True
         if attrs:
             attrs = attrs[2:-2]
@@ -230,83 +221,6 @@ def main():
         print("Some checks fail!")
         sys.exit(1)
 
-    #
-    # popping_enum.hpp
-    #
-    fd = header("popping_enum.hpp")
-    fd.write('namespace simgrid {\n')
-    fd.write('namespace simix {\n')
-    fd.write('/**\n')
-    fd.write(' * @brief All possible simcalls.\n')
-    fd.write(' */\n')
-    fd.write('enum class Simcall {\n')
-    fd.write('  NONE,\n')
-
-    handle(fd, Simcall.enum, simcalls, simcalls_dict)
-
-    fd.write('};\n')
-    fd.write('\n')
-    fd.write('constexpr int NUM_SIMCALLS = ' + str(1 + len(simcalls)) + ';\n')
-    fd.write('} // namespace simix\n')
-    fd.write('} // namespace simgrid\n')
-    fd.close()
-
-    #
-    # popping_generated.cpp
-    #
-
-    fd = header("popping_generated.cpp")
-
-    fd.write('#include <simgrid/config.h>\n')
-    fd.write('#include <simgrid/host.h>\n')
-    fd.write('#include <xbt/base.h>\n')
-    fd.write('#if SIMGRID_HAVE_MC\n')
-    fd.write('#include "src/mc/mc_forward.hpp"\n')
-    fd.write('#endif\n')
-    fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n')
-    fd.write('#include "src/kernel/actor/SimcallObserver.hpp"\n')
-    fd.write('#include "src/kernel/context/Context.hpp"\n')
-
-    fd.write('\n')
-    fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);\n\n')
-
-    fd.write('using simgrid::simix::Simcall;')
-    fd.write('\n')
-    fd.write('/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
-    fd.write('constexpr std::array<const char*, simgrid::simix::NUM_SIMCALLS> simcall_names{{\n')
-
-    fd.write('    "Simcall::NONE",\n')
-    handle(fd, Simcall.string, simcalls, simcalls_dict)
-
-    fd.write('}};\n\n')
-
-    fd.write('/** @private\n')
-    fd.write(' * @brief (in kernel mode) unpack the simcall and activate the handler\n')
-    fd.write(' *\n')
-    fd.write(' * This function is generated from src/simix/simcalls.in\n')
-    fd.write(' */\n')
-    fd.write('void simgrid::kernel::actor::ActorImpl::simcall_handle(int times_considered)\n')
-    fd.write('{\n')
-    fd.write('  XBT_DEBUG("Handling simcall %p: %s", &simcall_, SIMIX_simcall_name(simcall_));\n')
-    fd.write('  if (simcall_.observer_ != nullptr)\n')
-    fd.write('    simcall_.observer_->prepare(times_considered);\n')
-
-    fd.write('  if (context_->wannadie())\n')
-    fd.write('    return;\n')
-    fd.write('  switch (simcall_.call_) {\n')
-
-    handle(fd, Simcall.case, simcalls, simcalls_dict)
-
-    fd.write('    case Simcall::NONE:\n')
-    fd.write('      throw std::invalid_argument(simgrid::xbt::string_printf("Asked to do the noop syscall on %s@%s",\n')
-    fd.write('                                                              get_cname(),\n')
-    fd.write('                                                              sg_host_get_name(get_host())));\n')
-    fd.write('    default:\n')
-    fd.write('      THROW_IMPOSSIBLE;\n')
-    fd.write('  }\n')
-    fd.write('}\n')
-
-    fd.close()
 
 if __name__ == '__main__':
     main()