@@ -1,11 +1,15 @@

 1.1.4:

+

  - log format change. add "[error]" for error log

  - latency improvement.

  - fix: terminate process when file close error.

 1.1.3:

  - sort msync --members by hostname

@@ -1,5 +1,5 @@

 bin_PROGRAMS = msync

 sbin_PROGRAMS = makuosan

-makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c makuosan.h

+makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c xprint.c makuosan.h

 msync_SOURCES = msync.c 

 EXTRA_DIST = support

@@ -1,8 +1,8 @@

-# Makefile.in generated by automake 1.10 from Makefile.am.

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.

+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -52,7 +52,7 @@ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)

 am_makuosan_OBJECTS = makuosan.$(OBJEXT) common.$(OBJEXT) \

 	mexec.$(OBJEXT) minit.$(OBJEXT) mexit.$(OBJEXT) \

-	mrecv.$(OBJEXT) msend.$(OBJEXT)

+	mrecv.$(OBJEXT) msend.$(OBJEXT) xprint.$(OBJEXT)

 makuosan_OBJECTS = $(am_makuosan_OBJECTS)

 makuosan_LDADD = $(LDADD)

 am_msync_OBJECTS = msync.$(OBJEXT)

@@ -165,7 +165,7 @@ sysconfdir = @sysconfdir@

 target_alias = @target_alias@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c makuosan.h

+makuosan_SOURCES = makuosan.c common.c mexec.c minit.c mexit.c mrecv.c msend.c xprint.c makuosan.h

 msync_SOURCES = msync.c 

 EXTRA_DIST = support

 all: config.h

@@ -290,6 +290,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mrecv.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msend.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msync.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xprint.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -310,8 +311,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	mkid -fID $$unique

 tags: TAGS

@@ -323,8 +324,8 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

 	  test -n "$$unique" || unique=$$empty_fix; \

 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

@@ -334,13 +335,12 @@ ctags: CTAGS

 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

 		$(TAGS_FILES) $(LISP)

 	tags=; \

-	here=`pwd`; \

 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \

 	unique=`for i in $$list; do \

 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

 	  done | \

-	  $(AWK) '    { files[$$0] = 1; } \

-	       END { for (i in files) print i; }'`; \

+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

+	      END { if (nonempty) { for (i in files) print i; }; }'`; \

 	test -z "$(CTAGS_ARGS)$$tags$$unique" \

 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

 	     $$tags $$unique

@@ -394,6 +394,10 @@ dist-bzip2: distdir

 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2

 	$(am__remove_distdir)

+dist-lzma: distdir

+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

+	$(am__remove_distdir)

+

 dist-tarZ: distdir

 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

 	$(am__remove_distdir)

@@ -420,6 +424,8 @@ distcheck: dist

 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

 	*.tar.bz2*) \

 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

+	*.tar.lzma*) \

+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

 	*.tar.Z*) \

 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

 	*.shar.gz*) \

@@ -574,11 +580,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-sbinPROGRAMS

 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \

 	clean-binPROGRAMS clean-generic clean-sbinPROGRAMS ctags dist \

-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \

-	distcheck distclean distclean-compile distclean-generic \

-	distclean-hdr distclean-tags distcleancheck distdir \

-	distuninstallcheck dvi dvi-am html html-am info info-am \

-	install install-am install-binPROGRAMS install-data \

+	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \

+	dist-zip distcheck distclean distclean-compile \

+	distclean-generic distclean-hdr distclean-tags distcleancheck \

+	distdir distuninstallcheck dvi dvi-am html html-am info \

+	info-am install install-am install-binPROGRAMS install-data \

 	install-data-am install-dvi install-dvi-am install-exec \

 	install-exec-am install-html install-html-am install-info \

 	install-info-am install-man install-pdf install-pdf-am \

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

-# generated automatically by aclocal 1.10 -*- Autoconf -*-

+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-# 2005, 2006  Free Software Foundation, Inc.

+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -11,12 +11,15 @@

 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A

 # PARTICULAR PURPOSE.

-m4_if(m4_PACKAGE_VERSION, [2.61],,

-[m4_fatal([this file was generated for autoconf 2.61.

-You have another version of autoconf.  If you want to use that,

-you should regenerate the build system entirely.], [63])])

