Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / examples / sthread / pthread-mutex-simple.c

diff --git a/examples/sthread/pthread-mutex-simple.c b/examples/sthread/pthread-mutex-simple.c
index 3d9e995..d46d75a 100644 (file)
--- a/examples/sthread/pthread-mutex-simple.c
+++ b/examples/sthread/pthread-mutex-simple.c
@@ -5,29 +5,28 @@
 
 pthread_mutex_t mutex;
 
-static void* thread_fun(void* ignore)
+static void* thread_fun(void* val)
 {
   pthread_mutex_lock(&mutex);
   pthread_mutex_unlock(&mutex);
 
+  fprintf(stderr, "The thread %d is terminating.\n", *(int*)val);
   return NULL;
 }
 
 int main(int argc, char* argv[])
 {
-  fprintf(stderr, "User main is starting\n");
-
   pthread_mutex_init(&mutex, NULL);
 
+  int id[2] = {0, 1};
   pthread_t thread1;
   pthread_t thread2;
-  pthread_create(&thread1, NULL, thread_fun, NULL);
-  fprintf(stderr, "here\n");
-  pthread_create(&thread2, NULL, thread_fun, NULL);
-  fprintf(stderr, "there\n");
+  pthread_create(&thread1, NULL, thread_fun, (void*)&id[0]);
+  pthread_create(&thread2, NULL, thread_fun, (void*)&id[1]);
+  fprintf(stderr, "All threads are started.\n");
   pthread_join(thread1, NULL);
   pthread_join(thread2, NULL);
 
-  fprintf(stderr, "User main is done\n");
+  fprintf(stderr, "User's main is terminating.\n");
   return 0;
 }