@@ -1,3 +1,6 @@

+1.3.1:

+ - add -T option (traffic-shape, Mbps order)

+

 1.3.0:

  - add -R option (RCVBUF socket option value)

  - add -S option (SNDBUF socket option value)

@@ -1,7 +1,11 @@

+1.3.1:

+ - Tオプションを追加

+   Mbps単位で最大転送レートを指定

+

 1.3.0: 2010/3/1

  - ソケットバッファサイズを指定できるオプションを追加

- - -R オプション (SO_RCVBUF)

- - -S オプション (SO_SNDBUF)

+ - R オプション (SO_RCVBUF)

+ - S オプション (SO_SNDBUF)

 1.2.2: 2010/2/25

  - makuosan.sysvをstatusとrestartに対応

@@ -5,11 +5,13 @@

 #include "makuosan.h"

 mopt moption;

-mfile *mftop[2] = {NULL,NULL};

-mfile *mfreeobj = NULL;

-mhost *members  = NULL;

-int loop_flag   = 1;

-int send_rate   = 0;

+mfile *mftop[2]  = {NULL,NULL};

+mfile *mfreeobj  = NULL;

+mhost *members   = NULL;

+int loop_flag    = 1;

+int send_rate    = 0;

+int view_rate    = 0;

+time_t send_time = 0;

 struct timeval curtime;

 struct timeval lastpong;

 BF_KEY EncKey;

@@ -308,6 +308,8 @@ extern int optopt;

 extern int optreset;

 extern int loop_flag;

 extern int send_rate;

+extern int view_rate;

+extern time_t send_time;

 extern char *tzname[2];

 extern int daylight;

 extern char TZ[256];

@@ -382,6 +382,7 @@ int mexec_send(mcomm *c, int n, int sync)

   }

   argv[i] = NULL;

   optind  = 1;

+  opterr  = 1;

 #ifdef HAVE_GETOPT_OPTRESET

   optreset = 1;

 #endif

@@ -564,6 +565,7 @@ int mexec_check(mcomm *c, int n)

     argv[i] = c->parse[n][i];

   argv[i] = NULL;

   optind  = 1;

+  opterr  = 1;

 #ifdef HAVE_GETOPT_OPTRESET

   optreset = 1;

 #endif

@@ -670,6 +672,7 @@ int mexec_dsync(mcomm *c, int n)

     argv[i] = c->parse[n][i];

   argv[i] = NULL;

   optind  = 1;

+  opterr  = 1;

 #ifdef HAVE_GETOPT_OPTRESET

   optreset = 1;

 #endif

@@ -905,6 +908,9 @@ int mexec_status(mcomm *c, int n)

   /*----- RCVBUF/SNDBUF -----*/

   cprintf(0, c, "recvsize: %d\n", moption.recvsize);

   cprintf(0, c, "sendsize: %d\n", moption.sendsize);

+  

+  /*----- send rate -----*/

+  cprintf(0, c, "sendrate: %d/%d\n", view_rate * 8 / 1024 / 1024, moption.sendrate * 8 / 1024 / 1024);

   /*----- command -----*/

   count = 0;

@@ -28,6 +28,7 @@ static void usage()

   printf("  -f num   # parallel send count(default: 5) \n");

   printf("  -R num   # recv buffer size [bytes]\n");

   printf("  -S num   # send buffer size [bytes]\n");

+  printf("  -T num   # traffic rate     [Mbps]\n");

   printf("  -c       # chroot to base dir\n");

   printf("  -n       # don't fork\n");

   printf("  -r       # don't recv\n");

@@ -318,7 +319,7 @@ static void minit_getopt(int argc, char *argv[])

         exit(0);

       case 'T':

-        moption.sendrate = atoi(optarg);

+        moption.sendrate = atoi(optarg) * 1024 * 1024 / 8;

         break;

       case 'R':

@@ -670,7 +671,7 @@ static void minit_bootlog()

   lprintf(0, "passwoed  : %s\n", yesno(moption.commpass));

   lprintf(0, "ownermatch: %s\n", yesno(moption.ownmatch));

   if(moption.sendrate){

-    lprintf(0, "rate      : %d[Mbps]\n", moption.sendrate);

+    lprintf(0, "rate      : %d[Mbps]\n", moption.sendrate * 8 / 1024 / 1024);

   }

   if(moption.comm_ena){

     if(moption.uaddr.sun_path[0]){

@@ -59,7 +59,22 @@ static int msend_encrypt(mdata *data)

 static int msend_readywait()

 {

   fd_set fds;

+  time_t tm;

   struct timeval tv;

+

+  tm = time(NULL);

+  while(tm == send_time){

+    if(moption.sendrate > send_rate){

+      break;

+    }

+    usleep(1000);

+    tm = time(NULL);

+  }

+  if(tm != send_time){

+    view_rate = send_rate;

+    send_rate =  0;

+    send_time = tm;

+  }

   while(!moption.sendready){

     FD_ZERO(&fds);

     FD_SET(moption.mcsocket, &fds);

@@ -100,6 +115,7 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

     moption.sendready = 0;

     r = sendto(s, &senddata, szdata, 0, (struct sockaddr*)addr, sizeof(struct sockaddr_in));

     if(r == szdata){

+      send_rate += r;

       return(0); /* success */

     }

     if(r == -1){