@@ -287,21 +287,23 @@ int seq_addmark(mfile *m, uint32_t lseq, uint32_t useq)

       lprintf(0,"%s: out of memory\n", __func__);

       return(-1); 

     }

-    m->mark = n;

+    m->mark     = n;

     m->marksize = size;

     /***** retry(apap) *****/

-    a = mfins(0);

-    if(!a){

-      lprintf(0,"%s: out of memory\n", __func__);

-    }else{

-      a->mdata.head.flags |= MAKUO_FLAG_ACK;

-      a->mdata.head.opcode = m->mdata.head.opcode;

-      a->mdata.head.reqid  = m->mdata.head.reqid;

-      a->mdata.head.szdata = 0;

-      a->mdata.head.seqno  = m->mdata.head.seqno;

-      a->mdata.head.nstate = MAKUO_RECVSTATE_RETRY;

-      memcpy(&(a->addr), &(m->addr), sizeof(a->addr));

+    if(m->mdata.head.nstate == MAKUO_RECVSTATE_OPEN){

+      a = mfins(0);

+      if(!a){

+        lprintf(0,"%s: out of memory\n", __func__);

+      }else{

+        a->mdata.head.flags |= MAKUO_FLAG_ACK;

+        a->mdata.head.opcode = m->mdata.head.opcode;

+        a->mdata.head.reqid  = m->mdata.head.reqid;

+        a->mdata.head.szdata = 0;

+        a->mdata.head.seqno  = m->mdata.head.seqno;

+        a->mdata.head.nstate = MAKUO_RECVSTATE_RETRY;

+        memcpy(&(a->addr), &(m->addr), sizeof(a->addr));

+      }

     }

   }

   for(i=lseq;i<useq;i++){

@@ -271,7 +271,12 @@ int ismsend(mfile *m)

   }

   if(!r){

     m->sendwait = 0;

-    return(1);

+    if(!(m->senddelay)){

+      return(1);

+    }

+    if(mtimeout(&(m->lastsend), m->senddelay)){

+      return(1);

+    }

   }

   if(mtimeout(&(m->lastsend), MAKUO_SEND_TIMEOUT)){

     if(m->retrycnt){

@@ -51,6 +51,7 @@

 /*----- timeout -----*/

 #define MAKUO_SEND_TIMEOUT  500    /* 再送間隔(ms)                                 */

 #define MAKUO_SEND_RETRYCNT 120    /* 再送回数                                     */

+#define MAKUO_SEND_DELAYSTP 1      /* 送出遅延時間の増分(ms)                        */

 #define MAKUO_PONG_TIMEOUT  180000 /* メンバから除外するまでの時間(ms)             */

 #define MAKUO_PONG_INTERVAL 45000  /* PING送信間隔(ms)                             */

 #define MAKUO_RECV_GCWAIT   300000 /* 消し損ねたオブジェクトを開放する待ち時間(ms) */

@@ -181,6 +182,7 @@ typedef struct

   uint32_t retrycnt;

   uint32_t sendwait;

   uint32_t lickflag;

+  uint32_t senddelay;

   uint32_t initstate;

   uint32_t recvcount;

   uint32_t markcount;

@@ -475,17 +475,30 @@ int mexec_status(mcomm *c, int n)

 {

   int count;

   mfile  *m;

-  cprintf(0,c,"MAKUOSAN version %s\n", MAKUOSAN_VERSION);

-  

+  struct tm *t;

+

+  cprintf(0,c,"version  : %s\n", MAKUOSAN_VERSION);

   count = 0;

   for(m=mftop[0];m;m=m->next)

     count++;

-  cprintf(0,c,"send object: %d\n", count);

+  cprintf(0,c,"send file: %d\n", count);

+  for(m=mftop[0];m;m=m->next){

+    if(m->lickflag){

+      cprintf(0, c, "  state=%d %s (%d/%d)\n",m->mdata.head.nstate, m->fn, m->mdata.head.seqno,m->seqnomax); 

+    }else{

+      cprintf(0, c, "  state=%d %s (%d/%d)\n",m->mdata.head.nstate, m->fn, m->mdata.head.seqno,m->seqnomax); 

+    }

+  }

   count = 0;

   for(m=mftop[1];m;m=m->next)

     count++;

-  cprintf(0,c,"recv object: %d\n", count);

+  cprintf(0, c, "recv file: %d\n", count);

+  for(m=mftop[1];m;m=m->next){

+    t = localtime(&(m->lastrecv.tv_sec));

+    cprintf(0, c, "  state=%d %02d:%02d:%02d %s (%d/%d) mark=%d\n",

+      m->mdata.head.nstate, t->tm_hour, t->tm_min, t->tm_sec, m->fn, m->recvcount, m->seqnomax, m->markcount); 

+  }

   return(0);

 }

@@ -228,8 +228,10 @@ static void mrecv_ack_send(mdata *data, struct sockaddr_in *addr)

     }

   }

   if(data->head.nstate == MAKUO_RECVSTATE_RETRY){

-    lprintf(1, "%s: send retry %s from %s\n", __func__, m->fn, t->hostname);

-    m->lickflag = 0;

+    lprintf(0, "%s: send retry %s from %s\n", __func__, m->fn, t->hostname);

+    m->sendwait   = 0;

+    m->lickflag   = 0;

+    m->senddelay += MAKUO_SEND_DELAYSTP;

     m->mdata.head.seqno  = 0;

     m->mdata.head.nstate = MAKUO_SENDSTATE_DATA;

   }else{

@@ -502,7 +504,6 @@ static void mrecv_req_send_mark(mfile *m, mdata *r)

   a->mdata.head.szdata = 0;

   memcpy(&(a->addr), &(m->addr), sizeof(a->addr));

   m->lickflag = 1;

-  a->lickflag = 1;

   if(m->mdata.head.seqno < m->seqnomax){

     seq_addmark(m, m->mdata.head.seqno, m->seqnomax);

     m->mdata.head.seqno = m->seqnomax;

@@ -530,24 +531,12 @@ static void mrecv_req_send_close(mfile *m, mdata *r)

   sprintf(fpath, "%s/%s", moption.base_dir, m->fn);

   sprintf(tpath, "%s/%s", moption.base_dir, m->tn);

-  switch(m->mdata.head.nstate){

-    case MAKUO_RECVSTATE_OPEN:

-    case MAKUO_RECVSTATE_UPDATE:

-    case MAKUO_RECVSTATE_MARK:

-      m->mdata.head.ostate = m->mdata.head.nstate;

-      m->mdata.head.nstate = MAKUO_RECVSTATE_CLOSE;

-      break;

-    case MAKUO_RECVSTATE_CLOSE:

-    case MAKUO_RECVSTATE_CLOSEERROR:

-      break;

-    default:

-      return;

-  }

-

-  if(m->fd != -1){

-    fstat(m->fd, &fs);

-    close(m->fd);

-    m->fd = -1;

+  if(m->mdata.head.nstate == MAKUO_RECVSTATE_OPEN){

+    if(m->fd != -1){

+      fstat(m->fd, &fs);

+      close(m->fd);

+      m->fd = -1;

+    }

     mftime.actime  = m->fs.st_ctime; 

     mftime.modtime = m->fs.st_mtime;

     if(S_ISLNK(m->fs.st_mode)){

@@ -566,7 +555,7 @@ static void mrecv_req_send_close(mfile *m, mdata *r)

         if(fs.st_size != m->fs.st_size){

           m->mdata.head.nstate = MAKUO_RECVSTATE_CLOSEERROR;

           lprintf(0, "%s: close error %s (file size mismatch %d != %d)\n", __func__, m->fn, (int)(fs.st_size), (int)(m->fs.st_size));

-          lprintf(0, "%s: seq=%d max=%d markcnt=%d\n", __func__, m->mdata.head.seqno, m->seqnomax, m->markcount);

+          lprintf(0, "%s: seq=%d max=%d mark=%d recv=%d\n", __func__, m->mdata.head.seqno, m->seqnomax, m->markcount, m->recvcount);

           mremove(moption.base_dir, m->tn);

         }else{

           if(!mrename(moption.base_dir, m->tn, m->fn)){

@@ -583,6 +572,20 @@ static void mrecv_req_send_close(mfile *m, mdata *r)

     }

   }

+  switch(m->mdata.head.nstate){

+    case MAKUO_RECVSTATE_OPEN:

+    case MAKUO_RECVSTATE_UPDATE:

+    case MAKUO_RECVSTATE_MARK:

+      m->mdata.head.ostate = m->mdata.head.nstate;

+      m->mdata.head.nstate = MAKUO_RECVSTATE_CLOSE;

+      break;

+    case MAKUO_RECVSTATE_CLOSE:

+    case MAKUO_RECVSTATE_CLOSEERROR:

+      break;

+    default:

+      return;

+  }

+

   a = mfins(0);

   if(!a){

     lprintf(0,"%s: out of memory\n", __func__);

@@ -328,8 +328,8 @@ static void msend_req_send_open(int s, mfile *m)

   }

   lprintf(9,"%s: %s\n", __func__, m->fn);

   if(ack_check(m, MAKUO_RECVSTATE_OPEN) != 1){

-    m->initstate = 1;

-    m->mdata.head.nstate = MAKUO_SENDSTATE_CLOSE;

+    m->sendwait  = 1;

+    ack_clear(m, MAKUO_RECVSTATE_UPDATE);

   }else{

     if(S_ISLNK(m->fs.st_mode)){

       m->initstate = 1;

@@ -461,6 +461,16 @@ static void msend_req_send_close(int s, mfile *m)

     msend_packet(s, &(m->mdata), &(m->addr));

     return;

   }

+  if(ack_check(m, MAKUO_RECVSTATE_OPEN) == 1){

+    m->sendwait  = 1;

+    ack_clear(m, MAKUO_RECVSTATE_OPEN);

+    return;

+  }

+  if(ack_check(m, MAKUO_RECVSTATE_UPDATE) == 1){

+    m->sendwait  = 1;

+    ack_clear(m, MAKUO_RECVSTATE_UPDATE);

+    return;

+  }

   lprintf(9,"%s: %s\n", __func__, m->fn);

   m->mdata.head.nstate = MAKUO_SENDSTATE_LAST;

 }