X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1c4b3ead099df97f5dff00f22d5cbfbf3d32ec1..f51c250f2f0b60093c4bd1acae068578a1bf078d:/examples/amok/saturate/saturate.c

diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c
index e19549f716..1b77417c68 100644
--- a/examples/amok/saturate/saturate.c
+++ b/examples/amok/saturate/saturate.c
@@ -1,8 +1,7 @@
-/* $Id$ */
+/* saturate - link saturation demo of AMOK features                         */
 
-/* saturate - link saturation demo of GRAS features                         */
-
-/* Copyright (c) 2003 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010. 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. */
@@ -12,46 +11,41 @@
 #include <signal.h>
 #include <time.h>
 
-#include <gras.h>
+#include "xbt/peer.h"
+#include "gras.h"
+#include "amok/bandwidth.h"
+#include "amok/peermanagement.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,"Messages specific to this example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(saturate,
+                             "Messages specific to this example");
 
 /* **********************************************************************
  * Sensor code
  * **********************************************************************/
 
-/* Global private data */
-typedef struct {
-  gras_socket_t *sock;
-} sensor_data_t;
-
 /* Function prototypes */
-int sensor (int argc,char *argv[]);
+int sensor(int argc, char *argv[]);
 
-int sensor (int argc,char *argv[]) {
-  xbt_error_t errcode;
-  sensor_data_t *g=gras_userdata_new(sensor_data_t);  
+int sensor(int argc, char *argv[])
+{
+  gras_socket_t mysock;
+  gras_socket_t master;
 
-  if ((errcode=gras_socket_server(4000,&(g->sock)))) {
-    CRITICAL1("Sensor: Error %s encountered while opening the server socket",xbt_error_name(errcode));
-    return 1;
-  }
+  gras_init(&argc, argv);
+  amok_bw_init();
+  amok_pm_init();
 
-  if (grasbw_register_messages()) {
-    gras_socket_close(g->sock);
-    return 1;
-  }
+  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]);
 
-  while (1) {
-    if ((errcode=gras_msg_handle(60.0)) && errcode != timeout_error) { 
-       CRITICAL1("Sensor: Error '%s' while handling message",
-	      xbt_error_name(errcode));
-    }
-  }
+  amok_pm_group_join(master, "saturate");
+  amok_pm_mainloop(600);
 
-  gras_os_sleep(5,0);
-  gras_socket_close(g->sock);
-   
+  gras_socket_close(mysock);
+  gras_socket_close(master);
+  gras_exit();
   return 0;
 }
 
@@ -59,200 +53,234 @@ int sensor (int argc,char *argv[]) {
  * Maestro code
  * **********************************************************************/
 
-/* Global private data */
-typedef struct {
-  gras_socket_t *sock;
-} maestro_data_t;
-
 /* Function prototypes */
-int maestro (int argc,char *argv[]);
-double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2);
-
-double XP(const char *bw1, const char *bw2, const char *sat1, const char *sat2) {
-  xbt_error_t errcode;
-  int bufSize=32 * 1024;
-  int expSize=64 * 1024;
-  int msgSize=64 * 1024;
-  int satSize=msgSize * 10;
-  double sec, bw, sec_sat,bw_sat;
-
-  if ((errcode=grasbw_request(bw1,4000,bw2,4000,bufSize,expSize,msgSize,&sec,&bw))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode));
-    return -1;
-  }
-   
-  fprintf(stderr,"MAESTRO: BW(%s,%s) => %f sec, achieving %f Mb/s\n",bw1,bw2,sec,bw);
+int maestro(int argc, char *argv[]);
 
