X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fb1fa1697309cad26ab7d472db4f8bfa617e0b4..6c06a4eee7b7bc97b6f067128c06e1f959388dc1:/examples/python/exec-basic/exec-basic.py

diff --git a/examples/python/exec-basic/exec-basic.py b/examples/python/exec-basic/exec-basic.py
index 0d609653d3..4c7275d3f2 100644
--- a/examples/python/exec-basic/exec-basic.py
+++ b/examples/python/exec-basic/exec-basic.py
@@ -4,36 +4,36 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 import sys
-import simgrid as sg
+from simgrid import *
 
 def executor():
-    # execute() tells SimGrid to pause the calling actor until 
+    # execute() tells SimGrid to pause the calling actor until
     # its host has computed the amount of flops passed as a parameter
-    sg.execute(98095)
-    sg.info("Done.")
+    this_actor.execute(98095)
+    this_actor.info("Done.")
     # This simple example does not do anything beyond that
 
 def privileged():
-    #  This version of execute() with two parameters specifies that this execution
-    # gets a larger share of the resource.
-    #
-    # Since the priority is 2, it computes twice as fast as a regular one.
+    # You can also specify the priority of your execution as follows.
+    # An execution of priority 2 computes twice as fast as a regular one.
     #
     # So instead of a half/half sharing between the two executions,
-    # we get a 1/3 vs 2/3 sharing. 
-    sg.execute(98095, 2);
-    sg.info("Done.");
+    # we get a 1/3 vs 2/3 sharing.
+    this_actor.execute(98095, priority = 2);
+    this_actor.info("Done.");
 
     # Note that the timings printed when executing this example are a bit misleading,
     # because the uneven sharing only last until the privileged actor ends.
     # After this point, the unprivileged one gets 100% of the CPU and finishes
     # quite quickly.
 
-i = sys.argv.index("--")
-e = sg.Engine(sys.argv[0:i])
+i = 0
+if "--" in sys.argv:
+    i = sys.argv.index("--")
+e = Engine(sys.argv[0:i])
 e.load_platform(sys.argv[i+1])
 
-sg.create_actor("executor", sg.Host.by_name("Tremblay"), executor)
-sg.create_actor("privileged", sg.Host.by_name("Tremblay"), privileged)
+Actor.create("executor", Host.by_name("Tremblay"), executor)
+Actor.create("privileged", Host.by_name("Tremblay"), privileged)
 
 e.run()
\ No newline at end of file