X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..87bd1a3bfa6b002a404c373fca560f267f10fe71:/examples/python/comm-wait/comm-wait.py

diff --git a/examples/python/comm-wait/comm-wait.py b/examples/python/comm-wait/comm-wait.py
index 6bd6a908d5..8f4f728e77 100644
--- a/examples/python/comm-wait/comm-wait.py
+++ b/examples/python/comm-wait/comm-wait.py
@@ -1,9 +1,10 @@
 # Copyright (c) 2010-2022. 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.
 
-from simgrid import Engine, Mailbox, this_actor
+from simgrid import Actor, Engine, Host, Mailbox, this_actor
 import sys
 
 # This example shows how to use simgrid::s4u::this_actor::wait() to wait for a given communication.
@@ -14,61 +15,46 @@ import sys
 # The sender then loops until there is no ongoing communication.
 
 
-class Sender:
-    def __init__(self, *args):
-        if len(args) != 3:
-            raise AssertionError(
-                "Actor sender requires 3 parameters, but got {:d}".format(len(args)))
-        self.messages_count = int(args[0])  # number of tasks
-        self.msg_size = int(args[1])  # communication cost (in bytes)
-        self.receivers_count = int(args[2])  # number of receivers
-
-    def __call__(self):
-        # List in which we store all ongoing communications
-        pending_comms = []
-
-        # Vector of the used mailboxes
-        mboxes = [Mailbox.by_name("receiver-{:d}".format(i)) for i in range(0, self.receivers_count)]
+def sender(messages_count, msg_size, receivers_count):
+     # List in which we store all ongoing communications
+     pending_comms = []
 
-        # Start dispatching all messages to receivers, in a round robin fashion
-        for i in range(0, self.messages_count):
-            content = "Message {:d}".format(i)
-            mbox = mboxes[i % self.receivers_count]
+     # Vector of the used mailboxes
+     mboxes = [Mailbox.by_name("receiver-{:d}".format(i)) for i in range(0, receivers_count)]
 
-            this_actor.info("Send '{:s}' to '{:s}'".format(content, str(mbox)))
+     # Start dispatching all messages to receivers, in a round robin fashion
+     for i in range(0, messages_count):
+         content = "Message {:d}".format(i)
+         mbox = mboxes[i % receivers_count]
 
-            # Create a communication representing the ongoing communication, and store it in pending_comms
-            comm = mbox.put_async(content, self.msg_size)
-            pending_comms.append(comm)
+         this_actor.info("Send '{:s}' to '{:s}'".format(content, str(mbox)))
 
-        # Start sending messages to let the workers know that they should stop
-        for i in range(0, self.receivers_count):
-            mbox = mboxes[i]
-            this_actor.info("Send 'finalize' to '{:s}'".format(str(mbox)))
-            comm = mbox.put_async("finalize", 0)
-            pending_comms.append(comm)
+         # Create a communication representing the ongoing communication, and store it in pending_comms
+         comm = mbox.put_async(content, msg_size)
+         pending_comms.append(comm)
 
-        this_actor.info("Done dispatching all messages")
+     # Start sending messages to let the workers know that they should stop
+     for i in range(0, receivers_count):
+         mbox = mboxes[i]
+         this_actor.info("Send 'finalize' to '{:s}'".format(str(mbox)))
+         comm = mbox.put_async("finalize", 0)
+         pending_comms.append(comm)
 
-        # Now that all message exchanges were initiated, wait for their completion, in order of creation.
-        for comm in pending_comms:
-            comm.wait()
-        this_actor.info("Goodbye now!")
+     this_actor.info("Done dispatching all messages")
 
+     # Now that all message exchanges were initiated, wait for their completion, in order of creation.
+     for comm in pending_comms:
+         comm.wait()
+     this_actor.info("Goodbye now!")
 
-class Receiver:
-    def __init__(self, *args):
-        if len(args) != 1:  # Receiver actor expects 1 argument: its ID
-            raise AssertionError("Actor receiver requires 1 parameter, but got {:d}".format(len(args)))
-        self.mbox = Mailbox.by_name("receiver-{:s}".format(args[0]))
-
-    def __call__(self):
-        this_actor.info("Wait for my first message")
-        while True:
-            received = self.mbox.get()
-            this_actor.info("I got a '{:s}'.".format(received))
-            if received == "finalize":
-                break  # If it's a finalize message, we're done.
+def receiver(id):
+     mbox = Mailbox.by_name("receiver-{:d}".format(id))
+     this_actor.info("Wait for my first message")
+     while True:
+         received = mbox.get()
+         this_actor.info("I got a '{:s}'.".format(received))
+         if received == "finalize":
+             break  # If it's a finalize message, we're done.
 
 
 if __name__ == '__main__':
@@ -76,10 +62,7 @@ if __name__ == '__main__':
 
     e.load_platform(sys.argv[1])             # Load the platform description
 
-    # Register the classes representing the actors
-    e.register_actor("sender", Sender)
-    e.register_actor("receiver", Receiver)
-
-    e.load_deployment(sys.argv[2])
-
+    Actor.create("sender", Host.by_name("Tremblay"), sender, 3, 50000000, 1)
+    Actor.create("receiver", Host.by_name("Ruby"), receiver, 0)
+  
     e.run()