Really rename the HostManagement amok module to PeerManagement

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2602 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/doc/module-amok.doc b/doc/module-amok.doc
index 33c8db3..0497335 100644 (file)
--- a/doc/module-amok.doc
+++ b/doc/module-amok.doc
@@ -7,7 +7,7 @@
  *  @{ */     
 
        /** \defgroup AMOK_bw      Bandwidth        */       
-       /** \defgroup AMOK_hm      Host Management  */       
+       /** \defgroup AMOK_pm      Peer Management  */       
 
 /** @} */
 

diff --git a/examples/amok/bandwidth/bandwidth.c b/examples/amok/bandwidth/bandwidth.c
index 148a86c..6d1eda4 100644 (file)
--- a/examples/amok/bandwidth/bandwidth.c
+++ b/examples/amok/bandwidth/bandwidth.c
@@ -27,15 +27,15 @@ int sensor (int argc,char *argv[]) {
 
   gras_init(&argc, argv);
   amok_bw_init();
-  amok_hm_init();
+  amok_pm_init();
  
   mysock = gras_socket_server_range(3000,9999,0,0);
   INFO1("Sensor starting (on port %d)",gras_os_myport());
   gras_os_sleep(0.5); /* let the master get ready */
   master = gras_socket_client_from_string(argv[1]);
                                              
-  amok_hm_group_join(master,"bandwidth");
-  amok_hm_mainloop(60);
+  amok_pm_group_join(master,"bandwidth");
+  amok_pm_mainloop(60);
 
   gras_socket_close(mysock);
   gras_socket_close(master);
@@ -64,7 +64,7 @@ int maestro(int argc,char *argv[]) {
 
   gras_init(&argc, argv);
   amok_bw_init();
-  amok_hm_init();
+  amok_pm_init();
 
   INFO0("Maestro starting");
   if (argc != 2) {
@@ -72,7 +72,7 @@ int maestro(int argc,char *argv[]) {
      return 1;
   }
   mysock=gras_socket_server(atoi(argv[1]));
-  group=amok_hm_group_new("bandwidth");
+  group=amok_pm_group_new("bandwidth");
   INFO0("Wait for peers for 5 sec");
   gras_msg_handleall(5); /* friends, we're ready. Come and play */
    
@@ -103,7 +103,7 @@ int maestro(int argc,char *argv[]) {
        sec,((double)bw)/1024.0);
 
   /* Game is over, friends */
-  amok_hm_group_shutdown ("bandwidth");
+  amok_pm_group_shutdown ("bandwidth");
 
   gras_socket_close(mysock);
   gras_exit();

diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c
index 108e595..e55d0c8 100644 (file)
--- a/examples/amok/saturate/saturate.c
+++ b/examples/amok/saturate/saturate.c
@@ -31,15 +31,15 @@ int sensor (int argc,char *argv[]) {
 
   gras_init(&argc, argv);
   amok_bw_init();
-  amok_hm_init();
+  amok_pm_init();
  
   mysock = gras_socket_server_range(3000,9999,0,0);
   INFO1("Sensor starting (on port %d)",gras_os_myport());
   gras_os_sleep(2); /* let the master get ready */
   master = gras_socket_client_from_string(argv[1]);
                                              
-  amok_hm_group_join(master,"saturate");
-  amok_hm_mainloop(600);
+  amok_pm_group_join(master,"saturate");
+  amok_pm_mainloop(600);
 
   gras_socket_close(mysock);
   gras_socket_close(master);
@@ -151,7 +151,7 @@ static void full_fledged_saturation(int argc, char*argv[]) {
   xbt_peer_t h1,h2,h3,h4;
 
   /* Init the group */
-  peers=amok_hm_group_new("saturate");
+  peers=amok_pm_group_new("saturate");
   /* wait 4 dudes */
   gras_msg_handle(60);
   gras_msg_handle(60);
@@ -219,7 +219,7 @@ static void full_fledged_saturation(int argc, char*argv[]) {
   free(bw_sat);
   free(bw);
   /* Game is over, friends */
-  amok_hm_group_shutdown ("saturate");
+  amok_pm_group_shutdown ("saturate");
 }
 
 
@@ -227,7 +227,7 @@ int maestro(int argc,char *argv[]) {
 
   gras_init(&argc,argv);
   amok_bw_init();
-  amok_hm_init();
+  amok_pm_init();
 
   gras_socket_server(atoi(argv[1]));
 

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
index b41dfad..19b4d6d 100755 (executable)
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -92,7 +92,7 @@ int master (int argc,char *argv[]) {
 
   /* Init the GRAS's infrastructure */
   gras_init(&argc, argv);
-  amok_hm_init();
+  amok_pm_init();
   register_messages();
       
   /* Initialize data matrices */
@@ -102,7 +102,7 @@ int master (int argc,char *argv[]) {
        
   /* Create the connexions */
   gras_socket_server(atoi(argv[1]));
-  peers=amok_hm_group_new("pmm");
+  peers=amok_pm_group_new("pmm");
   INFO0("Wait for peers for 10 sec");
   gras_msg_handleall(10); /* friends, we're ready. Come and play */
   INFO1("Got %ld pals",xbt_dynar_length(peers));
@@ -124,7 +124,7 @@ int master (int argc,char *argv[]) {
     xbt_peer_t h;
 
     xbt_dynar_get_cpy(peers,i,&h);
-    amok_hm_kill_hp(h->name,h->port);
+    amok_pm_kill_hp(h->name,h->port);
     free(h);
   }
 
@@ -193,7 +193,7 @@ int master (int argc,char *argv[]) {
      INFO1("Matrix size too big (%d>30) to be displayed here",DATA_MATRIX_SIZE);
   }
 
-  amok_hm_group_shutdown ("pmm");   /* Ok, we're out of here */
+  amok_pm_group_shutdown ("pmm");   /* Ok, we're out of here */
 
   for(i=0; i<SLAVE_COUNT; i++) {
      gras_socket_close(socket[i]);
@@ -357,7 +357,7 @@ int slave(int argc,char *argv[]) {
 
   /* Init the GRAS's infrastructure */
   gras_init(&argc, argv);
-  amok_hm_init();
+  amok_pm_init();
 
   /*  Register the known messages and my callback */
   register_messages();
@@ -370,8 +370,8 @@ int slave(int argc,char *argv[]) {
   master = gras_socket_client_from_string(argv[1]);
                                
   /* Join and run the group */
-  amok_hm_group_join(master,"pmm");
-  amok_hm_mainloop(600);
+  amok_pm_group_join(master,"pmm");
+  amok_pm_mainloop(600);
 
   /* housekeeping */
   gras_socket_close(mysock);