-  if ((errcode=grasbw_saturate_start(sat1,4000,sat2,4000,satSize,60))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while starting saturation\n",
-	    xbt_error_name(errcode));
-    return -1;
-  }
-  gras_os_sleep(1,0);
-  if ((errcode=grasbw_request(bw1,4000,bw2,4000,bufSize,expSize,msgSize,&sec_sat,&bw_sat))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode));
-    return -1;
+/* XP setups */
+const int buf_size = 0;
+const int msg_size = 50 * 1024;
+const int msg_amount = 2;
+const int sat_size = 1024 * 1024 * 10;
+const double min_duration = 1;
+
+static double XP(const char *bw1, const char *bw2,
+                 const char *sat1, const char *sat2)
+{
+
+  double sec, bw, sec_sat, bw_sat;
+
+  gras_os_sleep(5.0);           /* wait for the sensors to show up */
+  /* Test BW without saturation */
+  amok_bw_request(bw1, 4000, bw2, 4000,
+                  buf_size, msg_size, msg_amount, min_duration, &sec, &bw);
+  INFO4("BW(%s,%s) => %f sec, achieving %f Mb/s",
+        bw1, bw2, sec, (bw / 1024.0 / 1024.0));
+
+
+  /* Test BW with saturation */
+  amok_bw_saturate_start(sat1, 4000, sat2, 4000, sat_size, 60);
+  gras_os_sleep(1.0);           /* let it start */
+
+  amok_bw_request(bw1, 4000, bw2, 4000,
+                  buf_size, msg_size, msg_amount, min_duration, &sec_sat,
+                  &bw_sat);
+  INFO6("BW(%s,%s//%s,%s) => %f sec, achieving %f Mb/s", bw1, bw2, sat1,
+        sat2, sec, bw / 1024.0 / 1024.0);
+
+  amok_bw_saturate_stop(sat1, 4000, NULL, NULL);
+
+  if (bw_sat / bw < 0.7) {
+    INFO0("THERE IS SOME INTERFERENCE !!!");
   }
-   
-  fprintf(stderr,"MAESTRO: BW(%s,%s//%s,%s) => %f sec, achieving %f Mb/s\n",
-	 bw1,bw2,sat1,sat2,sec_sat,bw_sat);
-
-  if ((errcode=grasbw_saturate_stop(sat1,4000,sat2,4000))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation\n",
-	    xbt_error_name(errcode));
-    return -1;
+  if (bw / bw_sat < 0.7) {
+    INFO0("THERE IS SOME INTERFERENCE (and I'm an idiot) !!!");
   }
+  return bw_sat / bw;
+}
+
+static void kill_buddy(char *name, int port)
+{
+  gras_socket_t sock = gras_socket_client(name, port);
+  gras_msg_send(sock, "kill", NULL);
+  gras_socket_close(sock);
+}
 
-  if (bw_sat/bw < 0.7) {
-    fprintf(stderr,"MAESTRO: THERE IS SOME INTERFERENCE !!!\n");
-  } 
-  if (bw/bw_sat < 0.7) {
-    fprintf(stderr,"MAESTRO: THERE IS SOME INTERFERENCE (and Im a cretin) !!!\n");
-  } 
-  return bw_sat/bw;
+static void kill_buddy_dynar(void *b)
+{
+  xbt_peer_t buddy = *(xbt_peer_t *) b;
+  kill_buddy(buddy->name, buddy->port);
+}
 
+static void free_peer(void *d)
+{
+  xbt_peer_t h = *(xbt_peer_t *) d;
+  free(h->name);
+  free(h);
 }
 
