-/* Copyright (c) 2006-2015. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2016. 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. */
#include <xbt/sysdep.h>
-#include "simgrid/s4u.h"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
-
-class Worker : simgrid::s4u::Actor {
-public:
- Worker(const char*procname, simgrid::s4u::Host *host,int argc, char **argv)
- : simgrid::s4u::Actor(procname,host,argc,argv){}
-
- int main(int argc, char **argv) {
- XBT_INFO("Hello s4u, I'm ready to serve");
-
- char *msg = (char*)recv(*simgrid::s4u::Mailbox::byName("worker"));
- XBT_INFO("I received '%s'",msg);
- XBT_INFO("I'm done. See you.");
- return 1;
- }
-};
-
-class Master : simgrid::s4u::Actor {
-public:
- Master(const char*procname, simgrid::s4u::Host *host,int argc, char **argv)
- : Actor(procname,host,argc,argv){}
-
- int main(int argc, char **argv) {
- const char *msg = "GaBuZoMeu";
- XBT_INFO("Hello s4u, I have something to send");
- send(*simgrid::s4u::Mailbox::byName("worker"), xbt_strdup(msg), strlen(msg));
-
- XBT_INFO("I'm done. See you.");
- return 1;
- }
-};
+#include <simgrid/s4u.h>
+#include "s4u_basic.h"
int main(int argc, char **argv) {
simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);
- e->loadPlatform("../../platforms/two_hosts_platform.xml");
-
- new Worker("worker", simgrid::s4u::Host::by_name("host0"), 0, NULL);
- new Master("master", simgrid::s4u::Host::by_name("host1"), 0, NULL);
+ e->loadPlatform("../../platforms/two_hosts.xml");
+ simgrid::s4u::Actor("worker", simgrid::s4u::Host::by_name("Tremblay"), Worker());
+ simgrid::s4u::Actor("master", simgrid::s4u::Host::by_name("Jupiter"), Master());
e->run();
return 0;
}