Changeset 942

Timestamp:

06/14/07 21:07:09 (1 year ago)

Author:

shawnw

Message:

expr: Try mmap'ing help indexes to disk files

Files:

• 1.8.3/branches/experimental/config.h.in (modified) (2 diffs)
• 1.8.3/branches/experimental/configure (modified) (6 diffs)
• 1.8.3/branches/experimental/configure.in (modified) (3 diffs)
• 1.8.3/branches/experimental/game/restart (modified) (1 diff)
• 1.8.3/branches/experimental/hdrs/game.h (modified) (1 diff)
• 1.8.3/branches/experimental/hdrs/help.h (modified) (1 diff)
• 1.8.3/branches/experimental/src/command.c (modified) (1 diff)
• 1.8.3/branches/experimental/src/csrimalloc.c (modified) (2 diffs)
• 1.8.3/branches/experimental/src/help.c (modified) (11 diffs)
• 1.8.3/branches/experimental/src/htmltab.c (modified) (2 diffs)
• 1.8.3/branches/experimental/src/lmath.c (modified) (4 diffs)
• 1.8.3/branches/experimental/src/wiz.c (modified) (2 diffs)

1.8.3/branches/experimental/config.h.in

@@ -33 +33 @@
-#undef I_SYS_IN
-
-I_SYS_MMAN
+HAVE_SYS_MMAN_H
-
-#undef I_SYS_PAGE
@@ -273 +273 @@
-#undef HAVE_KQUEUE
-
+#undef HAVE_MMAP
+
+#undef HAVE_POSIX_MADVISE
+
+#undef HAVE_MADVISE
+
+#undef HAVE_PWRITE
+
-/* Variables and defines */
-

1.8.3/branches/experimental/configure

@@ -6854 +6854 @@
-
-
-if test "${ac_cv_header_sys_mman_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for sys/mman.h" >&5
-echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_mman_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/mman.h usability" >&5
-echo $ECHO_N "checking sys/mman.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/mman.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-     { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/mman.h presence" >&5
-echo $ECHO_N "checking sys/mman.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/mman.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/mman.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/mman.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/mman.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/mman.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/mman.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/mman.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/mman.h" >&5
-echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_mman_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sys_mman_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_mman_h = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define I_SYS_MMAN 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_page_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for sys/page.h" >&5
@@ -7800 +7643 @@
-
-
-
+
+
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -16244 +16088 @@
-
-
-
+
+
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -16353 +16198 @@
-done
-
+
+
+
+for ac_func in snprintf vsnprintf
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+           { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
-{ echo "$as_me:$LINENO: checking for working snprintf" >&5
-echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6; }
@@ -17976 +17933 @@
-ac_config_files="$ac_config_files Makefile src/Makefile"
-
-
+
+
+
-
-cat >confcache <<\_ACEOF
@@ -19068 +19027 @@
-
-  case $ac_file$ac_mode in
-game/txt/compose.sh 
-utils/mkcmds.sh 
+
+
-
-  esac

1.8.3/branches/experimental/configure.in

@@ -99 +99 @@
-AC_CHECK_HEADER(sys/file.h, [AC_DEFINE(I_SYS_FILE)])
-AC_CHECK_HEADER(sys/in.h, [AC_DEFINE(I_SYS_IN)])
-AC_CHECK_HEADER(sys/mman.h, [AC_DEFINE(I_SYS_MMAN)])
-AC_CHECK_HEADER(sys/page.h, [AC_DEFINE(I_SYS_PAGE)])
-AC_CHECK_HEADER(sys/param.h, [AC_DEFINE(I_SYS_PARAM)])
@@ -105 +104 @@
-AC_CHECK_HEADER(sys/stat.h, [AC_DEFINE(I_SYS_STAT)])
-AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(I_SYS_TYPES)])
-
+mman.h sys/
-
-### C language support
@@ -182 +181 @@
-AC_CHECK_FUNCS([cbrt getuid geteuid seteuid getpriority setpriority socketpair])
-AC_CHECK_FUNCS([sigaction sigprocmask imaxdiv kqueue])
+AC_CHECK_FUNCS([mmap madvise posix_madvise pwrite])
-
-AC_FUNC_SNPRINTF