-//#define MAXHOSTS 33
-#define MAXHOSTS 4
+static void simple_saturation(int argc, char *argv[])
+{
+  xbt_ex_t e;
+
+  /* where are the sensors */
+  xbt_dynar_t peers;
+  xbt_peer_t h1, h2;
+  /* results */
+  double duration, bw;
+
+  /* Init the group */
+  peers = amok_pm_group_new("saturate");
+  /* wait for dudes */
+  gras_msg_handleall(5);
+
+  /* Stop all sensors but two of them */
+  while (xbt_dynar_length(peers) > 2) {
+    xbt_dynar_pop(peers, &h1);
+    amok_pm_kill_hp(h1->name, h1->port);
+    xbt_peer_free(h1);
+  }
 
-int maestro(int argc,char *argv[]) {
-  int bufSize=32 * 1024;
-  int expSize= 1024 * 1024;
-  int msgSize=expSize;
-  int satSize=msgSize * 100;
-  double dummy,beginSim;
-  xbt_error_t errcode;
-  maestro_data_t *g=gras_userdata_new(maestro_data_t);
-  //  const char *hosts[MAXHOSTS] = { "61", "62", "63", "69", "70", "77", "81", "83", "85", "87", "88", "95", "98", "107", "109", "111", "112", "121", "124", "125", "131", "145", "150", "156", "157", "162", "165", "168", "169", "170", "175", "177", "178" };
-  const char *hosts[MAXHOSTS] = { "A", "B", "C", "D" };
+  /* get 2 friends */
+  xbt_dynar_get_cpy(peers, 0, &h1);
+  xbt_dynar_get_cpy(peers, 1, &h2);
 
-  double bw[MAXHOSTS][MAXHOSTS];
-  double bw_sat[MAXHOSTS][MAXHOSTS];
+  /* Start saturation */
+  INFO4("Start saturation between %s:%d and %s:%d",
+        h1->name, h1->port, h2->name, h2->port);
 
-  int a,b,c,d,begin;
+  amok_bw_saturate_start(h1->name, h1->port, h2->name, h2->port, 0,     /* Be a nice boy, compute msg_size yourself */
+                         30 /* 5 sec timeout */ );
 
-  if ((errcode=gras_socket_server(4000,&(g->sock)))) { 
-    fprintf(stderr,"MAESTRO: Error %s encountered while opening the server socket\n",xbt_error_name(errcode));
-    return 1;
+  /* Stop it after a while */
+  INFO0("Have a rest");
+  gras_os_sleep(1);
+  TRY {
+    INFO0("Stop the saturation");
+    amok_bw_saturate_stop(h1->name, h1->port, &duration, &bw);
   }
-
-  if (grasbw_register_messages()) {
-    gras_socket_close(g->sock);
-    return 1;
+  CATCH(e) {
+    INFO0("Ooops, stoping the saturation raised an exception");
+    xbt_ex_free(e);
   }
+  INFO2("Saturation took %.2fsec, achieving %fb/s", duration, bw);
 
-  begin=time(NULL);
-  beginSim=gras_os_time();
-  for (a=0; a<MAXHOSTS; a++) {
-    for (b=0; b<MAXHOSTS; b++) {
-      if (a==b) continue;
-      fprintf(stderr,"BW XP(%s %s)=",hosts[a],hosts[b]); 
-      if ((errcode=grasbw_request(hosts[a],4000,hosts[b],4000,bufSize,expSize,msgSize,
-				  &dummy,&(bw[a][b])))) {
-	fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode));
-	return 1;
-      }
-      fprintf(stderr,"%f Mb/s in %f sec\n",bw[a][b],dummy);
-    }
-  }
-  fprintf(stderr,"Did all BW tests in %ld sec (%.2f simulated sec)\n",
-	  time(NULL)-begin,gras_os_time()-beginSim);
-      
-  for (a=0; a<MAXHOSTS; a++) {
-    for (b=0; b<MAXHOSTS; b++) {
-      if (a==b) continue;
-      	
-      if ((errcode=grasbw_saturate_start(hosts[a],4000,hosts[b],4000,satSize,360000000))) {
-	fprintf(stderr,"MAESTRO: Error %s encountered while starting saturation\n",
-		xbt_error_name(errcode));
-	return -1;
+  /* Game is over, friends */
+  amok_pm_group_shutdown("saturate");
+}
+
+/********************************************************************************************/
+static void full_fledged_saturation(int argc, char *argv[])
+{
+  xbt_ex_t e;
+  double time1 = 5.0, bw1 = 5.0;        // 0.5 for test
+  /* timers */
+  double begin_simulated;
+  int begin;
+
+  /* where are the sensors */
+  xbt_dynar_t peers;
+  int nb_peers;
+
+  /* results */
+  double *bw;
+  double *bw_sat;
+
+  /* iterators */
+  unsigned int i, j, k, l;
+  xbt_peer_t h1, h2, h3, h4;
+
+  /* Init the group */
+  peers = amok_pm_group_new("saturate");
+  /* wait 4 dudes */
+  gras_msg_handle(60);
+  gras_msg_handle(60);
+  gras_msg_handle(60);
+  gras_msg_handle(60);
+  nb_peers = xbt_dynar_length(peers);
+
+  INFO0("Let's go for the bw_matrix");
+
+  /* Do the test without saturation */
+  begin = time(NULL);
+  begin_simulated = gras_os_time();
+
+  bw = amok_bw_matrix(peers, buf_size, msg_size, msg_amount, min_duration);
+
+  INFO2("Did all BW tests in %ld sec (%.2f simulated(?) sec)",
+        (long int) (time(NULL) - begin), gras_os_time() - begin_simulated);
+
+  /* Do the test with saturation */
+  bw_sat = xbt_new(double, nb_peers * nb_peers);
+  xbt_dynar_foreach(peers, i, h1) {
+    xbt_dynar_foreach(peers, j, h2) {
+      if (i == j)
+        continue;
+
+      TRY {
+        amok_bw_saturate_start(h1->name, h1->port, h2->name, h2->port, 0,       /* Be nice, compute msg_size yourself */
+                               0 /* no timeout */ );
       }
-      gras_os_sleep(1,0);
-
-      begin=time(NULL);
-      beginSim=gras_os_time();
-      for (c=0 ;c<MAXHOSTS; c++) {
-	if (a==c) continue;
-	if (b==c) continue;
-
-	for (d=0 ;d<MAXHOSTS; d++) {
-	  if (a==d) continue;
-	  if (b==d) continue;
-	  if (c==d) continue;
-	  
-	  if ((errcode=grasbw_request(hosts[c],4000,hosts[d],4000,bufSize,expSize,msgSize,
-				      &dummy,&(bw_sat[c][d])))) {
-	    fprintf(stderr,"MAESTRO: Error %s encountered in test\n",xbt_error_name(errcode));
-	    return 1;
-	  }
-	  fprintf(stderr, "MAESTRO[%.2f sec]: SATURATED BW XP(%s %s // %s %s) => %f (%f vs %f)%s\n",
-		  gras_os_time(),
-		  hosts[c],hosts[d],hosts[a],hosts[b],
-		  bw_sat[c][d]/bw[c][d],bw[c][d],bw_sat[c][d],
-
-		  (bw_sat[c][d]/bw[c][d] < 0.7) ? " THERE IS SOME INTERFERENCE !!!":
-		  ((bw[c][d]/bw_sat[c][d] < 0.7) ? " THERE IS SOME INTERFERENCE (and Im a cretin) !!!":
-		   ""));
-	}
+      CATCH(e) {
+        RETHROW0("Cannot ask peers to saturate the link: %s");
       }
-
-      if ((errcode=grasbw_saturate_stop(hosts[a],4000,hosts[b],4000))) {
-	fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation\n",
-		xbt_error_name(errcode));
-	return -1;
+      gras_os_sleep(5);
+
+      begin = time(NULL);
+      begin_simulated = gras_os_time();
+      xbt_dynar_foreach(peers, k, h3) {
+        if (i == k || j == k)
+          continue;
+
+        xbt_dynar_foreach(peers, l, h4) {
+          double ratio;
+          if (i == l || j == l || k == l)
+            continue;
+
+          VERB4("TEST %s %s // %s %s",
+                h1->name, h2->name, h3->name, h4->name);
+          amok_bw_request(h3->name, h3->port, h4->name, h4->port,
+                          buf_size, msg_size, msg_amount, min_duration,
+                          NULL, &(bw_sat[k * nb_peers + l]));
+
+          ratio = bw_sat[k * nb_peers + l] / bw[k * nb_peers + l];
+          INFO8("SATURATED BW XP(%s %s // %s %s) => %f (%f vs %f)%s",
+                h1->name, h2->name, h3->name, h4->name,
+                ratio,
+                bw[k * nb_peers + l], bw_sat[k * nb_peers + l],
+                ratio < 0.7 ? " THERE IS SOME INTERFERENCE !!!" : "");
+        }
       }
-      fprintf(stderr,"Did an iteration on saturation pair in %ld sec (%.2f simulated sec)\n",
-	      time(NULL)-begin, gras_os_time()-beginSim);
+      amok_bw_saturate_stop(h1->name, h1->port, &time1, &bw1);
+
+      INFO2
+          ("Did an iteration on saturation pair in %ld sec (%.2f simulated sec)",
+           (long int) (time(NULL) - begin),
+           gras_os_time() - begin_simulated);
+      INFO2
+          ("the duration of the experiment >>>>> %.3f sec (%.3f bandwidth)",
+           time1, bw1);
     }
   }
+  free(bw_sat);
+  free(bw);
+  /* Game is over, friends */
+  amok_pm_group_shutdown("saturate");
+}
 
-  gras_os_sleep(5,0);
-  exit(0);
-#if 0
-  return 0;
-  /* start saturation */
-  fprintf(stderr,"MAESTRO: Start saturation with size %d\n",msgSize);
-  if ((errcode=grasbw_saturate_start(argv[5],atoi(argv[6]),argv[7],atoi(argv[8]),msgSize*10,60))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while starting saturation\n",
-	    xbt_error_name(errcode));
-    return 1;
-  }
-  fprintf(stderr,"MAESTRO: Saturation started\n");
-  gras_os_sleep(5,0);
-
-  /* test with saturation */
-  if ((errcode=grasbw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]),
-			      bufSize,expSize,msgSize,&sec,&bw))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode));
-    return 1;
-  }
-   
-  fprintf(stderr,"MAESTRO: Experience3 (%d ko in msgs of %d ko with saturation) took %f sec, achieving %f Mb/s\n",
-	  expSize/1024,msgSize/1024,
-	  sec,bw);
-
-  /* stop saturation */
-  if ((errcode=grasbw_saturate_stop(argv[5],atoi(argv[6]),argv[7],atoi(argv[8])))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while stopping saturation\n",
-	    xbt_error_name(errcode));
-    return 1;
-  }
 
-  /* test without saturation */
-  if ((errcode=grasbw_request(argv[1],atoi(argv[2]),argv[3],atoi(argv[4]),
-			      bufSize,expSize,msgSize,&sec,&bw))) {
-    fprintf(stderr,"MAESTRO: Error %s encountered while doing the test\n",xbt_error_name(errcode));
-    return 1;
-  }
-   
-  fprintf(stderr,"MAESTRO: Experience4 (%d ko in msgs of %d ko, without saturation) took %f sec, achieving %f Mb/s\n",
-	  expSize/1024,msgSize/1024,
-	  sec,bw);
-
-  gras_os_sleep(5,0);
-#endif
-  gras_socket_close(g->sock);
-   
+int maestro(int argc, char *argv[])
+{
+
+  gras_init(&argc, argv);
+  amok_bw_init();
+  amok_pm_init();
+
+  gras_socket_server(atoi(argv[1]));
+
+  simple_saturation(argc, argv);
+  //full_fledged_saturation(argc, argv);  
+
+  gras_exit();
   return 0;
+
 }