Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / examples / python / task-switch-host / task-switch-host.py

diff --git a/examples/python/task-switch-host/task-switch-host.py b/examples/python/task-switch-host/task-switch-host.py
index f8d8dfa..b2904c3 100644 (file)
--- a/examples/python/task-switch-host/task-switch-host.py
+++ b/examples/python/task-switch-host/task-switch-host.py
@@ -43,19 +43,18 @@ def parse():
     )
     return parser.parse_args()
 
-def callback( t):
-    print(f'[{Engine.clock}] { t} finished ({ t.count})')
+def callback(t):
+    print(f'[{Engine.clock}] {t} finished ({t.count})')
 
-def switch( t, hosts, execs):
-    comm0.destination = hosts[ t.count % 2]
-    comm0.remove_successor(execs[ t.count % 2 - 1])
-    comm0.add_successor(execs[ t.count % 2])
+def switch(t, hosts, execs):
+    comm0.destination = hosts[t.count % 2]
+    comm0.remove_successor(execs[t.count % 2 - 1])
+    comm0.add_successor(execs[t.count % 2])
 
 if __name__ == '__main__':
     args = parse()
     e = Engine(sys.argv)
     e.load_platform(args.platform)
-    Task.init()
 
     # Retrieve hosts
     tremblay = e.host_by_name('Tremblay')
@@ -76,15 +75,15 @@ if __name__ == '__main__':
     exec2.add_successor(comm2)
 
     # Add a function to be called when tasks end for log purpose
-    Task.on_end_cb(callback)
+    Task.on_completion_cb(callback)
 
-    # Add a function to be called before each executions of comm0
+    # Add a function to be called before each firing of comm0
     # This function modifies the graph of tasks by adding or removing
     # successors to comm0
-    comm0.on_this_start(lambda  t: switch( t, [jupiter, fafard], [exec1,exec2]))
+    comm0.on_this_start_cb(lambda t: switch(t, [jupiter, fafard], [exec1,exec2]))
 
-    # Enqueue two executions for task exec1
-    comm0.enqueue_execs(4)
+    # Enqueue two firings for task exec1
+    comm0.enqueue_firings(4)
 
     # runs the simulation
     e.run()