-/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-2020. 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 "simgrid/plugins/energy.h"
#include "xbt/log.h"
+#include "xbt/random.hpp"
#include <simgrid/s4u.hpp>
-#include <random>
-
/* Parameters of the random generation of the flow size */
-static const unsigned long int min_size = 1e6;
-static const unsigned long int max_size = 1e9;
+static const int min_size = 1e6;
+static const int max_size = 1e9;
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_app_energyconsumption, "Messages specific for this s4u example");
static void sender(std::vector<std::string> args)
{
xbt_assert(args.size() == 2, "The master function expects 2 arguments.");
- int flow_amount = std::stoi(args.at(0));
- double comm_size = std::stod(args.at(1));
- XBT_INFO("Send %.0f bytes, in %d flows", comm_size, flow_amount);
+ int flow_amount = std::stoi(args.at(0));
+ long comm_size = std::stol(args.at(1));
+ XBT_INFO("Send %ld bytes, in %d flows", comm_size, flow_amount);
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(std::string("message"));
+ simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::string("message"));
+ /* Sleep a while before starting the example */
simgrid::s4u::this_actor::sleep_for(10);
- /* - Send the task to the @ref worker */
- char* payload = bprintf("%f", comm_size);
-
if (flow_amount == 1) {
+ /* - Send the task to the @ref worker */
+ char* payload = bprintf("%ld", comm_size);
mailbox->put(payload, comm_size);
} else {
- // Start all comms in parallel
+ // Start all comms in parallel, and wait for all completions in one shot
std::vector<simgrid::s4u::CommPtr> comms;
for (int i = 0; i < flow_amount; i++)
- comms.push_back(mailbox->put_async(const_cast<char*>("message"), comm_size));
-
- // And now, wait for all comms. Manually since wait_all is not part of this_actor yet
- for (int i = 0; i < flow_amount; i++) {
- simgrid::s4u::CommPtr comm = comms.at(i);
- comm->wait();
- }
- comms.clear();
+ comms.push_back(mailbox->put_async(bprintf("%d", i), comm_size));
+ simgrid::s4u::Comm::wait_all(&comms);
}
XBT_INFO("sender done.");
}
XBT_INFO("Receiving %d flows ...", flow_amount);
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(std::string("message"));
+ simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::string("message"));
if (flow_amount == 1) {
void* res = mailbox->get();
xbt_free(res);
} else {
- void* ignored;
+ void** data= new void*[flow_amount];
- // Start all comms in parallel
+ // Start all comms in parallel, and wait for their completion in one shot
std::vector<simgrid::s4u::CommPtr> comms;
for (int i = 0; i < flow_amount; i++)
- comms.push_back(mailbox->get_async(&ignored));
+ comms.push_back(mailbox->get_async(&data[i]));
- // And now, wait for all comms. Manually since wait_all is not part of this_actor yet
+ simgrid::s4u::Comm::wait_all(&comms);
for (int i = 0; i < flow_amount; i++)
- comms.at(i)->wait();
- comms.clear();
+ xbt_free(data[i]);
+ delete[] data;
}
XBT_INFO("receiver done.");
}
int main(int argc, char* argv[])
{
-
simgrid::s4u::Engine e(&argc, argv);
- /* Check if we got --NS3 on the command line, and activate ecofen if so */
- bool NS3 = false;
- for (int i = 0; i < argc; i++) {
- if (strcmp(argv[i], "--NS3") == 0)
- NS3 = true;
- if (NS3) // Found the --NS3 parameter previously; shift the rest of the line
- argv[i] = argv[i + 1];
- }
- if (NS3) {
- xbt_die("No Ecofen in this build");
- // XBT_INFO("Activating the Ecofen energy plugin");
- // ns3_link_energy_plugin_init();
- // xbt_cfg_set_parse("network/model:NS3");
- // argc -= 1; // We removed it from the parameters
- } else {
- XBT_INFO("Activating the SimGrid link energy plugin");
- sg_link_energy_plugin_init();
- }
+ XBT_INFO("Activating the SimGrid link energy plugin");
+ sg_link_energy_plugin_init();
- xbt_assert(argc > 1, "\nUsage: %s platform_file [flowCount [datasize]] [--NS3]\n"
- "\tExample: %s s4uplatform.xml \n"
- "\tIf you add NS3 as last parameter, this will try to activate the ecofen plugin.\n"
- "\tWithout it, it will use the SimGrid link energy plugin.\n",
+ xbt_assert(argc > 1, "\nUsage: %s platform_file [flowCount [datasize]]\n"
+ "\tExample: %s s4uplatform.xml \n",
argv[0], argv[0]);
- e.loadPlatform(argv[1]);
+ e.load_platform(argv[1]);
/* prepare to launch the actors */
std::vector<std::string> argSender;
argSender.push_back("1"); // Default value
argReceiver.push_back("1");
}
+
if (argc > 3) {
if (strcmp(argv[3], "random") == 0) { // We're asked to get a random size
- /* Initialize the random number generator */
- std::random_device rd;
- std::default_random_engine generator(rd());
-
- /* Distribution on which to apply the generator */
- std::uniform_int_distribution<unsigned long int> distribution(min_size, max_size);
-
- char* size = bprintf("%lu", distribution(generator));
- argSender.push_back(std::string(size));
- xbt_free(size);
+ std::string size = std::to_string(simgrid::xbt::random::uniform_int(min_size, max_size));
+ argSender.push_back(size);
} else { // Not "random" ? Then it should be the size to use
argSender.push_back(argv[3]); // Take the datasize from the command line
}
} else { // No parameter at all? Then use the default value
argSender.push_back("25000");
}
- simgrid::s4u::Actor::createActor("sender", simgrid::s4u::Host::by_name("MyHost1"), sender, argSender);
- simgrid::s4u::Actor::createActor("receiver", simgrid::s4u::Host::by_name("MyHost2"), receiver, argReceiver);
+ simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("MyHost1"), sender, argSender);
+ simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("MyHost2"), receiver, argReceiver);
/* And now, launch the simulation */
e.run();