+m4_ifndef([AC_AUTOCONF_VERSION],

+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

+m4_if(AC_AUTOCONF_VERSION, [2.61],,

+[m4_warning([this file was generated for autoconf 2.61.

+You have another version of autoconf.  It may work, but is not guaranteed to.

+If you have problems, you may need to regenerate the build system entirely.

+To do so, use the procedure documented by the package, typically `autoreconf'.])])

-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.

+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

@@ -31,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],

 [am__api_version='1.10'

 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

 dnl require some minimum version.  Point them to the right macro.

-m4_if([$1], [1.10], [],

+m4_if([$1], [1.10.1], [],

       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

 ])

@@ -47,8 +50,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])

 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.10])dnl

-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

+[AM_AUTOMAKE_VERSION([1.10.1])dnl

+m4_ifndef([AC_AUTOCONF_VERSION],

+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

@@ -320,7 +325,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

   # each Makefile.in and add a new line on top of each file to say so.

   # Grep'ing the whole file is not good either: AIX grep has a line

   # limit of 2048, but all sed's we know have understand at least 4000.

-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

     dirpart=`AS_DIRNAME("$mf")`

   else

     continue

@@ -368,13 +373,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],

 # Do all the work for Automake.                             -*- Autoconf -*-

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-# 2005, 2006 Free Software Foundation, Inc.

+# 2005, 2006, 2008 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

-# serial 12

+# serial 13

 # This macro actually does too much.  Some checks are only needed if

 # your package does certain things.  But this isn't really a big deal.

@@ -479,16 +484,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],

 # our stamp files there.

 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],

 [# Compute $1's index in $config_headers.

+_am_arg=$1

 _am_stamp_count=1

 for _am_header in $config_headers :; do

   case $_am_header in

-    $1 | $1:* )

+    $_am_arg | $_am_arg:* )

       break ;;

     * )

       _am_stamp_count=`expr $_am_stamp_count + 1` ;;

   esac

 done

-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.

 #

@@ -760,7 +766,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])

 # _AM_SUBST_NOTMAKE(VARIABLE)

 # ---------------------------

-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.

+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

 # This macro is traced by Automake.

 AC_DEFUN([_AM_SUBST_NOTMAKE])

@@ -12,133 +12,6 @@ int loop_flag   = 1;

 struct timeval curtime;

 BF_KEY EncKey;

-char *opcodestrlist[]={"PING ",

-                       "EXIT ",

-                       "SEND ",

-                       "MD5  ",

-                       "DSYNC",

-                       "DEL  ",

-                       "UNKNOWN"};

-

-uint8_t opcodenumlist[]={MAKUO_OP_PING,

-                         MAKUO_OP_EXIT,

-                         MAKUO_OP_SEND,

-                         MAKUO_OP_MD5,

-                         MAKUO_OP_DSYNC,

-                         MAKUO_OP_DEL,

-                         MAKUO_OPCODE_MAX};

-

-char *sstatestrlist[]={"SEND_STAT   ",

-                       "SEND_OPEN   ",

-                       "SEND_DATA   ",

-                       "SEND_MARK   ",

-                       "SEND_CLOSE  ",

-                       "SEND_LAST   ",

-                       "SEND_ERROR  ",

-                       "SEND_BREAK  ",

-                       "SEND_UNKNOWN"};

-

-uint8_t sstatenumlist[]={MAKUO_SENDSTATE_STAT,

-                         MAKUO_SENDSTATE_OPEN,

-                         MAKUO_SENDSTATE_DATA,

-                         MAKUO_SENDSTATE_MARK,

-                         MAKUO_SENDSTATE_CLOSE,

-                         MAKUO_SENDSTATE_LAST,

-                         MAKUO_SENDSTATE_ERROR,

-                         MAKUO_SENDSTATE_BREAK,

-                         MAKUO_STATE_MAX};

-

-char *rstatestrlist[] = {"RECV_NONE    ",

-                         "RECV_UPDATE  ",

-                         "RECV_SKIP    ",

-                         "RECV_OPEN    ",

-                         "RECV_MARK    ",

-                         "RECV_CLOSE   ",

-                         "RECV_IGNORE  ",

-                         "RECV_READONLY",

-                         "RECV_BREAK   ",

-                         "RECV_LAST    ",

-                         "RECV_MD5OK   ",

-                         "RECV_MD5NG   ",

-                         "RECV_DELETEOK",

-                         "RECV_DELETENG",

-                         "RECV_OPENERR ",

-                         "RECV_READERR ", 

-                         "RECV_WRITEERR", 

-                         "RECV_CLOSEERR", 

-                         "RECV_UNKNOWN"};

-

-uint8_t rstatenumlist[]={MAKUO_RECVSTATE_NONE,

-                         MAKUO_RECVSTATE_UPDATE,

-                         MAKUO_RECVSTATE_SKIP,

-                         MAKUO_RECVSTATE_OPEN,

-                         MAKUO_RECVSTATE_MARK,

-                         MAKUO_RECVSTATE_CLOSE,

-                         MAKUO_RECVSTATE_IGNORE,

-                         MAKUO_RECVSTATE_READONLY,

-                         MAKUO_RECVSTATE_BREAK,

-                         MAKUO_RECVSTATE_LAST,

-                         MAKUO_RECVSTATE_MD5OK,

-                         MAKUO_RECVSTATE_MD5NG,

-                         MAKUO_RECVSTATE_DELETEOK,

-                         MAKUO_RECVSTATE_DELETENG,

-                         MAKUO_RECVSTATE_OPENERROR,

-                         MAKUO_RECVSTATE_READERROR,

-                         MAKUO_RECVSTATE_WRITEERROR,

-                         MAKUO_RECVSTATE_CLOSEERROR,

-                         MAKUO_STATE_MAX};

-

-char *strsstate(uint8_t n)

-{

-  int i;

-  for(i=0;sstatenumlist[i] != MAKUO_STATE_MAX;i++){

-    if(sstatenumlist[i] == n){

-      break;

-    }

-  }

-  return(sstatestrlist[i]);

-}

-

-char *strrstate(uint8_t n)

-{

-  int i;

-  for(i=0;rstatenumlist[i] != MAKUO_STATE_MAX;i++){

-    if(rstatenumlist[i] == n){

-      break;

-    }

-  }

-  return(rstatestrlist[i]);

-}

-

-char *strmstate(mdata *data)

-{

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

-    return(strrstate(data->head.nstate));

-  }

-  return(strsstate(data->head.nstate));

-}

-

-char *stropcode(mdata *data)

-{

-  int i;

-  for(i=0;opcodenumlist[i] != MAKUO_STATE_MAX;i++){

-    if(opcodenumlist[i] == data->head.opcode){

-      break;

-    }

-  }

-  return(opcodestrlist[i]);

-}

-

-char *strackreq(mdata *data)

-{

-  char *ack = "ack";

-  char *req = "req";

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

-    return(ack);

-  }

-  return(req);

-}

-

 int md5sum(int fd, unsigned char *digest)

 {

   int  rd;

@@ -235,70 +108,6 @@ int isexclude(char *fn, excludeitem *exclude, int dir)

   return(0);

 }

-void fdprintf(int s, char *fmt, ...)

-{

-  char m[2048];

-  va_list arg;

-  if(s != -1){

-    va_start(arg, fmt);

-    vsnprintf(m, sizeof(m), fmt, arg);

-    va_end(arg);

-    m[sizeof(m) - 1] = 0;

-    write(s, m, strlen(m));

-  }

-}

-

-void lprintf(int l, char *fmt, ...)

-{

-  va_list arg;

-  struct timeval tv;

-  char m[2048];

-  if(moption.loglevel >= l){

-    va_start(arg, fmt);

-    vsnprintf(m, sizeof(m), fmt, arg);

-    va_end(arg);

-    m[sizeof(m) - 1] = 0;

-#ifdef MAKUO_DEBUG

-    gettimeofday(&tv, NULL);

-    fprintf(stderr, "%02d.%06d %s", tv.tv_sec % 60, tv.tv_usec, m);

-#else

-    fprintf(stderr, "%s", m);

-#endif

-    syslog(LOG_ERR, "%s: %s", moption.user_name, m);

-  }

-}

-

-void cprintf(int l, mcomm *c, char *fmt, ...)

-{

-  char m[2048];

-  va_list arg;

-  if(!c)

-    return;

-  if(c->fd[0] == -1)

-    return;

-  if(c->loglevel >= l){

-    va_start(arg, fmt);

-    vsnprintf(m, sizeof(m), fmt, arg);

-    va_end(arg);

-    m[sizeof(m) - 1] = 0;

-    write(c->fd[0], m, strlen(m));

-    fsync(c->fd[0]);

-  }

-}

-

-void mprintf(const char *func, mfile *m)

-{

-  lprintf(9, "%s: rid=%d init=%d wait=%d %s %s %s %s\n",

-    func, 

-    m->mdata.head.reqid, 

-    m->initstate, 

-    m->sendwait, 

-    inet_ntoa(m->addr.sin_addr), 

-    stropcode(&(m->mdata)),

-    strmstate(&(m->mdata)),

-    m->fn);

-}

-

 uint32_t getrid()

 {

   static uint32_t rid=0;

@@ -478,15 +287,32 @@ void member_del(mhost *t)

 void member_del_message(mhost *t, char *mess)

 {

   int i;

+  mfile *m;

+

   if(!t || !mess){

     return;

   }

+  for(i=0;i<MAKUO_HOSTSTATE_SIZE;i++){

+    if(m = t->mflist[i]){

+      if(m->comm){

+        if(m->comm->working){

+          cprintf(0, m->comm, "error: %s: %s\n", mess, m->cmdline);

+          lprintf(0, "[error] %s: %s: ST=%s RC=%02d: %s\n", 

+            __func__, 

+            mess, 

+            strmstate(&(m->mdata)),

+            m->retrycnt,

+            m->cmdline);

+        }

+      }

+    }

+  }

   for(i=0;i<MAX_COMM;i++){

     if(moption.comm[i].working){

-      cprintf(0, &(moption.comm[i]), "error: %s %s(%s)\n", 

-        mess, inet_ntoa(t->ad), t->hostname);

+      cprintf(0, &(moption.comm[i]), "error: %s: %s(%s)\n", mess, inet_ntoa(t->ad), t->hostname);

     }

   }

+  lprintf(0, "[error] %s: %s: %s(%s)\n", __func__, mess, inet_ntoa(t->ad), t->hostname);

 }

 mmark *markalloc()

@@ -9786,21 +9786,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}

   fi

   rm -f "$tmp/out12"

 # Compute $ac_file's index in $config_headers.

+_am_arg=$ac_file

 _am_stamp_count=1

 for _am_header in $config_headers :; do

   case $_am_header in

-    $ac_file | $ac_file:* )

+    $_am_arg | $_am_arg:* )

       break ;;

     * )

       _am_stamp_count=`expr $_am_stamp_count + 1` ;;

   esac

 done

-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||

-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

-	 X$ac_file : 'X\(//\)[^/]' \| \

-	 X$ac_file : 'X\(//\)$' \| \

-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||

-echo X$ac_file |

+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||

+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

+	 X"$_am_arg" : 'X\(//\)[^/]' \| \

+	 X"$_am_arg" : 'X\(//\)$' \| \

+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||

+echo X"$_am_arg" |

     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{

 	    s//\1/

 	    q

@@ -9863,7 +9864,7 @@ echo "$as_me: executing $ac_file commands" >&6;}

   # each Makefile.in and add a new line on top of each file to say so.

   # Grep'ing the whole file is not good either: AIX grep has a line

   # limit of 2048, but all sed's we know have understand at least 4000.

-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

     dirpart=`$as_dirname -- "$mf" ||

 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

 	 X"$mf" : 'X\(//\)[^/]' \| \

@@ -11,18 +11,17 @@ void recv_timeout(mfile *m)

   if(!m){

     return;

   }

-  m->retrycnt = MAKUO_SEND_RETRYCNT;

   do{

     for(t=members;t;t=t->next){

       r = get_hoststate(t, m);

       if(*r == MAKUO_RECVSTATE_NONE){

-        lprintf(0, "[error] %s: %s(%s) > %s\n", __func__, inet_ntoa(t->ad), t->hostname, m->cmdline);

         member_del_message(t, "receive time out");

         member_del(t);

         break;

       }

     }

   }while(t); 

+  m->retrycnt = MAKUO_SEND_RETRYCNT;

 }

 struct timeval *pingpong(int n)

@@ -55,7 +55,7 @@

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

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

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

+#define MAKUO_SEND_RETRYCNT 60     /* 再送回数                                     */

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

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

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

@@ -138,12 +138,12 @@ int mexec_scan_send(int fd, char *path, char *sendhost, int mode, gid_t gid)

       sprintf(comm, "check %s%s\r\n", buff, path);

       break;

   }

-  mexec_scan_cmd(fd, comm);

-  return(0);

+  return(mexec_scan_cmd(fd, comm));

 }

 int mexec_scan_dir(int fd, char *base, char *sendhost, int mode, mcomm *c, int baseflag, gid_t gid)

 {

+  int r;

   DIR *d;

   struct dirent *dent;

   char path[PATH_MAX];

@@ -154,19 +154,24 @@ int mexec_scan_dir(int fd, char *base, char *sendhost, int mode, mcomm *c, int b

     mexec_scan_echo(fd, "directory open error %s", base);

   }else{

     while(dent=readdir(d)){

-      if(!loop_flag)

-        break;

-      if(!strcmp(dent->d_name, "."))

+      if(!loop_flag){

+        return(1);

+      }

+      if(!strcmp(dent->d_name, ".")){

         continue;

-      if(!strcmp(dent->d_name, ".."))

+      }

+      if(!strcmp(dent->d_name, "..")){

         continue;

+      }

       if(baseflag){

         sprintf(path, "%s/%s", base, dent->d_name);

       }else{

         strcpy(path, dent->d_name);

       }

       space_escape(path);

-      mexec_scan_child(fd, path, sendhost, mode, c, gid);

+      if(r = mexec_scan_child(fd, path, sendhost, mode, c, gid)){

+        return(r);

+      }

     }

     closedir(d);

   }

@@ -175,25 +180,29 @@ int mexec_scan_dir(int fd, char *base, char *sendhost, int mode, mcomm *c, int b

 int mexec_scan_child(int fd, char *base, char *sendhost, int mode, mcomm *c, gid_t gid)

 {

+  int r;

   char path[PATH_MAX];

   if(*base == 0){

     getcwd(path, PATH_MAX);

-    mexec_scan_dir(fd, path, sendhost, mode, c, 0, gid);

-  }else{

-    /*----- exclude -----*/

-    sprintf(path, "%s/%s", moption.real_dir, base);

-    if(!mfnmatch(path, c->exclude)){

-      if(!is_dir(base)){

-        mexec_scan_send(fd, base, sendhost, mode, gid);

-      }else{

-        /*----- exclude dir -----*/

-        strcat(path, "/");

-        if(mfnmatch(path, c->exclude))

-          return(0);

-        mexec_scan_dir(fd, base, sendhost, mode, c, 1, gid);

-        if(loop_flag && (mode != MAKUO_MEXEC_MD5)){

-          mexec_scan_send(fd, base, sendhost, mode, gid);

-        }

+    return(mexec_scan_dir(fd, path, sendhost, mode, c, 0, gid));

+  }

+  /*----- exclude -----*/

+  sprintf(path, "%s/%s", moption.real_dir, base);

+  if(!mfnmatch(path, c->exclude)){

+    if(!is_dir(base)){

+      return(mexec_scan_send(fd, base, sendhost, mode, gid));

+    }else{

+      /*----- exclude dir -----*/

+      strcat(path, "/");

+      if(mfnmatch(path, c->exclude)){

+        return(0);

+      }

+      /*----- scan dir -----*/

+      if(r = mexec_scan_dir(fd, base, sendhost, mode, c, 1, gid)){

+        return(r);

+      }

+      if(loop_flag && (mode != MAKUO_MEXEC_MD5)){

+        return(mexec_scan_send(fd, base, sendhost, mode, gid));

       }

     }

   }

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

         }

       }

     }

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

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

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

+      }

+    }

     return;

   }

@@ -824,7 +829,7 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)

   }

   /* create object */

