Changeset 1272

Timestamp:

09/18/08 20:36:09 (2 months ago)

Author:

shawnw

Message:

Some chunk tweaks: Favor pread() over lseek() and read(), and same for writing, and increase migration speed (The latter seems to reduce fragmentation significantly faster on M*U*S*H).

Files:

• 1.8.3/branches/devel/config.h.in (modified) (1 diff)
• 1.8.3/branches/devel/configure (modified) (2 diffs)
• 1.8.3/branches/devel/configure.in (modified) (1 diff)
• 1.8.3/branches/devel/src/chunk.c (modified) (8 diffs)

1.8.3/branches/devel/config.h.in

@@ -317 +317 @@
-#endif
-
+#undef HAVE_PREAD
+
+#undef HAVE_PWRITE
+
-/* Variables and defines */
-

1.8.3/branches/devel/configure

@@ -12488 +12488 @@
-
-        if test ! -x "$PG_CONFIG"; then
-            { $as_echo "$as_me:$LINENO: WARNING: $PG_CONFIG does not exist or it is not an exectuable file" >&5
-$as_echo "$as_me: WARNING: $PG_CONFIG does not exist or it is not an exectuable file" >&2;}
-            PG_CONFIG="no"
-            found_postgresql="no"
@@ -15569 +15567 @@
-
-for ac_func in fcntl pselect poll ppoll pollts kqueue epoll_ctl inotify_init
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+     test -z "$ac_c_werror_flag" ||
+     test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+     test "$cross_compiling" = yes ||
+     $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+         $as_echo "$as_val"'`
+           { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+         $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+for ac_func in pread pwrite
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

1.8.3/branches/devel/configure.in

@@ -225 +225 @@
-AC_CHECK_FUNCS([socketpair sigaction sigprocmask valloc writev])
-AC_CHECK_FUNCS([fcntl pselect poll ppoll pollts kqueue epoll_ctl inotify_init])
+AC_CHECK_FUNCS([pread pwrite])
-
-AC_FUNC_SNPRINTF

1.8.3/branches/devel/src/chunk.c

@@ -224 +224 @@
-#include <io.h>
-#else
+#define _XOPEN_SOURCE 500
-#include <unistd.h>
-#endif
@@ -1240 +1241 @@
-  char *pos;
-  size_t remaining;
-in
+ssize_
-
-  debug_log("read_cache_region %04x", region);
-
+#ifndef HAVE_PREAD
-  /* Try to seek up to 3 times... */
-  for (j = 0; j < 3; j++)
@@ -1259 +1261 @@
-    mush_panicf("chunk swap file seek, errno %d: %s", errno, strerror(errno));
-#endif
+#endif /* !HAVE_PREAD */
-  pos = (char *) rhp;
-  remaining = REGION_SIZE;
-  for (j = 0; j < 10; j++) {
-
-
+
+
+
-    if (!ReadFile(fd, pos, remaining, &done, NULL)) {
-      /* nothing */
-    }
-#endif
-#else
-    done = read(fd, pos, remaining);
@@ -1274 +1277 @@
-      remaining -= done;
-      pos += done;
+      file_offset += done;
-      if (!remaining)
-        return;
-    }
-#ifndef WIN32
-    if (done == -1 && errno == EAGAIN)
-      sleep(0);
-#endif
-  }
-#ifdef WIN32
@@ -1302 +1302 @@
-  int j;
-  char *pos;
-
-in
+ 
+ssize_
-
-  debug_log("write_cache_region %04x", region);
-
+#ifndef HAVE_PWRITE
-  /* Try to seek up to 3 times... */
-  for (j = 0; j < 3; j++)
@@ -1322 +1323 @@
-    mush_panicf("chunk swap file seek, errno %d: %s", errno, strerror(errno));
-#endif
+#endif /* !HAVE_PWRITE */
-  pos = (char *) rhp;
-  remaining = REGION_SIZE;
+
+  /* SW: I'm not sure why Talek has this loop so many times -- the
+     only recoverable way the writes should fail is if they're
+     interrupted by a signal and can't be restarted for some
+     reason. */
-  for (j = 0; j < 10; j++) {
-
-
+
+
+
+
-    if (!WriteFile(fd, pos, remaining, &done, NULL)) {
-      /* nothing */
@@ -1333 +1342 @@
-    done = write(fd, pos, remaining);
-#endif
-#else
-    done = write(fd, pos, remaining);
-#endif
-    if (done >= 0) {
-      remaining -= done;
-      pos += done;
+      file_offset += done;
-      if (!remaining)
-        return;
-    }
-
-
-
-
-
+
+
-#ifdef WIN32
-  mush_panicf("chunk swap file write, %lu remaining, GetLastError %d",
@@ -1353 +1357 @@
-  mush_panicf("chunk swap file write, %lu remaining, errno %d: %s",
-              (unsigned long) remaining, errno, strerror(errno));
-#endif
-}
-