Make field 'Context::iwannadie' private.

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

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 82d9aa5..36fa58d 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-2020. The SimGrid Team. All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
@@ -87,7 +87,7 @@ class Simcall(object):
     def accessors(self):
         res = []
         res.append('')
-        regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$")  #  to compute the raw type
+        regex = re.compile(r"^boost::intrusive_ptr<(.*?)>(.*)$")  # to compute the raw type
         # Arguments getter/setters
         for i in range(len(self.args)):
             arg = self.args[i]
@@ -135,7 +135,7 @@ class Simcall(object):
         res.append(indent + 'case SIMCALL_%s:' % (self.name.upper()))
         if self.need_handler:
             call = "simcall_HANDLER_%s(&simcall%s%s)" % (self.name,
-                                                        ", " if len(args) > 0 else "",
+                                                        ", " if args else "",
                                                         ', '.join(args))
         else:
             call = "SIMIX_%s(%s)" % (self.name, ', '.join(args))
@@ -178,8 +178,7 @@ class Simcall(object):
                                                                                     self.name,
                                                                                     ''.join(', %s %s' % (arg.rettype(), arg.name)
                                                                                             for i, arg in enumerate(self.args)))
-        else:
-            return ""
+        return ""
 
 
 def parse(fn):
@@ -243,7 +242,7 @@ def header(name):
     fd.write(
         '/* change simcalls specification in src/simix/simcalls.in             */\n')
     fd.write(
-        '/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved.    */\n')
+        '/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved.    */\n')
     fd.write(
         '/**********************************************************************/\n\n')
     fd.write('/*\n')
@@ -345,7 +344,7 @@ if __name__ == '__main__':
         '  XBT_DEBUG("Handling simcall %p: %s", &simcall, SIMIX_simcall_name(simcall.call_));\n')
     fd.write('  SIMCALL_SET_MC_VALUE(simcall, value);\n')
     fd.write(
-        '  if (context_->iwannadie)\n')
+        '  if (context_->wannadie())\n')
     fd.write('    return;\n')
     fd.write('  switch (simcall.call_) {\n')