Fix Host::execute to use *this as a host location, not the this_actor->get_host()

[simgrid.git] / examples / c / cloud-masterworker / cloud-masterworker.c

diff --git a/examples/c/cloud-masterworker/cloud-masterworker.c b/examples/c/cloud-masterworker/cloud-masterworker.c
index 1e54f2d..7f3ed8f 100644 (file)
--- a/examples/c/cloud-masterworker/cloud-masterworker.c
+++ b/examples/c/cloud-masterworker/cloud-masterworker.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -11,9 +11,9 @@
 #include "simgrid/plugins/live_migration.h"
 #include "simgrid/vm.h"
 
-#include "xbt/asserts.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
+#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(cloud_masterworker, "Messages specific for this example");
 
@@ -53,19 +53,19 @@ static void worker_fun(int argc, char* argv[])
     XBT_INFO("%s received from mailbox(%s)", pr_name, mbox_name);
 
     if (*payload == FINALIZE) {
-      free(payload);
+      xbt_free(payload);
       break;
     }
 
     sg_actor_execute(*payload);
     XBT_INFO("%s executed", pr_name);
-    free(payload);
+    xbt_free(payload);
   }
 }
 
 static void master_fun(int argc, char* argv[])
 {
-  sg_host_t* worker_pms = sg_actor_self_data();
+  sg_host_t* worker_pms = sg_actor_self_get_data();
 
   sg_vm_t* vms = xbt_malloc(2 * sizeof(sg_vm_t));
 
@@ -163,7 +163,7 @@ static void master_fun(int argc, char* argv[])
   }
 
   XBT_INFO("# Goodbye now!");
-  free(vms);
+  xbt_free(vms);
 }
 
 int main(int argc, char* argv[])
@@ -189,16 +189,16 @@ int main(int argc, char* argv[])
   for (int i = 0; i < 2; i++)
     worker_pms[i] = pms[i + 1];
 
-  free(pms);
+  xbt_free(pms);
 
   sg_actor_t actor = sg_actor_init("master", master_pm);
-  sg_actor_data_set(actor, worker_pms);
+  sg_actor_set_data(actor, worker_pms);
   sg_actor_start(actor, master_fun, 0, NULL);
 
   simgrid_run();
   XBT_INFO("Bye (simulation time %g)", simgrid_get_clock());
 
-  free(worker_pms);
+  xbt_free(worker_pms);
 
   return 0;
 }