-  if(!(m = mfadd(1))){

+  if(!(m = mfadd(MFRECV))){

     return(NULL);

   }

@@ -1170,6 +1175,19 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr

   }  

 }

+static void mrecv_req_dsync_close(mfile *m, mdata *data, struct sockaddr_in *addr)

+{

+  if(!m){

+    mkack(data, addr, MAKUO_RECVSTATE_CLOSE);

+    return;

+  }

+  if(m->link){

+    mkack(data, addr, MAKUO_RECVSTATE_OPEN);

+  }else{

+    mkack(data, addr, MAKUO_RECVSTATE_CLOSE);

+  }

+}

+

 static void mrecv_req_dsync_last(mfile *m, mdata *data, struct sockaddr_in *addr)

 {

   if(!m){

@@ -1207,6 +1225,9 @@ static void mrecv_req_dsync(mdata *data, struct sockaddr_in *addr)

     case MAKUO_SENDSTATE_DATA:

       mrecv_req_dsync_data(m, data, addr);

       break;

+    case MAKUO_SENDSTATE_CLOSE:

+      mrecv_req_dsync_close(m, data, addr);

+      break;

     case MAKUO_SENDSTATE_LAST:

       mrecv_req_dsync_last(m, data, addr);

       break;

@@ -144,6 +144,7 @@ static int msend_retry(mfile *m)

     m->retrycnt = MAKUO_SEND_RETRYCNT;

     return(0);

   }

+  /*

   if(m->mdata.head.opcode == MAKUO_OP_DSYNC){

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

       m->retrycnt--;

@@ -155,6 +156,7 @@ static int msend_retry(mfile *m)

       }

     }

   }

+  */

   lprintf(2, "%s: send retry count=%02d rid=%06d op=%s state=%s %s\n", 

     __func__,

     m->retrycnt, 

@@ -817,12 +819,19 @@ static void msend_req_dsync_close(int s, mfile *m)

     m->sendwait  = 1;

     m->initstate = 0;

     ack_clear(m, MAKUO_RECVSTATE_OPEN);

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

     return;

   }

   if(m->sendwait){

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

     return;

   }

-  msend_mfdel(m);

+  if(!ack_check(m, MAKUO_RECVSTATE_OPEN)){

+    msend_mfdel(m);

+  }else{

+    m->sendwait  = 0;

+    m->initstate = 1;

+  }

 }

 static void msend_req_dsync_break(int s, mfile *m)

