Changeset 479

Timestamp:

08/16/06 01:46:08 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p40 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/Configure (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (1 diff)
• 1.7.7/Makefile.SH (modified) (2 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/config_h.SH (modified) (1 diff)
• 1.7.7/confmagic.h (modified) (1 diff)
• 1.7.7/game/alias.cnf (deleted)
• 1.7.7/game/data/minimal.db (deleted)
• 1.7.7/game/mushcnf.dst (modified) (1 diff)
• 1.7.7/game/names.cnf (deleted)
• 1.7.7/game/restrict.cnf (deleted)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennv177.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/memcheck.h (deleted)
• 1.7.7/hdrs/oldattrb.h (deleted)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/hdrs/warnings.h (deleted)
• 1.7.7/hints/linux_2.sh (modified) (1 diff)
• 1.7.7/src/Makefile (deleted)
• 1.7.7/src/announce.c (deleted)
• 1.7.7/src/attrib.c (modified) (4 diffs)
• 1.7.7/src/bsd.c (modified) (1 diff)
• 1.7.7/src/chunk.c (modified) (35 diffs)
• 1.7.7/src/command.c (modified) (4 diffs)
• 1.7.7/src/conf.c (modified) (1 diff)
• 1.7.7/src/convdb.c (deleted)
• 1.7.7/src/csrimalloc.c (modified) (3 diffs)
• 1.7.7/src/extmail.c (modified) (1 diff)
• 1.7.7/src/flags.c (modified) (2 diffs)
• 1.7.7/src/function.c (modified) (1 diff)
• 1.7.7/src/funstr.c (modified) (1 diff)
• 1.7.7/src/game.c (modified) (4 diffs)
• 1.7.7/src/lock.c (modified) (1 diff)
• 1.7.7/src/switchinc.c (modified) (1 diff)
• 1.7.7/utils/mkcmds.sh (deleted)
• 1.7.7/utils/penn-install (deleted)
• 1.7.7/win32/cmds.h (modified) (1 diff)
• 1.7.7/win32/config.h (modified) (1 diff)
• 1.7.7/win32/funs.h (modified) (2 diffs)
• 1.7.7/win32/msvc.net (added)
• 1.7.7/win32/msvc.net/pennmush.sln (moved) (moved from 1.7.7/win32/pennmush.sln)
• 1.7.7/win32/msvc.net/pennmush.vcproj (moved) (moved from 1.7.7/win32/pennmush.vcproj)
• 1.7.7/win32/msvc6 (added)
• 1.7.7/win32/msvc6/pennmush.dsp (moved) (moved from 1.7.7/win32/pennmush.dsp)
• 1.7.7/win32/msvc6/pennmush.dsw (moved) (moved from 1.7.7/win32/pennmush.dsw)

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 40                     December 1, 2004
+
+Major Changes:
+  * Another pass at the chunk allocator! Simpler but effective.
+    Folks should, however, greatly reduce their chunk_migrate
+    value in mush.cnf -- we suggest '50'. [TAP]
+Commands:
+  * @command/alias can alias commands. Patch by Walker@M*U*S*H.
+Functions:
+  * zwho() and zmwho(). [EEH]
+Minor Changes:
+  * utils/penn-install is no longer part of the PennMUSH distribution
+    (it's part of the Debian maintainer's stuff). [EEH]
+  * Inheritable @locks are inherited off of ancestor objects. 
+    Suggested by Zith@Lovarii. [SW] 
+Fixes:
+  * Infinite recursion in @lock/examine fixed. Report by
+    Amy Kou'ai (Amy@ShoujoAi) and Sparta Kerleon (Sparta@ShoujoAi). [TAP]
+  * @flag/letter now allows setting a flag's letter to one used by
+    another flag that works on different object types. Report by Lenon.
+  * Translation corrections by Cheetah@M*U*S*H and [EEH].
+  * Added __USE_POSIX to the cflags for linux, and removed 
+    checking for -lbind, to help SuSE 9.  Report by Ambrosia@M*U*S*H.
+  * Fixes to panic db loading logic. [SW] 
+  * escape() shouldn't double-escape the first character of the
+    string when it's a special character. Report by Walker@M*U*S*H.
+
-
-Version 1.7.7 patchlevel 39                     October 25, 2004

1.7.7/Configure

@@ -19 +19 @@
-#
-
-Head.U 1.1 Thu, 20 Jul 2000 17:42:54
+Configure 1.21.1.4.1.1.1.1.1.1.1.7.1.14 Mon, 28 Jun 2004 09:33:37
-#
-May 24 11:39:50
+Jun 28 09:20:55
-
-cat >/tmp/c1$$ <<EOF

1.7.7/MANIFEST

@@ -164 +164 @@
-utils/mkcmds.sh.SH
-utils/mkvershlp.pl
-utils/penn-install
-utils/update-cnf.pl
-utils/update.pl

1.7.7/Makefile.SH

@@ -67 +67 @@
-GLOBAL_INSTALL=/usr/libexec/pennmush
-
-# Where to install with 'make debianinstall'
-DEB_INSTALL=$(DESTDIR)/usr/lib/pennmush/game
-DEB_BIN=$(DESTDIR)/usr/games
-
-all: config.h options.h autogen game/mush.cnf
-    @echo "Making all in src."
@@ -299 +295 @@
-    @echo "** or symlink that to somewhere easier to run. You may wish to strip them."
-
-debianinstall: install
-    (cd game/txt; make clean compose.sh)
-    $(INSTALLDIR) $(DEB_INSTALL)
-    $(INSTALLDIR) $(DEB_BIN)
-    $(CP) -R game/* $(DEB_INSTALL)
-    -rm -f $(DEB_INSTALL)/netmush $(DEB_INSTALL)/info_slave
-    $(INSTALL) config.sh $(DEB_INSTALL)/config.sh
-    $(INSTALL) src/netmud $(DEB_INSTALL)/netmush
-    $(INSTALL) src/info_slave $(DEB_INSTALL)/info_slave
-    $(INSTALL) utils/penn-install $(DEB_BIN)/penn-install
-    $(CHMOD) a+rX -R $(DEB_INSTALL)
-    $(CHMOD) a+rX $(DEB_BIN)/penn-install
-    @echo "** Files installed in $(DEB_INSTALL)."
-    @echo "** You can run penn-install to create a user directory."
-
-!NO!SUBS!
-chmod 644 Makefile

1.7.7/Patchlevel

@@ -1 +1 @@
-Do not edit this file. It is maintained by the official PennMUSH patches.
-39
+40

1.7.7/config_h.SH

@@ -26 +26 @@
- * For a more permanent change edit config.sh and rerun config_h.SH.
- *
-Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp
+config_h.SH 1.17.1.2.1.1.1.11 Mon, 24 May 2004 14:14:15 -0500 dunemush
- */
-

1.7.7/confmagic.h

@@ -7 +7 @@
- * without the -M option.
- *
-Magic_h.U,v 3.0.1.2 1993/11/10 17:32:58 ram Exp
+confmagic.h 1.9 Fri, 15 Feb 2002 16:56:28 -0600 dunemush
- */
-

1.7.7/game/mushcnf.dst

@@ -153 +153 @@
-# second.  The higher the value, the faster memory gets defragmented,
-# but at a greater CPU cost.
-0
+
-
-###

1.7.7/game/txt/hlp/penncmd.hlp

@@ -571 +571 @@
-  @command <command>
-  @command/<switch> <command>
+  @command/alias <command>=<new command name>
-
-  @command provides information about and controls the availability 
@@ -583 +584 @@
-  /enable    : Enable the <command>
-  /on        : Synonym for /enable
+  /alias     : Creates an alias for a command.
-  /quiet     : Don't make noisy output when doing one of the above
-  /add       : Creates a useless command. @hook/override it.
-
+, or aliases.
-
-  See HELP RESTRICT for more.

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -114 +114 @@
-  cmds()        conn()        doing()       height()      hostname()
-  hidden()      idle()        ipaddr()      lports()      lwho()        
-
-
+
+
+
-& Dbref functions
-  Dbref functions return a dbref or list of dbrefs related to some value
@@ -4532 +4533 @@
-
-  See also: lwho(), mwho(), nwho()
+
+& ZMWHO()
+  zmwho(<object>)
+
+  This returns a list of the dbref numbers for all current-connected,
+  non-hidden players within a location belonging to the specified zone.
+  It's exactly the same as zwho() used by a mortal, and is suitable for
+  use on privileged global objects who need an unprivileged zwho-list.
+
+  See also: zwho()
+
+& ZWHO()
+  zwho(<object>[,<viewer>])
+
+  This returns a list of the dbref numbers for all currently-connected
+  players within a location belonging to the specified zone. When mortals
+  use this function, the dbref numbers of DARK wizards or hidden royalty
+  do NOT appear on the dbref list.
+  
+  If <viewer> is given by a privileged user, zwho() returns a dbref list
+  using <viewer>'s privileges.
+
+  See also: zmwho()
-& ZEMIT()
-& NSZEMIT()

1.7.7/game/txt/hlp/penntop.hlp

@@ -392 +392 @@
-  UNIX            Tinyfugue   tf.tcp.com
-                              /pub/tinyfugue
-
-
+
-                  SimpleMU    http://simplemu.onlineroleplay.com
+                  MuckClient  http://www.xcalibur.co.uk/MuckClient/
-  MACINTOSH       MUDDweller  http://www.shareware.com (search for Muddweller)
-

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-39
+40
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 40                     December 1, 2004
+
+Major Changes:
+  * Another pass at the chunk allocator! Simpler but effective.
+    Folks should, however, greatly reduce their chunk_migrate
+    value in mush.cnf -- we suggest '50'. [TAP]
+Commands:
+  * @command/alias can alias commands. Patch by Walker@M*U*S*H.
+Functions:
+  * zwho() and zmwho(). [EEH]
+Minor Changes:
+  * utils/penn-install is no longer part of the PennMUSH distribution
+    (it's part of the Debian maintainer's stuff). [EEH]
+  * Inheritable @locks are inherited off of ancestor objects. 
+    Suggested by Zith@Lovarii. [SW] 
+Fixes:
+  * Infinite recursion in @lock/examine fixed. Report by
+    Amy Kou'ai (Amy@ShoujoAi) and Sparta Kerleon (Sparta@ShoujoAi). [TAP]
+  * @flag/letter now allows setting a flag's letter to one used by
+    another flag that works on different object types. Report by Lenon.
+  * Translation corrections by Cheetah@M*U*S*H and [EEH].
+  * Added __USE_POSIX to the cflags for linux, and removed 
+    checking for -lbind, to help SuSE 9.  Report by Ambrosia@M*U*S*H.
+  * Fixes to panic db loading logic. [SW] 
+  * escape() shouldn't double-escape the first character of the
+    string when it's a special character. Report by Walker@M*U*S*H.
+
+
+& 1.7.7p39
-Version 1.7.7 patchlevel 39                     October 25, 2004
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4420 +4420 @@
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-       19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-
+, 40
-1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/command.h

@@ -106 +106 @@
-                  char *arg_left, char *args_left[MAX_ARG], \
-                  char *arg_right, char *args_right[MAX_ARG])
-
-/* For things that DON'T get auto-aliased by mkalias, like 'i' for 'inv' and 'l' for 'look' */
-
-typedef struct command_alias COMALIAS;
-/** An alias to a command.
- * This structure represents a command alias, which consists of the command's
- * real (canonical) name and an alias for that name.
- */
-struct command_alias {
-  const char *name; /**< Canonical command name */
-  const char *alias;    /**< Command alias */
-};
-
-typedef struct command_info COMMAND_INFO;

1.7.7/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.7.7"
-39
-0/25
-39
+40
+2/01
+40

1.7.7/hints/linux_2.sh

@@ -1 +1 @@
-nm_opt='-B'
+ccflags='-D__USE_POSIX'
+libswanted='nsl m c crypt intl resolv'
-echo "I suggest using sysmalloc when you edit options.h."

1.7.7/src/attrib.c

@@ -245 +245 @@
-  static char name[ATTRIBUTE_NAME_LIMIT + 1];
-  char *p;
-
-
+
-  int canlook;
-  dbref target;
@@ -254 +253 @@
-  visible = (player == NOTHING);
-  if (visible) {
-
-
-
-
+
+
+
-    canlook = 0;
-  } else {
-ontrol = controls(player, obj);
-exam =
+ansee = controls(player, obj) ||
+ 
-    canlook = can_look_at(player, obj);
-  }
@@ -268 +266 @@
-  /* If we can't see the attribute itself, then that's easy. */
-  if (AF_Internal(atr) || AF_Mdark(atr) ||
-ontrol || exam
+ansee
-    (AF_Visual(atr) && (!AF_Nearby(atr) || canlook)) ||
-    (!visible && !Mistrust(player) &&
@@ -297 +295 @@
-      }
-      if (AF_Internal(atr) || AF_Mdark(atr) ||
-ontrol || exam
+ansee
-        (AF_Visual(atr) && (!AF_Nearby(atr) || canlook)) ||
-        (!visible && !Mistrust(player) &&

1.7.7/src/bsd.c

@@ -4277 +4277 @@
-}
-
+/* ZWHO() function - really belongs in eval.c but needs stuff declared here */
+/* ARGSUSED */
+FUNCTION(fun_zwho)
+{
+  DESC *d;
+  dbref zone, victim;
+  int first;
+  int powered = (strcmp(called_as, "ZMWHO") && Priv_Who(executor));
+  first = 1;
+
+  zone = match_thing(executor, args[0]);
+
+  if (nargs == 1) {
+    victim = executor;
+  } else if ((nargs == 2) && powered) {
+    if ((victim = match_thing(executor, args[1])) == 0) {
+      safe_str(T(e_match), buff, bp);
+      return;
+    }
+  } else {
+    safe_str(T(e_perm), buff, bp);
+    return;
+  }
+
+  if (!GoodObject(zone) || !eval_lock(victim, zone, Zone_Lock)) {
+    safe_str(T(e_perm), buff, bp);
+    return;
+  }
+  if ((getlock(zone, Zone_Lock) == TRUE_BOOLEXP) ||
+      (IsPlayer(zone) && !(has_flag_by_name(zone, "SHARED", TYPE_PLAYER)))) {
+    safe_str(T("#-1 INVALID ZONE."), buff, bp);
+    return;
+  }
+
+  /* Use lowest privilege for victim */
+  if (!Priv_Who(victim))
+    powered = 0;
+
+  DESC_ITER_CONN(d) {
+    if (!Hidden(d) || powered) {
+      if (Zone(Location(d->player)) == zone) {
+    if (first) {
+      first = 0;
+    } else {
+      safe_chr(' ', buff, bp);
+    }
+    safe_dbref(d->player, buff, bp);
+      }
+    }
+  }
+}
+
-/* ARGSUSED */
-FUNCTION(fun_doing)

1.7.7/src/chunk.c

@@ -15 +15 @@
- * 
- * <h3>Basic operation:</h3>
-approximately 64K regions
-Each of these regions contain variable-size chunks representing
-llocated and available (free) memory.  No individual allocatio
-may be larger than will fit in a single region, and no allocation
-may be smaller than two bytes.  Each chunk has between two and four
-bytes of overhead (indicating the used/free status, the size of the
-chunk, and the number of dereferences for the chunk), and each
-region has additional overhead of about 3
+regions of approximately 64KB
+These regions contain variable-size chunks representing allocated and
+vailable (free) memory.  No individual allocation may be larger tha
+will fit in a single region, and no allocation may be smaller than one
+byte.  Each chunk has between two and four bytes of overhead (indicating
+the used/free status, the size of the chunk, and the number of
+dereferences for the chunk), and each region has additional overhead
+of about 4
- * 
- * Allocations are made with the chunk_create() call, which is given
@@ -77 +77 @@
- * whole.
- * 
-several
+two
- * The things that make a chunk unhappy are:
- * <ul>
- * <li> Having free space both before and after the chunk in its region.
- * <li> Having only one allocated neighbor (or worse, none).  The edges
- *      of a region count as allocated neighbors.
- * <li> Having a dereference count different from the region average.
- *      The greater the difference, the more unhappy the chunk is.
-more free space
+fewer chunks
- *      region, the more unhappy the chunks in it.
- * <li> Being away from the other chunks migrated at the same time.
- *      If some of the other chunks allowed to migrate are in the same
- *      region as a chunk, then it is happier.  (This is specifically
- *      to improve locality during dumps.)
- * </ul>
-one of these factors are absolute; all of them have different weights
-that add into a general unhappiness for the chunk.  The lower the
-
+either of these factors are absolute; both of them have different
+weights that add into a general unhappiness for the chunk.  The lower
+the 
- * 
- * Over time and usage, the dereference counts for chunks will increase
@@ -105 +98 @@
- * and all chunk dereference counts are halved.  The critical number of
- * regions is determined based on the cache size and the total number of
-n general, period change should be controlled primarily by
-the frequency of database dumps (which end up incrementing the dereference
-count on all chunks, and thus all regions).  Given a dump frequency
-of once per hour (the default), there should be a period change about
-
+f you're not using forking dumps, then period change should
+be controlled primarily by the frequency of database dumps (which end
+up incrementing the dereference count on all chunks, and thus all
+regions).  Given a dump frequency of once per hour (the default), there
+should be a period change about 
- * 
- * 
@@ -219 +212 @@
-#include "conf.h"
-
+#include <limits.h>
-#include <string.h>
+#include <stdarg.h>
-#include <stdlib.h>
-
@@ -253 +248 @@
-/** Log all moves and slides during migration. */
-#undef DEBUG_CHUNK_MIGRATE
-/** Log start, phases, and finish of migration. */
-#undef DEBUG_CHUNK_MIGRATE_LOUD
-/** Log info about trying to fill holes. */
-#undef DEBUG_CHUNK_MIGRATE_FILL
-/** Log creation of regions. */
-#undef DEBUG_CHUNK_REGION_CREATE
@@ -263 +254 @@
-/** Log all mallocs. */
-#undef DEBUG_CHUNK_MALLOC
+
+/** For debugging, we keep a rolling log of debug messages.
+ * These get dumped to disk if we're about to panic.
+ */
+#define ROLLING_LOG_SIZE 200
+#define ROLLING_LOG_ENTRY_LEN 1024
-
-/* debug... */
@@ -291 +288 @@
-#define MAX_CHUNK_LEN (16384-1)
-
+/** Number of oddballs tracked in regions.
+ * This is used to figure out when we should pull regions in because
+ * we have an opportunity to migrate chunks that don't match.
+ * Relatively arbitrary; too low means you don't move things out
+ * enough, but boosting it too high wastes memory.
+ */
+#define NUM_ODDBALLS 10
+
+/** Minimum disagreement to be an oddball.
+ * This is used to figure out when we should pull regions in because
+ * we have an opportunity to migrate chunks that don't match.
+ * Relatively arbitrary; too low means you don't move things out
+ * enough, but boosting it too high wastes migration time.
+ */
+#define ODDBALL_THRESHOLD 8
+
-/*
- * FIXME: pulling config variables out of my left ear. Fix later.
@@ -299 +312 @@
-#define FIXME_REGION_ARRAY_INCREMENT 10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
@@ -446 +467 @@
-  ChunkPointer(ChunkReferenceToRegion((ref)), ChunkReferenceToOffset((ref)))
-
-
-/*
- * Macros for probing and manipulating chunk headers
@@ -501 +521 @@
-  ((ChunkDataPtr(region, offset)[0] << 8) + ChunkDerefs(region, offset))
-
+/* 0 for no, 1 for yes with room, 2 for exact */
+#define FitsInSpace(size, capacity) \
+  (((size) == (capacity)) ? 2 : ((size) <= (capacity) - MIN_REMNANT_LEN))
+
-/** Region info that gets paged out with its region.
- * This is at the start of the region;
@@ -525 +549 @@
-                                           counts on period change! */
-  RegionHeader *in_memory;  /**< cache entry; NULL if paged out */
+  u_int_16 oddballs[NUM_ODDBALLS];  /**< chunk offsets with odd derefs */
-} Region;
-
@@ -533 +558 @@
-     regions[(region)].used_count \
-   : 0)
+#define RegionDerefsWithChunk(region, derefs) \
+   (((regions[(region)].total_derefs >> \
+     (curr_period - regions[(region)].period_last_touched)) + derefs) / \
+    (regions[(region)].used_count + 1))
-
-/*
@@ -585 +614 @@
-static int stat_page_in;        /**< Number of page-ins */
-static int stat_migrate_slide;      /**< Number of slide migrations */
-
-
-
+
+
-static int stat_create;         /**< Number of chunk creations */
-static int stat_delete;         /**< Number of chunk deletions */
@@ -596 +624 @@
- * migration globals that are used for holding relevant data...
- */
-static int m_alloc;     /**< The allocated length for the arrays. */
-static int m_count;     /**< The used length for the arrays. */
-static chunk_reference_t **m_references; /**< The passed-in references array. */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
- * Debug routines
- */
+/** Add a message to the rolling log. */
+static void
+debug_log(char const *format, ...)
+{
-#ifdef CHUNK_PARANOID
+  va_list args;
+
+  va_start(args, format);
+  vsprintf(rolling_log[rolling_pos], format, args);
+  va_end(args);
+
+  rolling_log[rolling_pos][ROLLING_LOG_ENTRY_LEN - 1] = '\0';
+  if (noisy_log) {
+    fprintf(tracelog_fp, "%s\n", rolling_log[rolling_pos]);
+    fflush(tracelog_fp);
+  }
+  rolling_pos = (rolling_pos + 1) % ROLLING_LOG_SIZE;
+#else
+  if (format)
+    return;         /* shut up the compiler warning */
+#endif
+}
+
+#ifdef CHUNK_PARANOID
+/** Dump the rolling log. */
+static void
+dump_debug_log(FILE * fp)
+{
+  int j;
+  fputs("Recent chunk activity:\n", fp);
+  j = rolling_pos;
+  do {
+    if (rolling_log[j][0]) {
+      fputs(rolling_log[j], fp);
+      fputc('\n', fp);
+      rolling_log[j][0] = '\0';
+    }
+    j = (j + 1) % ROLLING_LOG_SIZE;
+  } while (j != rolling_pos);
+  fputs("End of recent chunk activity.\n", fp);
+  fflush(fp);
+}
+
+/** Test if a chunk is migratable. */
+static int
+migratable(u_int_16 region, u_int_16 offset)
+{
+  chunk_reference_t ref = ChunkReference(region, offset);
+  int j;
+
+  for (j = 0; j < m_count; j++)
+    if (m_references[j][0] == ref)
+      return 1;
+  return 0;
+}
+
-/** Give a detailed map of a region.
- * Lists pertinent region information, and all the chunks in the region.
@@ -641 +730 @@
-    for (offset = FIRST_CHUNK_OFFSET_IN_REGION;
-     offset < REGION_SIZE; offset += ChunkFullLen(region, offset)) {
-
+
+
-          ChunkIsFree(region, offset) ? "FREE" : "",
-          ChunkIsShort(region, offset) ? "SHORT" :
@@ -678 +768 @@
-       pos < REGION_SIZE; pos += ChunkFullLen(region, pos)) {
-    if (pos == offset) {
-(ChunkPointer(region, pos)[0] & CHUNK_FREE_MASK) == CHUNK_FREE
-used chunk
+ChunkIsFree(region, pos)
+free chunk as used
-      return;
-    }
-  }
+  mush_panic("Invalid reference to non-chunk as used");
-}
-
@@ -1055 +1146 @@
- * \param offset the offset of the hole to use.
- * \param full_len the length (including headers) of the space to allocate.
+ * \param align the alignment to use: 0 = easiest, 1 = left, 2 = right.
- * \return the offset of the allocated space.
- */
-static u_int_16
-
+, int align
-{
-  Region *rp = regions + region;
@@ -1098 +1190 @@
-
-  ASSERT(hole_len >= full_len + MIN_REMNANT_LEN);
-
+
+
+
+
+
+
+
-    rp->free_bytes -= full_len;
-    rp->in_memory->first_free += full_len;
-    write_free_chunk(region, offset + full_len,
-             hole_len - full_len, ChunkNextFree(region, offset));
+    if (rp->in_memory->first_free == offset)
+      rp->in_memory->first_free += full_len;
+    else {
+      u_int_16 hole;
+      for (hole = rp->in_memory->first_free;
+       hole; hole = ChunkNextFree(region, hole))
+    if (ChunkNextFree(region, hole) == offset)
+      break;
+      ASSERT(hole);
+      write_next_free(region, hole, offset + full_len);
+    }
-    if (rp->largest_free_chunk == hole_len)
-      rp->largest_free_chunk = largest_hole(region);
@@ -1134 +1242 @@
-  int done;
-
+  debug_log("read_cache_region %04x", region);
+
-  /* Try to seek up to 3 times... */
-  for (j = 0; j < 3; j++)
@@ -1181 +1291 @@
-}
-
-from
+to
- * \param fd file to write to
- * \param rhp region buffer to use
@@ -1194 +1304 @@
-  size_t remaining;
-  int done;
+
+  debug_log("write_cache_region %04x", region);
-
-  /* Try to seek up to 3 times... */
@@ -1244 +1356 @@
-}
-
+/** Update cache position to stave off recycling.
+ * \param rhp the cached region to keep around.
+ */
+static void
+touch_cache_region(RegionHeader * rhp)
+{
+  debug_log("touch_cache_region %04x", rhp->region_id);
+
+  if (cache_head == rhp)
+    return;
+  if (cache_tail == rhp)
+    cache_tail = rhp->prev;
+  if (rhp->prev)
+    rhp->prev->next = rhp->next;
+  if (rhp->next)
+    rhp->next->prev = rhp->prev;
+
+  if (cache_head)
+    cache_head->prev = rhp;
+  rhp->next = cache_head;
+  rhp->prev = NULL;
+  cache_head = rhp;
+  if (!cache_tail)
+    cache_tail = rhp;
+}
+
-/** Find space in the cache.
- * This is likely to require paging out something.
@@ -1252 +1390 @@
-{
-  RegionHeader *rhp;
+
+  debug_log("find_available_cache_region");
-
-  if (!cache_tail ||
@@ -1272 +1412 @@
-    return cache_tail;
-
+  rhp = cache_tail;
-  /* page the current occupant out */
+  find_oddballs(rhp->region_id);
-#ifdef DEBUG_CHUNK_PAGING
-  do_rawlog(LT_TRACE, "CHUNK: Paging out region %04x (offset %08x)",
-cache_tail
-
-cache_tail, cache_tail
+rhp
+
+rhp, rhp
-  /* keep statistics */
-cache_tail
+rhp
-  stat_page_out++;
-
-  /* mark the paged out region as not in memory */
-cache_tail
+rhp
-  /* mark it not in use for sanity check reasons */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -1326 +1444 @@
-  unsigned int shift;
-
+  debug_log("bring_in_region %04x", region);
+
+  ASSERT(region < region_count);
-  if (rp->in_memory)
-    return;
@@ -1424 +1545 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-{
-  Region *rp = regions + region;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+