X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c5f5f80d481830f70dbece02adba58e296a6f00..ce37f6e9d775bdc13c270e14490c156c1f95f71f:/teshsuite/smpi/shared.c

diff --git a/teshsuite/smpi/shared.c b/teshsuite/smpi/shared.c
index 0d988a9f39..78759352b6 100644
--- a/teshsuite/smpi/shared.c
+++ b/teshsuite/smpi/shared.c
@@ -1,24 +1,27 @@
-/* Copyright (c) 2009-2012. The SimGrid Team. All rights reserved.          */
-
-/* This example should be instructive to learn about SMPI_SAMPLE_LOCAL and 
-   SMPI_SAMPLE_GLOBAL macros for execution sampling */
+/* Copyright (c) 2009-2014. 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. */
 
+/* This example should be instructive to learn about SMPI_SAMPLE_LOCAL and 
+   SMPI_SAMPLE_GLOBAL macros for execution sampling */
+
 #include <stdio.h>
 #include <mpi.h>
+#include <stdint.h>
+#include <inttypes.h>
 
-unsigned long hash(char *str);
+void* hash(char *str, uint64_t* ans);
 
-unsigned long hash(char *str)
+void* hash(char *str, uint64_t* ans)
 {
-  unsigned long hash = 5381;
+  *ans=5381;
   int c;
   printf("hashing !\n");
   while ((c = *str++)!=0)
-    hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
-  return hash;
+    *ans = ((*ans << 5) + *ans) + c; /* hash * 33 + c */
+  return NULL;
 }
 
 
@@ -29,7 +32,7 @@ int main(int argc, char *argv[])
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
   MPI_Comm_size(MPI_COMM_WORLD, &size);
   //Let's Allocate a shared memory buffer
-  unsigned long* buf = SMPI_SHARED_MALLOC(sizeof(unsigned long));
+  uint64_t* buf = SMPI_SHARED_MALLOC(sizeof(uint64_t));
   //one writes data in it
   if(rank==0){
     *buf=size;  
@@ -37,22 +40,23 @@ int main(int argc, char *argv[])
   
   MPI_Barrier(MPI_COMM_WORLD);
   //everyobne reads from it. 
-  printf("[%d] The value in the shared buffer is: %lu\n", rank, *buf);
+  printf("[%d] The value in the shared buffer is: %" PRIu64"\n", rank, *buf);
   
   
   MPI_Barrier(MPI_COMM_WORLD);
   //Try SMPI_SHARED_CALL function, which should call hash only once and for all.
   char *str = strdup("onceandforall");
   if(rank==size-1){
-    *buf=(unsigned long)SMPI_SHARED_CALL(hash,str,str);  
+    SMPI_SHARED_CALL(hash,str,str,buf);  
   }
   
   MPI_Barrier(MPI_COMM_WORLD);
   
-  printf("[%d] After change, the value in the shared buffer is: %lu\n", rank, *buf);
-  
+  printf("[%d] After change, the value in the shared buffer is: %" PRIu64"\n", rank, *buf);
   
   SMPI_SHARED_FREE(buf);  
+  buf=NULL;  
+  free(str);
     
   MPI_Finalize();
   return 0;