1.8.3/branches/experimental/game/restart

@@ -115 +115 @@
-mv -f log/*.log save/
-
+# And delete old mmap files
+rm -f data/*.map 
+
-if [ -r "data/$OUTDB$SUFFIX" ]; then
-   rm -f save/$INDB$SUFFIX.old

1.8.3/branches/experimental/hdrs/game.h

@@ -14 +14 @@
-
-/* hash table stuff */
-   
-    
- 
-   
-   
-  
+    
+     
+      
+    
+        
+       
-
-/* From bsd.c */

1.8.3/branches/experimental/hdrs/help.h

@@ -24 +24 @@
-  int admin;            /**< Is this an admin-only help command? */
-  help_indx *indx;      /**< An array of help index entries */
+  int index_fd;         /**< File descripted of a mmaped index */
-  size_t entries;       /**< Number of entries in the help file */
-} help_file;
-
-
-extern 
-
-  (const char *command_name, const char *filename, int admin
-extern void help_reindex(dbref player
+
+
+void help_reindex(dbref player
+void free_help_indexes(void
-#endif                          /* __HELP_H */

1.8.3/branches/experimental/src/command.c

@@ -504 +504 @@
-  ptab_start_inserts(&ptab_command);
-  ptab_insert(&ptab_command, name,
-    
+
-  ptab_end_inserts(&ptab_command);
-  return command_find(name);

1.8.3/branches/experimental/src/csrimalloc.c

@@ -11 +11 @@
-#include <sys/file.h>
-#endif
-I_SYS_MMAN
+HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
@@ -970 +970 @@
-#ifdef CSRI_TRACE
-/* Tracing malloc definitions - helps find leaks */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-univptr_t
-  trace__ecalloc _((size_t nelem, size_t sz, const char *fname, int linenum));
+univptr_t trace__erealloc
+_((univptr_t ptr, size_t nbytes, const char *fname, int linenum));
+    char *trace__strdup _((const char *s, const char *fname, int linenum));
+    char *trace__strsave _((const char *s, const char *fname, int linenum));
+    void
+     trace__free _((univptr_t cp, const char *fname, int linenum));
+    void
+     trace__cfree _((univptr_t cp, const char *fname, int linenum));
+#else                           /* CSRI_TRACE */
-    univptr_t
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    void
-trace__fre
-univptr_t cp, const char *fname, int linenum
+__m_prnod
+SPBLK * spblk
-    void
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-#ifdef CSRI_DEBUG
-    void
-
+
+
-    int
-
+
+
-#endif
-    void
-
+
+
-    void
-
+
+
-    void
-
+
+
-    void
-
+
+
-    void
-
+
+
-#ifdef CSRI_PROFILESIZES
-    void
-
+
+
-#endif
-    void
-
+
+
-    void
-
+
+
-
-#ifdef CSRI_TRACE

1.8.3/branches/experimental/src/help.c

@@ -11 +11 @@
-#include <ctype.h>
-#include <stdio.h>
+#ifdef I_SYS_TYPES
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+#ifdef I_FCNTL
+#include <fcntl.h>
+#endif
+#ifdef I_UNISTD
+#include <unistd.h>
+#endif
-#include "conf.h"
-#include "externs.h"
@@ -140 +152 @@
-  help_file *curr;
-
-
-
+
+
+
+
+
+
+
+
-    if (curr->indx) {
-(Malloc_t) 
+
-      curr->entries = 0;
-    }
@@ -301 +319 @@
-    nextptr = cur->next;
-    if (num_topics >= top_topics) {
-
-
-
-
-
-
-
-
+
+
-    }
-    temp = &topics[num_topics++];
-    temp->pos = p;
-    strcpy(temp->topic, cur->topic);
-free(cur
+mush_free(cur, "tlist"
-  }
-  top = NULL;
@@ -341 +353 @@
-  FILE *rfp;
-  tlist *cur;
+  size_t index_size = 0;
-
-  /* Quietly ignore null values for the file */
@@ -363 +376 @@
-  in_topic = 0;
-
+  /* Go through and count the topics so we know how much space to allocate.
+   * Print out warning messages here too. */
-  while (fgets(line, LINE_SIZE, rfp) != NULL) {
-    ++lineno;
-ntopics == 0
+!in_topic
-      /* Looking for the first topic, but we'll ignore blank lines */
-      if (!line[0]) {
@@ -388 +403 @@
-    }
-    if (line[0] == '&') {
+      unsigned char *c = (unsigned char *) line + 1;
+      in_topic = true;
+      while (*c && isspace(*c))
+        c++;
+      if (*c == '&' && restricted)
+        ++ntopics;
+      else if (*c != '&' && !restricted)
+        ++ntopics;
+    }
+  }
+
+  topics = NULL;
+  index_size = (ntopics + 1) * sizeof(help_indx);
+
+#ifdef HAVE_MMAP
+  do {
+    uint8_t x;
+
+    /* First we have to create a new file and make it large enough
+       to hold the index. Do this by seeking to the end and writing 
+       a byte to make a sparse file. */
+
+    h->index_fd = open(tprintf("%s/help_%s.%d.map", "data", h->command,
+                               getpid()), O_RDWR | O_CREAT | O_TRUNC, 0600);
+    if (h->index_fd < 0) {
+      perror("opening index file for mapping");
+      h->indx = topics;
+      break;
+    }
+
+    x = '\xFF';
+
+#ifdef HAVE_PWRITE
+    if (pwrite(h->index_fd, &x, 1, index_size + 1) < 0) {
+      perror("pwrite: writing byte at end of index file");
+      close(h->index_fd);
+      h->index_fd = -1;
+      h->indx = topics;
+      break;
+    }
+#else
+    if (lseek(h->index_fd, index_size + 1, SEEK_SET) < 0) {
+      perror("seeking to end of index file");
+      close(h->index_fd);
+      h->index_fd = -1;
+      h->indx = topics;
+      break;
+    }
+
+    x = '\xFF';
+    if (write(h->index_fd, &x, 1) < 0) {
+      perror("write: writing byte at end of index file");
+      close(h->index_fd);
+      h->index_fd = -1;
+      h->indx = topics;
+      break;
+    }
+    lseek(h->index_fd, 0, SEEK_SET);
+#endif
+
+    h->indx = mmap(NULL, index_size, PROT_READ | PROT_WRITE,
+                   MAP_FILE | MAP_SHARED, h->index_fd, 0);
+
+    if ((caddr_t) h->indx == (caddr_t) - 1) {
+      perror("mapping file");
+      close(h->index_fd);
+      h->index_fd = -1;
+      h->indx = topics;
+      break;
+    }
+
+    close(h->index_fd);
+    topics = h->indx;
+    add_check("help_index");
+  } while (0);
+#endif                          /* MMAP */
+  if (!topics) {
+    h->indx = topics = calloc(ntopics + 1, sizeof(help_indx));
+    add_check("help_index");
+  }
+#ifdef HAVE_POSIX_MADVISE
+  if (posix_madvise(h->indx, index_size, POSIX_MADV_SEQUENTIAL) < 0)
+    perror("posix_madvise(POSIX_MADV_SEQUENTIAL");
+#elif defined(HAVE_MADVISE)
+  if (madvise(h->indx, index_size, MADV_SEQUENTIAL) < 0)
+    perror("madvise(MADV_SEQUENTIAL");
+#endif
+
+  top_topics = ntopics + 1;
+
+  /* Rewind */
+  fseek(rfp, 0, SEEK_SET);
+  ntopics = 0;
+  lineno = 0;
+
+  while (fgets(line, LINE_SIZE, rfp) != NULL) {
+    ++lineno;
+
+    /* Skip leading lines without a & */
+    if (ntopics == 0 && line[0] != '&')
+      continue;
+
+    n = strlen(line);
+
+    if (line[0] == '&') {
-      ++ntopics;
-      if (!in_topic) {
@@ -396 +516 @@
-        in_topic = true;
-      }
+
-      /* parse out the topic */
-      /* Get the beginning of the topic string */
@@ -402 +523 @@
-
-      /* Get the topic */
-strcpy(the_topic, "")
+the_topic[0] = '\0'
-      for (i = -1, s = topic; *s != '\n' && *s != '\0'; s++) {
-        if (i >= TOPIC_NAME_LEN - 1)
@@ -412 +533 @@
-          || (!restricted && the_topic[0] != '&')) {
-        the_topic[++i] = '\0';
-(tlist *) malloc(sizeof(tlist)
+mush_malloc(sizeof(tlist), "tlist"
-        strcpy(cur->topic, the_topic);
-        cur->next = top;
@@ -425 +546 @@
-    bigpos = ftell(rfp);
-  }
-
-  /* Handle last topic */
-  write_topic(pos);
+#ifdef HAVE_POSIX_MADVISE
+  if (posix_madvise(h->indx, index_size, POSIX_MADV_RANDOM) < 0)
+    perror("posix_madvise(POSIX_MADV_RANDOM)");
+#elif defined(HAVE_MADVISE)
+  if (madvise(h->indx, index_size, MADV_RANDOM) < 0)
+    perror("madvise(MADV_RANDOM)");
+#endif
-  qsort(topics, num_topics, sizeof(help_indx), topic_cmp);
-  h->entries = num_topics;
-h->indx = topics
-
+topics = NULL
+
-  fclose(rfp);
-  do_rawlog(LT_WIZ, T("%d topics indexed."), num_topics);
@@ -589 +716 @@
-  return buff;
-}
+
+/** Unmaps all help indexes. Used before a reboot */
+void
+free_help_indexes(void)
+{
+#ifdef HAVE_MMAP
+  help_file *curr;
+
+  for (curr = hash_firstentry(&help_files);
+       curr; curr = hash_nextentry(&help_files)) {
+    if (curr->index_fd > 0) {
+      munmap(curr->indx, curr->entries * sizeof(help_indx));
+      curr->entries = 0;
+    }
+  }
+#endif
+}

1.8.3/branches/experimental/src/htmltab.c

@@ -60 +60 @@
-static int
-gperf_case_memcmp(register const char *s1, register const char *s2,
-       
+                
-{
-  for (; n > 0;) {
@@ -242 +242 @@
-    if (key <= MAX_HASH_VALUE && key >= 0)
-      if (len == lengthtable[key]) {
-   
-
-   
-   
-   
+        
+
+        
+        
+        
-      }
-  }

1.8.3/branches/experimental/src/lmath.c

@@ -64 +64 @@
-#line 44 "lmath.gperf"
-struct math {
-    
-    
+     
+ 
-};
-/* maximum key range = 52, duplicates = 0 */
@@ -97 +97 @@
-static int
-gperf_case_memcmp(register const char *s1, register const char *s2,
-       
+                
-{
-  for (; n > 0;) {
@@ -161 +161 @@
-#endif
-    struct math *math_hash_lookup(register const char *str,
-               
+                                
-{
-  enum {
@@ -245 +245 @@
-    if (key <= MAX_HASH_VALUE && key >= 0)
-      if (len == lengthtable[key]) {
-   
-
-   
-   
-   
+        
+
+        
+        
+        
-      }
-  }

1.8.3/branches/experimental/src/wiz.c

@@ -48 +48 @@
-#include "dbdefs.h"
-#include "extmail.h"
-
+
-
-#include "confmagic.h"
@@ -1777 +1777 @@
-  kill_info_slave();
-#endif
+  free_help_indexes();
-  local_shutdown();
-  end_all_logs();