@@ -871,35 +880,6 @@ static void msend_req_dsync(int s, mfile *m)

   }

 }

-static void msend_req_del_mark(int s, mfile *m)

-{

-  mfile *d = m->link; /* dsync object */

-

-  if(!d){

-    m->sendwait = 0;

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

-  }else{

-    if(m->initstate){

-      m->initstate = 0;

-      m->sendwait  = 1;

-      ack_clear(m, -1);

-      if(member_get(&(d->addr.sin_addr))){

-        mkack(&(d->mdata), &(d->addr), MAKUO_RECVSTATE_CLOSE);

-      }else{

-        d->lastrecv.tv_sec = 1;

-      }

-      return;

-    }

-    if(m->sendwait){

-      if(member_get(&(d->addr.sin_addr))){

-        mkack(&(d->mdata), &(d->addr), MAKUO_RECVSTATE_CLOSE);

-      }else{

-        d->lastrecv.tv_sec = 1;

-      }

-    }

-  }

-}

-

 static int msend_req_del_stat_read_pathcmp(int s, mfile *m)

 {

   char *p1;

@@ -1006,7 +986,7 @@ static void msend_req_del_stat(int s, mfile *m)

     if(msend_req_del_stat_waitcheck(s, m)){

       m->sendwait = 1;

     }else{

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

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

       m->initstate = 1;

       m->sendwait  = 0;

       ack_clear(m, -1);

@@ -1093,9 +1073,6 @@ static void msend_req_del(int s, mfile *m)

     case MAKUO_SENDSTATE_STAT:

       msend_req_del_stat(s, m);

       break;

-    case MAKUO_SENDSTATE_MARK:

-      msend_req_del_mark(s, m);

-      break;

     case MAKUO_SENDSTATE_LAST:

       msend_req_del_last(s, m);

       break;

new file mode 100644

@@ -0,0 +1,200 @@

+/*

+ * xprint.c

+ * Copyright (C) 2008 KLab Inc.

+ */

+#include "makuosan.h"

+

+char *opcodestrlist[]={"PING ",

+                       "EXIT ",

+                       "SEND ",

+                       "MD5  ",

+                       "DSYNC",

+                       "DEL  ",

+                       "UNKNOWN"};

+

+uint8_t opcodenumlist[]={MAKUO_OP_PING,

+                         MAKUO_OP_EXIT,

+                         MAKUO_OP_SEND,

+                         MAKUO_OP_MD5,

+                         MAKUO_OP_DSYNC,

+                         MAKUO_OP_DEL,

+                         MAKUO_OPCODE_MAX};

+

+char *sstatestrlist[]={"SEND_STAT   ",

+                       "SEND_OPEN   ",

+                       "SEND_DATA   ",

+                       "SEND_MARK   ",

+                       "SEND_CLOSE  ",

+                       "SEND_LAST   ",

+                       "SEND_ERROR  ",

+                       "SEND_BREAK  ",

+                       "SEND_UNKNOWN"};

+

+uint8_t sstatenumlist[]={MAKUO_SENDSTATE_STAT,

+                         MAKUO_SENDSTATE_OPEN,

+                         MAKUO_SENDSTATE_DATA,

+                         MAKUO_SENDSTATE_MARK,

+                         MAKUO_SENDSTATE_CLOSE,

+                         MAKUO_SENDSTATE_LAST,

+                         MAKUO_SENDSTATE_ERROR,

+                         MAKUO_SENDSTATE_BREAK,

+                         MAKUO_STATE_MAX};

+

+char *rstatestrlist[] = {"RECV_NONE    ",

+                         "RECV_UPDATE  ",

+                         "RECV_SKIP    ",

+                         "RECV_OPEN    ",

+                         "RECV_MARK    ",

+                         "RECV_CLOSE   ",

+                         "RECV_IGNORE  ",

+                         "RECV_READONLY",

+                         "RECV_BREAK   ",

+                         "RECV_LAST    ",

+                         "RECV_MD5OK   ",

+                         "RECV_MD5NG   ",

+                         "RECV_DELETEOK",

+                         "RECV_DELETENG",

+                         "RECV_OPENERR ",

+                         "RECV_READERR ", 

+                         "RECV_WRITEERR", 

+                         "RECV_CLOSEERR", 

+                         "RECV_UNKNOWN"};

+

+uint8_t rstatenumlist[]={MAKUO_RECVSTATE_NONE,

+                         MAKUO_RECVSTATE_UPDATE,

+                         MAKUO_RECVSTATE_SKIP,

+                         MAKUO_RECVSTATE_OPEN,

+                         MAKUO_RECVSTATE_MARK,

+                         MAKUO_RECVSTATE_CLOSE,

+                         MAKUO_RECVSTATE_IGNORE,

+                         MAKUO_RECVSTATE_READONLY,

+                         MAKUO_RECVSTATE_BREAK,

+                         MAKUO_RECVSTATE_LAST,

+                         MAKUO_RECVSTATE_MD5OK,

+                         MAKUO_RECVSTATE_MD5NG,

+                         MAKUO_RECVSTATE_DELETEOK,

+                         MAKUO_RECVSTATE_DELETENG,

+                         MAKUO_RECVSTATE_OPENERROR,

+                         MAKUO_RECVSTATE_READERROR,

+                         MAKUO_RECVSTATE_WRITEERROR,

+                         MAKUO_RECVSTATE_CLOSEERROR,

+                         MAKUO_STATE_MAX};

+

+char *strsstate(uint8_t n)

+{

+  int i;

+  for(i=0;sstatenumlist[i] != MAKUO_STATE_MAX;i++){

+    if(sstatenumlist[i] == n){

+      break;

+    }