X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f2dfd25486ba89c4adaa54d774092c0b9756361:/examples/python/operation-switch-host/operation-switch-host.py..1b211507e0c2abe5f2b7fbe56988af46d3189b51:/examples/python/task-switch-host/task-switch-host.py

diff --git a/examples/python/operation-switch-host/operation-switch-host.py b/examples/python/task-switch-host/task-switch-host.py
similarity index 69%
rename from examples/python/operation-switch-host/operation-switch-host.py
rename to examples/python/task-switch-host/task-switch-host.py
index 90a1fae78b..f8d8dfa942 100644
--- a/examples/python/operation-switch-host/operation-switch-host.py
+++ b/examples/python/task-switch-host/task-switch-host.py
@@ -4,7 +4,7 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 """
-/* This example demonstrates how to dynamically modify a graph of operations.
+/* This example demonstrates how to dynamically modify a graph of tasks.
  *
  * Assuming we have two instances of a service placed on different hosts,
  * we want to send data alternatively to thoses instances.
@@ -31,7 +31,7 @@
 
 from argparse import ArgumentParser
 import sys
-from simgrid import Engine, Operation, CommOp, ExecOp
+from simgrid import Engine, Task, CommTask, ExecTask
 
 def parse():
     parser = ArgumentParser()
@@ -43,47 +43,47 @@ def parse():
     )
     return parser.parse_args()
 
-def callback(op):
-    print(f'[{Engine.clock}] Operation {op} finished ({op.count})')
+def callback( t):
+    print(f'[{Engine.clock}] { t} finished ({ t.count})')
 
-def switch(op, hosts, execs):
-    comm0.destination = hosts[op.count % 2]
-    comm0.remove_successor(execs[op.count % 2 - 1])
-    comm0.add_successor(execs[op.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)
-    Operation.init()
+    Task.init()
 
     # Retrieve hosts
     tremblay = e.host_by_name('Tremblay')
     jupiter = e.host_by_name('Jupiter')
     fafard = e.host_by_name('Fafard')
 
-    # Create operations
-    comm0 = CommOp.init("comm0")
+    # Create tasks
+    comm0 = CommTask.init("comm0")
     comm0.bytes = 1e7
     comm0.source = tremblay
-    exec1 = ExecOp.init("exec1", 1e9, jupiter)
-    exec2 = ExecOp.init("exec2", 1e9, fafard)
-    comm1 = CommOp.init("comm1", 1e7, jupiter, tremblay)
-    comm2 = CommOp.init("comm2", 1e7, fafard, tremblay)
+    exec1 = ExecTask.init("exec1", 1e9, jupiter)
+    exec2 = ExecTask.init("exec2", 1e9, fafard)
+    comm1 = CommTask.init("comm1", 1e7, jupiter, tremblay)
+    comm2 = CommTask.init("comm2", 1e7, fafard, tremblay)
 
-    # Create the initial graph by defining dependencies between operations
+    # Create the initial graph by defining dependencies between tasks
     exec1.add_successor(comm1)
     exec2.add_successor(comm2)
 
-    # Add a function to be called when operations end for log purpose
-    Operation.on_end_cb(callback)
+    # Add a function to be called when tasks end for log purpose
+    Task.on_end_cb(callback)
 
     # Add a function to be called before each executions of comm0
-    # This function modifies the graph of operations by adding or removing
+    # This function modifies the graph of tasks by adding or removing
     # successors to comm0
-    comm0.on_this_start(lambda op: switch(op, [jupiter, fafard], [exec1,exec2]))
+    comm0.on_this_start(lambda  t: switch( t, [jupiter, fafard], [exec1,exec2]))
 
-    # Enqueue two executions for operation exec1
+    # Enqueue two executions for task exec1
     comm0.enqueue_execs(4)
 
     # runs the simulation