Update copyright lines for 2023.

[simgrid.git] / examples / c / app-token-ring / app-token-ring.c

diff --git a/examples/c/app-token-ring/app-token-ring.c b/examples/c/app-token-ring/app-token-ring.c
index 2c5d41e5d52751a6fbe3d81ec56df129ee0def56..9717beceadbb9304deeaf32a80dff8a6b580be2c 100644 (file)
--- a/examples/c/app-token-ring/app-token-ring.c
+++ b/examples/c/app-token-ring/app-token-ring.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-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. */
@@ -15,37 +15,37 @@
 #include <stddef.h>
 #include <stdio.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(app_token_ring, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(app_token_ring, "Messages specific for this example");
 
 /* Main function of all actors used in this example */
-static void relay_runner(int argc, XBT_ATTRIB_UNUSED char* argv[])
+static void relay_runner(int argc, char* argv[])
 {
   xbt_assert(argc == 0, "The relay_runner function does not accept any parameter from the XML deployment file");
 
   const char* name = sg_actor_self_get_name();
-  int rank         = xbt_str_parse_int(name, "Any actor of this example must have a numerical name, not %s");
+  unsigned rank    = (unsigned)xbt_str_parse_int(name, "Any actor of this example must have a numerical name");
 
   sg_mailbox_t my_mailbox = sg_mailbox_by_name(name);
 
   /* The last actor sends the token back to rank 0, the others send to their right neighbor (rank+1) */
   char neighbor_mailbox_name[256];
-  snprintf(neighbor_mailbox_name, 255, "%d", rank + 1 == sg_host_count() ? 0 : rank + 1);
+  snprintf(neighbor_mailbox_name, 255, "%u", rank + 1 == sg_host_count() ? 0 : rank + 1);
 
   sg_mailbox_t neighbor_mailbox = sg_mailbox_by_name(neighbor_mailbox_name);
 
   char* res;
   if (rank == 0) {
     /* The root actor (rank 0) first sends the token then waits to receive it back */
-    XBT_INFO("Host \"%d\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox_name);
+    XBT_INFO("Host \"%u\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox_name);
     sg_mailbox_put(neighbor_mailbox, xbt_strdup("Token"), 1000000);
 
     res = (char*)sg_mailbox_get(my_mailbox);
-    XBT_INFO("Host \"%d\" received \"%s\"", rank, res);
+    XBT_INFO("Host \"%u\" received \"%s\"", rank, res);
   } else {
     /* The others actors receive from their left neighbor (rank-1) and send to their right neighbor (rank+1) */
     res = (char*)sg_mailbox_get(my_mailbox);
-    XBT_INFO("Host \"%d\" received \"%s\"", rank, res);
-    XBT_INFO("Host \"%d\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox_name);
+    XBT_INFO("Host \"%u\" received \"%s\"", rank, res);
+    XBT_INFO("Host \"%u\" send 'Token' to Host \"%s\"", rank, neighbor_mailbox_name);
     sg_mailbox_put(neighbor_mailbox, xbt_strdup("Token"), 1000000);
   }
   free(res);
@@ -57,16 +57,14 @@ int main(int argc, char* argv[])
   xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
   simgrid_load_platform(argv[1]); /* - Load the platform description */
 
-  size_t host_count;
-  sg_host_t* hosts;
-  simgrid_get_all_hosts(&host_count, &hosts);
+  size_t host_count = sg_host_count();
+  sg_host_t* hosts  = sg_host_list();
 
   XBT_INFO("Number of hosts '%zu'", host_count);
   for (size_t i = 0; i < host_count; i++) {
-    /* - Give a unique rank to each host and create a @ref relay_runner process on each */
+    /* - Give a unique rank to each host and create a @ref relay_runner actor on each */
     char* name_host  = bprintf("%zu", i);
-    sg_actor_t actor = sg_actor_init(name_host, hosts[i]);
-    sg_actor_start(actor, relay_runner, 0, NULL);
+    sg_actor_create(name_host, hosts[i], relay_runner, 0, NULL);
     free(name_host);
   }
   free(hosts);