-/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-2019. 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/future.hpp>
+#include <simgrid/engine.h>
#include <simgrid/kernel/future.hpp>
#include <simgrid/simix.hpp>
#include <simgrid/simix/blocking_simcall.hpp>
{
auto promise = std::make_shared<simgrid::kernel::Promise<void>>();
auto future = promise->get_future();
- SIMIX_timer_set(date, [promise] { promise->set_value(); });
+ simgrid::simix::Timer::set(date, [promise] { promise->set_value(); });
return future;
}
-static int master(int argc, char* argv[])
+static void master()
{
// Test the simple immediate execution:
XBT_INFO("Start");
// Synchronize on a successful Future<void>:
simgrid::simix::kernel_sync([] {
- return kernel_wait_until(10).then([](simgrid::kernel::Future<void> future) {
- future.get();
+ return kernel_wait_until(10).then([](simgrid::kernel::Future<void> f) {
+ f.get();
XBT_INFO("kernel_sync with void");
});
});
// Synchronize on a failing Future<void>:
try {
simgrid::simix::kernel_sync([] {
- return kernel_wait_until(20).then([](simgrid::kernel::Future<void> future) {
- future.get();
+ return kernel_wait_until(20).then([](simgrid::kernel::Future<void> f) {
+ f.get();
throw example::exception("Exception throwed from kernel_defer");
});
});
// Synchronize on a successul Future<int> and get the value:
int res = simgrid::simix::kernel_sync([] {
- return kernel_wait_until(30).then([](simgrid::kernel::Future<void> future) {
- future.get();
+ return kernel_wait_until(30).then([](simgrid::kernel::Future<void> f) {
+ f.get();
XBT_INFO("kernel_sync with value");
return 42;
});
// Synchronize on a successul Future<int> and get the value:
simgrid::simix::Future<int> future = simgrid::simix::kernel_async([] {
- return kernel_wait_until(50).then([](simgrid::kernel::Future<void> future) {
- future.get();
+ return kernel_wait_until(50).then([](simgrid::kernel::Future<void> f) {
+ f.get();
XBT_INFO("kernel_async with value");
return 43;
});
// Synchronize on a successul Future<int> and get the value:
future = simgrid::simix::kernel_async([] {
- return kernel_wait_until(60).then([](simgrid::kernel::Future<void> future) {
- future.get();
+ return kernel_wait_until(60).then([](simgrid::kernel::Future<void> f) {
+ f.get();
XBT_INFO("kernel_async with value");
return 43;
});
XBT_INFO("The future is %s", future.is_ready() ? "ready" : "not ready");
res = future.get();
XBT_INFO("kernel_async with value returned with %i", res);
-
- return 0;
}
}
{
SIMIX_global_init(&argc, argv);
xbt_assert(argc == 2, "Usage: %s platform.xml\n", argv[0]);
- SIMIX_function_register("master", example::master);
- SIMIX_create_environment(argv[1]);
- simcall_process_create("master", example::master, NULL, sg_host_by_name("Tremblay"), 0, NULL, NULL);
+ simgrid_load_platform(argv[1]);
+ simcall_process_create("master", example::master, NULL, sg_host_by_name("Tremblay"), NULL);
SIMIX_run();
return 0;
}