Update copyright lines for 2022.

[simgrid.git] / examples / c / synchro-semaphore / synchro-semaphore.c

diff --git a/examples/c/synchro-semaphore/synchro-semaphore.c b/examples/c/synchro-semaphore/synchro-semaphore.c
index f492e02..022f7a7 100644 (file)
--- a/examples/c/synchro-semaphore/synchro-semaphore.c
+++ b/examples/c/synchro-semaphore/synchro-semaphore.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team.
+/* Copyright (c) 2013-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -20,14 +20,20 @@ static void peer(int argc, char* argv[])
 {
   int i = 0;
   while (i < argc) {
-    double wait_time = xbt_str_parse_double(argv[i], "Invalid wait time: %s");
+    double wait_time = xbt_str_parse_double(argv[i], "Invalid wait time");
     i++;
     sg_actor_sleep_for(wait_time);
-    XBT_INFO("Trying to acquire %d", i);
-    sg_sem_acquire(sem);
+    XBT_INFO("Trying to acquire %d (%sblocking)", i, sg_sem_would_block(sem) ? "" : "not ");
+    // cover the two cases: with and without timeout
+    if (i > 1) {
+      while (sg_sem_acquire_timeout(sem, 3.0))
+        XBT_INFO("Timeout.. Try again %d", i);
+    } else {
+      sg_sem_acquire(sem);
+    }
     XBT_INFO("Acquired %d", i);
 
-    wait_time = xbt_str_parse_double(argv[i], "Invalid wait time: %s");
+    wait_time = xbt_str_parse_double(argv[i], "Invalid wait time");
     i++;
     sg_actor_sleep_for(wait_time);
     XBT_INFO("Releasing %d", i);
@@ -46,11 +52,12 @@ int main(int argc, char* argv[])
   sg_host_t h = sg_host_by_name("Fafard");
 
   sem                      = sg_sem_init(1);
+  XBT_INFO("Semaphore initialized with capacity = %d", sg_sem_get_capacity(sem));
   const char* aliceTimes[] = {"0", "1", "3", "5", "1", "2", "5", "0"};
   const char* bobTimes[]   = {"0.9", "1", "1", "2", "2", "0", "0", "5"};
 
-  sg_actor_create("Alice", h, peer, 8, aliceTimes);
-  sg_actor_create("Bob", h, peer, 8, bobTimes);
+  sg_actor_create_("Alice", h, peer, 8, aliceTimes);
+  sg_actor_create_("Bob", h, peer, 8, bobTimes);
 
   simgrid_run();
   sg_sem_destroy(sem);