@@ -1,6 +1,7 @@

 1.3.6:

  - change pong timing at random to avoid burst.

  - fix: fall into an infinite loop when the read error of file has occurred.

+ - fix: memory leak when using the dsync

 1.3.5:

  - fix: log output unnecessary message.

@@ -1,6 +1,7 @@

 1.3.6:

  - マルチキャストパケットのバーストを防ぐためにpongの発行タイミングをランダムにする

  - ファイルのリードエラーが発生したときに無限ループに陥る不具合を解消

+ - dsync中にメモリリークが発生していた不具合を修正

 1.3.5:

  - ログにゴミが出力されることがあった不具合を修正

@@ -979,7 +979,7 @@ int mexec_status(mcomm *c, int n)

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

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

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

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

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

       stropcode(&(m->mdata)), 

       strrstate(m->mdata.head.nstate), 

       t->tm_hour, t->tm_min, t->tm_sec, 

@@ -987,7 +987,8 @@ int mexec_status(mcomm *c, int n)

       m->recvcount,

       m->seqnomax, 

       m->markcount,

-      m->mdata.head.reqid); 

+      m->mdata.head.reqid,

+      inet_ntoa(m->addr.sin_addr)); 

   }

   return(0);

 }

@@ -298,6 +298,11 @@ static void mrecv_ack_del(mdata *data, struct sockaddr_in *addr)

   if(mrecv_ack_search(&t, &m, data, addr)){

     return;

   }

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

+    if(data->head.nstate != MAKUO_RECVSTATE_CLOSE){

+      return;

+    }

+  }

   if(!set_hoststate(t, m, data->head.nstate)){

     lprintf(0, "%s: not allocate state area\n", __func__);

     return;

@@ -319,13 +324,13 @@ static void mrecv_ack_del(mdata *data, struct sockaddr_in *addr)

         err = 0;

         if(m->dryrun){

-          lprintf(1, "%s: (dryrun) delete %s\n", __func__, path);

+          lprintf(1, "%s: (dryrun) delete %s rid=%d\n", __func__, path, m->mdata.head.reqid);

         }else{

           if(!mremove(NULL,path)){

-            lprintf(1, "%s: delete %s\n", __func__, path);

+            lprintf(1, "%s: delete %s rid=%d\n", __func__, path, m->mdata.head.reqid);

           }else{

             err = errno;

-            lprintf(0, "%s: delete error %s (%s)\n", __func__, path, strerror(errno));

+            lprintf(0, "%s: delete error %s (%s) rid=%d\n", __func__, path, strerror(errno), m->mdata.head.reqid);

           }

         }

         data_safeset16(&(m->mdata), len + sizeof(uint32_t));

@@ -1219,6 +1224,8 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

   uint16_t len;

   uint32_t mod;

   mfile *a = mkack(data, addr, MAKUO_RECVSTATE_OPEN);

+  mfile *m = mrecv_req_search(data, addr);

+  mhost *t = member_get(&(addr->sin_addr));

   char path[PATH_MAX];

   if(!a){

@@ -1247,6 +1254,19 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

 #endif

   }

   msend(a);

+

+  if(m){

+    return;

+  }

+  m = mfadd(MFRECV);

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

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

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

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

+  mtimeget(&(m->lastrecv));

+  if(data->head.flags & MAKUO_FLAG_DRYRUN){

+    m->dryrun = 1;

+  }

 }

 static void mrecv_req_del_data_report(mfile *m, mcomm *c, uint32_t err, char *hn, char *path)

@@ -1277,20 +1297,16 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

   char path[PATH_MAX];

   msend(mkack(data, addr, MAKUO_RECVSTATE_OPEN));

-  if(m){

+  if(!m){

+    return;

+  }

+  mtimeget(&(m->lastrecv));

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

     return;

   }

   if(t){

     hn = t->hostname;

   }

-  m = mfadd(MFRECV);

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

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

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

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

-  if(data->head.flags & MAKUO_FLAG_DRYRUN){

-    m->dryrun = 1;

-  }

   for(a=mftop[MFSEND];a;a=a->next){

     if((a->mdata.head.reqid == data->head.seqno) && (a->comm != NULL)){

       c = a->comm;

@@ -1305,6 +1321,8 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

     path[len] =  0;

     mrecv_req_del_data_report(m, c, err, hn, path);

   }

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

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

 }

 static void mrecv_req_del_close(mdata *data, struct sockaddr_in *addr)

@@ -1087,20 +1087,20 @@ static void msend_req_del_stat(int s, mfile *m)

 {

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

     msend_req_del_stat_read(s, m);

+    return;

+  }

+  if(msend_req_del_stat_waitcheck(s, m)){

+    m->sendwait = 1;

+    return;

+  }

+  if(m->link){

+    msend(mkack(&(m->link->mdata), &(m->link->addr), MAKUO_RECVSTATE_CLOSE)); /* send ack for dsync */

+  }

+  if(waitpid(m->pid, NULL, WNOHANG) != m->pid){

+    m->sendwait = 1;

   }else{

-    if(msend_req_del_stat_waitcheck(s, m)){

-      m->sendwait = 1;

-    }else{

-      if(m->link){

-        msend(mkack(&(m->link->mdata), &(m->link->addr), MAKUO_RECVSTATE_CLOSE));

-      }

-      if(waitpid(m->pid, NULL, WNOHANG) != m->pid){

-        m->sendwait = 1;

-      }else{

-        m->pid = 0;

-        msend_mfdel(m);

-      }

-    }

+    m->pid = 0;

+    msend_mfdel(m);

   }

 }

@@ -1110,6 +1110,7 @@ static void msend_req_del_break(int s, mfile *m)

   for(d=mftop[MFSEND];d;d=d->next){

     if(d->link == m){

       if(d->mdata.head.nstate == MAKUO_SENDSTATE_WAIT){

+        d->link = NULL;

         msend_mfdel(d);

         break;

       }