Changeset 431

Timestamp:

08/12/06 18:14:26 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p16 Archival

Files:

• 1.7.7/CHANGES.176 (modified) (1 diff)
• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/INSTALL (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (2 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (10 diffs)
• 1.7.7/game/txt/hlp/pennv176.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/attrib.h (modified) (2 diffs)
• 1.7.7/hdrs/dbdefs.h (modified) (2 diffs)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/mushdb.h (modified) (1 diff)
• 1.7.7/hdrs/mushtype.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/access.c (modified) (2 diffs)
• 1.7.7/src/bsd.c (modified) (17 diffs)
• 1.7.7/src/chunk.c (modified) (20 diffs)
• 1.7.7/src/cmds.c (modified) (1 diff)
• 1.7.7/src/command.c (modified) (1 diff)
• 1.7.7/src/conf.c (modified) (1 diff)
• 1.7.7/src/extchat.c (modified) (8 diffs)
• 1.7.7/src/extmail.c (modified) (17 diffs)
• 1.7.7/src/function.c (modified) (2 diffs)
• 1.7.7/src/fundb.c (modified) (2 diffs)
• 1.7.7/src/funmisc.c (modified) (2 diffs)
• 1.7.7/src/funtime.c (modified) (8 diffs)
• 1.7.7/src/game.c (modified) (5 diffs)
• 1.7.7/src/lock.c (modified) (2 diffs)
• 1.7.7/src/look.c (modified) (1 diff)
• 1.7.7/src/player.c (modified) (5 diffs)
• 1.7.7/src/set.c (modified) (1 diff)
• 1.7.7/src/strutil.c (modified) (1 diff)
• 1.7.7/src/switchinc.c (modified) (1 diff)
• 1.7.7/utils/mkcmds.sh.SH (modified) (1 diff)
• 1.7.7/win32/funs.h (modified) (2 diffs)

1.7.7/CHANGES.176

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.7.6 patchlevel 12                     June 23, 2003
+
+Minor changes:
+   * Users no longer see last connection information when they 
+     connect to Guests. Suggested by Jules@M*U*S*H.
+Fixes:
+   * Potential problem with ambigious names in the information functions 
+     fixed. [SW]
+   * The 'chat' config group is no longer displayed when CHAT_SYSTEM
+     isn't defined. Report by Mike Griffiths. [SW]
+   * cygwin install instructions changed to remove obsolete exim
+     version information. Suggested by Cheetah@M*U*S*H.
+   * Objects with user-defined locks had problems with finding built-in locks
+     on the object. Reported by Walker@M*U*S*H. [SW]
+
-
-Version 1.7.6 patchlevel 11                     June 1, 2003

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 16                     June 23, 2003
+
+Commands:
+  * New switch /room for 'with' to run a $command available in a remote
+    location. Suggested by Mike Griffiths. [SW]
+Functions:
+  * Added the terminfo() function, which returns information about a
+    client's name and capabilities for a particular connection. [SW]
+  * New lports() function. Like lwho() but returns port descriptors.
+    For mux2 compatibility. [SW]
+  * Functions that return information about a connected player now treat
+    integer arguments as a port descriptor to look up, rather than using
+    the least-idle connection of a player. To force a player name to
+    be treated as such even when it's a number, prefix it with a * in
+    softcode. For mux2 compatibility. [SW]
+  * Players can use ports() on themselves and use the descriptors
+    they're connected to as arguments to the information functions.
+    For mux2 compatibility. [SW]
+Minor Changes:
+  * Compute various chunk stats (total used, total free space, etc.)
+    on demand instead of keeping running totals. [TAP]
+  * @chan/what displays information about a channel's recall buffer, if any.
+    [SW]
+  * @chan/recall'ed lines are more clearly marked as such. Suggested by 
+    Oriens@Alexandria. [SW]
+  * Consolidation of a common idiom used to format times throughout the source
+    into a simple function call. [SW]
+  * The time a @mail was sent was stored, unusually, as a string.
+    No longer. Now it's handled the same way as all other times. [SW]
+Fixes:
+  * Bug in resizing @chan/recall buffers fixed. Reported by Oriens@Alexandria.
+    [SW]
+  * Objects with user-defined locks had problems with finding built-in locks
+    on the object. Reported by Walker@M*U*S*H. [SW]
+  * Unregistered() macro was checking wrong flag name. Report by
+    Matt Kirby.
+  * Help fix by Adu@M*U*S*H.
+  * Potential problem with ambigious names in the information functions fixed.
+
-
-Version 1.7.7 patchlevel 15                     June 1, 2003

1.7.7/INSTALL

@@ -101 +101 @@
-   b. Compile with the Cygwin unix emulation tools (http://www.cygwin.com)
-      In addition to the base cygwin stuff, you'll want the following packages:
-
+
+
-      (gcc 3.2 is recommended.)
-      These are also recommended:

1.7.7/MANIFEST

@@ -124 +124 @@
-src/wild.c
-src/wiz.c
-src/SWITCHES
-src/cmdlocal.dst
-src/funlocal.dst
@@ -229 +228 @@
-win32/pennmush.vcproj
-win32/pennmush.sln
+src/SWITCHES

1.7.7/Patchlevel

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

1.7.7/game/txt/hlp/penncmd.hlp

@@ -2487 +2487 @@
-See also: @inprefix, AUDIBLE, @listen
-& @ps
- | all
+
-  
-  @ps is a useful command for MUSHers.  It lists all commands currently on
@@ -3789 +3789 @@
-See also: @doing, @poll, DOING
-& with
-
+[/room]
-
-  Attempts to run a user-defined command on a specific object.
+  If the /room switch is given, <obj> must be a room, and its contents
+  are checked for commands as if it was a master room.
-
-  See 'help USER-DEFINED COMMANDS'.

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -45 +45 @@
-  Channel functions: Get information about channels (CTITLE, CWHO)
-  Communication functions: Send messages to objects (PEMIT, OEMIT)
+  Connection functions: Get information about a player's connection (CONN)
-  Dbref functions: return dbref info related to objects (LOC, LEXITS)
-  Global functions: local MUSH-specific functions defined with @function
@@ -105 +106 @@
-  cemit()       emit()        lemit()       nspemit()     oemit()
-  pemit()       remit()       zemit() 
+& Connection functions
+  Connection functions return information about the connections open 
+  on a game, or about specific connections.
+
+  conn()        doing()       height()      hidden()      idle()
+  lports()      lwho()        mwho()        ports()       pueblo()
+  terminfo()    width() 
-& Dbref functions
-  Dbref functions return a dbref or list of dbrefs related to some value
@@ -120 +128 @@
-  Information functions return values related to objects.
- 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-& Mail functions
@@ -657 +663 @@
-
-& CONN()
- name
+|descriptor
- 
-  This function returns the number of seconds a player has been connected.
@@ -892 +898 @@
-  See also: MODULO
-& DOING()
-
+|descriptor
-
-  Given the name of a connected player, returns that player's @doing
@@ -1429 +1435 @@
-  If an invalid type is given, #-1 is returned.
-& HIDDEN()
-
+|descriptor
-
-  Returns 1 if the player is hidden, otherwise 0.
@@ -1441 +1447 @@
-& IDLE()
-& IDLESECS()
- name
- name
+|descriptor
+|descriptor
- 
-  This function returns the number of seconds a player has been idle,
@@ -2559 +2565 @@
-
-  See also: @poll, doing(), @doing 
+& LPORTS()
-& PORTS()
+  lports()
-  ports(<player name>)
- 
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-& POS()
-  pos(<string1>,<string2>)
@@ -3357 +3374 @@
-
-  See also: @tel
+& TERMINFO()
+  terminfo(<player|descriptor>)
+
+  Returns a list with at least one element - the type of client used
+  by the player, or "unknown" if the client being used doesn't support
+  being asked to identify itself using RFC 1091. 
+  
+  Other elements in the list describe client capabilities, and
+  currently include:
+  pueblo           present if the client is in Pueblo mode.
+  telnet           present if the client understands the telnet protocol.
+
+  Other fields may be added in the future, if, for example, MXP support
+  is ever added.
+
+  Players can use terminfo() on their own connections. Using it on
+  other players is restricted to see_all objects.  
-& TEXTFILE()
-& dynhelp()
@@ -3764 +3798 @@
-& SCREENWIDTH
-& SCREENHEIGHT
-
-
+|descriptor
+|descriptor
-
-  These two functions return the screen width and height for a connected

1.7.7/game/txt/hlp/pennv176.hlp

@@ +1 @@
+& 1.7.6p12
+Version 1.7.6 patchlevel 12                     June 23, 2003
+
+Minor changes:
+   * Users no longer see last connection information when they 
+     connect to Guests. Suggested by Jules@M*U*S*H.
+Fixes:
+   * Potential problem with ambigious names in the information functions 
+     fixed. [SW]
+   * The 'chat' config group is no longer displayed when CHAT_SYSTEM
+     isn't defined. Report by Mike Griffiths. [SW]
+   * cygwin install instructions changed to remove obsolete exim
+     version information. Suggested by Cheetah@M*U*S*H.
+   * Objects with user-defined locks had problems with finding built-in locks
+     on the object. Reported by Walker@M*U*S*H. [SW]
+
+
-& 1.7.6p11
-Version 1.7.6 patchlevel 11                     June 1, 2003

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-5
+6
-& 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 16                     June 23, 2003
+
+Commands:
+  * New switch /room for 'with' to run a $command available in a remote
+    location. Suggested by Mike Griffiths. [SW]
+Functions:
+  * Added the terminfo() function, which returns information about a
+    client's name and capabilities for a particular connection. [SW]
+  * New lports() function. Like lwho() but returns port descriptors.
+    For mux2 compatibility. [SW]
+  * Functions that return information about a connected player now treat
+    integer arguments as a port descriptor to look up, rather than using
+    the least-idle connection of a player. To force a player name to
+    be treated as such even when it's a number, prefix it with a * in
+    softcode. For mux2 compatibility. [SW]
+  * Players can use ports() on themselves and use the descriptors
+    they're connected to as arguments to the information functions.
+    For mux2 compatibility. [SW]
+Minor Changes:
+  * Compute various chunk stats (total used, total free space, etc.)
+    on demand instead of keeping running totals. [TAP]
+  * @chan/what displays information about a channel's recall buffer, if any.
+    [SW]
+  * @chan/recall'ed lines are more clearly marked as such. Suggested by 
+    Oriens@Alexandria. [SW]
+  * Consolidation of a common idiom used to format times throughout the source
+    into a simple function call. [SW]
+  * The time a @mail was sent was stored, unusually, as a string.
+    No longer. Now it's handled the same way as all other times. [SW]
+Fixes:
+  * Bug in resizing @chan/recall buffers fixed. Reported by Oriens@Alexandria.
+    [SW]
+  * Objects with user-defined locks had problems with finding built-in locks
+    on the object. Reported by Walker@M*U*S*H. [SW]
+  * Unregistered() macro was checking wrong flag name. Report by
+    Matt Kirby.
+  * Help fix by Adu@M*U*S*H.
+  * Potential problem with ambigious names in the information functions fixed.
+
+
+& 1.7.7p15
-Version 1.7.7 patchlevel 15                     June 1, 2003
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 16
+, 12
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
-1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,

1.7.7/hdrs/attrib.h

@@ -58 +58 @@
-extern unsigned const char *atr_get_compressed_data(ATTR *atr);
-extern char *atr_value(ATTR *atr);
-
-
-
+
+
+
+
-
-/* possible attribute flags */
@@ -85 +86 @@
-
-/* external predefined attributes. */
-
+    
-
-#define AL_ATTR(alist)          (alist)

1.7.7/hdrs/dbdefs.h

@@ -79 +79 @@
-#define Connected(x)    (IS(x, TYPE_PLAYER, "CONNECTED"))   /* 0x200 */
-#define ZMaster(x)      (IS(x, TYPE_PLAYER, "ZONE"))    /* 0x800 */
-
+E
-#define Fixed(x)        (IS(Owner(x), TYPE_PLAYER, "FIXED"))
-
@@ -277 +277 @@
-  time_t from_ctime;        /**< Sender's creation time */
-  unsigned char *message;   /**< Message text, compressed */
-unsigned char *time;     /**< Message date/time, compressed
+time_t time;         /**< Message date/time
-  unsigned char *subject;   /**< Message subject, compressed */
-  int read;         /**< Bitflags of message status */

1.7.7/hdrs/externs.h

@@ -392 +392 @@
-                  const char *conjoin, const char *space,
-                  char *buff, char **bp);
+    extern char *show_time(time_t t, int utc);
+    extern char *show_tm(struct tm *t);
+
-
-/** This structure associates html entities and base ascii representations */

1.7.7/hdrs/mushdb.h

@@ -151 +151 @@
- */
-#define RDBF_SCREENSIZE         0x01
+#define RDBF_TTYPE              0x02
-
-#endif              /* __DB_H */

1.7.7/hdrs/mushtype.h

@@ -121 +121 @@
-  int width;            /**< Screen width */
-  int height;           /**< Screen height */
+  char *ttype;          /**< Terminal type */
-#ifdef HAS_OPENSSL
-  BIO *bio;

1.7.7/hdrs/version.h

@@ -1 @@
-5 [06/01
-5
-5
+6 [06/23
+6
+6

1.7.7/src/access.c

@@ -485 +485 @@
-  struct access *end;
-  struct access *tmp;
-  char *date;
-
-  tmp = (struct access *) mush_malloc(sizeof(struct access), "struct_access");
@@ -495 +494 @@
-  tmp->cant = cant;
-  strcpy(tmp->host, host);
-
-
-
+
+
-  tmp->next = NULL;
-

1.7.7/src/bsd.c

@@ -225 +225 @@
-#define TN_LINEMODE 34      /**< Line mode */
-#define TN_NAWS 31      /**< Negotiate About Window Size */
+#define TN_TTYPE 24     /**< Ask for termial type information */
-static void test_telnet(DESC *d);
-static void setup_telnet(DESC *d);
@@ -1641 +1642 @@
-  {
-    freeqs(d);
+    mush_free(d->ttype, "terminal description");
-    mush_free((Malloc_t) d, "descriptor");
-  }
@@ -1684 +1686 @@
-  d->input_chars = 0;
-  d->output_chars = 0;
+  d->width = 78;
+  d->height = 24;
+  d->ttype = mush_strdup("unknown", "terminal description");
-#ifdef HAS_OPENSSL
-  d->bio = NULL;
@@ -1714 +1719 @@
-  d->bConnectionDropped = FALSE;    /* not dropped yet */
-#else
-  d->width = 78;
-  d->height = 24;
-  test_telnet(d);
-  welcome_user(d);
@@ -2187 +2190 @@
-  d->conn_flags |= CONN_TELNET;
-  if (d->conn_flags & CONN_TELNET_QUERY) {
-
-3] = "\xFF\xFD\x1F
+IAC DO TERMINAL-TYPE 
+6] = "\xFF\xFD\x1F" "\xFF\xFD\x18
-    d->conn_flags &= ~CONN_TELNET_QUERY;
-    do_log(LT_CONN, 0, 0, T("[%d/%s/%s] Switching to Telnet mode."),
-       d->descriptor, d->addr, d->ip);
-3
+6
-    process_output(d);
-  }
@@ -2274 +2277 @@
-    return -1;
-      (*q)++;
+    } else if (**q == TN_TTYPE) {
+      /* Read the terminal type: TERMINAL-TYPE IS blah IAC SE */
+      char tbuf[BUFFER_LEN], *bp = tbuf;
+      if (*q >= qend)
+    return -1;
+      (*q)++;
+      /* Skip IS */
+      if (*q >= qend)
+    return -1;
+      (*q)++;
+
+      /* Read up to IAC SE */
+      while (1) {
+    if (*q >= qend)
+      return -1;
+    if (**q == IAC) {
+      if (*q + 1 >= qend)
+        return -1;
+      if (*(*q + 1) == IAC) {
+        safe_chr(IAC, tbuf, &bp);
+        (*q)++;
+      } else
+        break;
+    } else
+      safe_chr(**q, tbuf, &bp);
+    (*q)++;
+      }
+      while (*q < qend && **q != SE)
+    (*q)++;
+      *bp = '\0';
+      mush_free(d->ttype, "terminal description");
+      d->ttype = mush_strdup(tbuf, "terminal description");
-    } else {
-      while (*q < qend && **q != SE)
@@ -2293 +2328 @@
-      fprintf(stderr, "Setting linemode options.\n");
-#endif
+    } else if (**q == TN_TTYPE) {
+      /* Ask for terminal type id: IAC SB TERMINAL-TYPE SEND IAC SEC */
+      unsigned char reply[6] = "\xFF\xFA\x18\x01\xFF\xF0";
+      queue_newwrite(d, reply, 6);
-    } else if (**q == TN_SGA || **q == TN_NAWS) {
-      /* This is good to be at. */
@@ -3157 +3196 @@
-  }
-  queue_string_eol(call_by, tprintf("Name: %s", options.mud_name));
-ctime(&first_start_time
+show_time(first_start_time, 0
-  queue_string_eol(call_by, tprintf("Connected: %d", count));
-  queue_string_eol(call_by, tprintf("Size: %d", db_top));
@@ -3519 +3558 @@
-  char tbuf1[BUFFER_LEN];
-  dbref zone, obj;
-  char *p;
-  int j;
-
-  p = ctime(&mudtime);
-  p[strlen(p) - 1] = '\0';
-  if (p[8] == ' ')
-    p[8] = '0';
-
-  loc = Location(player);
@@ -3578 +3611 @@
-    }
-    clear_flag_internal(player, "CONNECTED");
-p
+show_time(mudtime, 0)
-  } else {
-    /* note: when you partially disconnect, ADISCONNECTS are not executed */
@@ -3811 +3844 @@
-
-
+/** Look up a DESC by character name or file descriptor.
+ * \param executor the dbref of the object calling the function calling this.
+ * \param name the name or descriptor to look up.
+ * \retval a pointer to the proper DESC, or NULL
+ */
-static DESC *
-lookup_desc(dbref executor, const char *name)
-{
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return NULL;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -3890 +3942 @@
-}
-
+FUNCTION(fun_terminfo)
+{
+  DESC *match;
+  if (!*args[0])
+    safe_str(T("#-1 FUNCTION REQUIRES ONE ARGUMENT"), buff, bp);
+  else if ((match = lookup_desc(executor, args[0]))) {
+    safe_str(match->ttype, buff, bp);
+    if (match->conn_flags & CONN_HTML)
+      safe_str(" pueblo", buff, bp);
+    if (match->conn_flags & CONN_TELNET)
+      safe_str(" telnet", buff, bp);
+  } else
+    safe_str(T(e_perm), buff, bp);
+}
-
-/* ARGSUSED */
@@ -3920 +3986 @@
-
-/* ARGSUSED */
+FUNCTION(fun_lports)
+{
+  DESC *d;
+  int first = 1;
+
+  if (!Priv_Who(executor)) {
+    safe_str(T(e_perm), buff, bp);
+    return;
+  }
+
+  DESC_ITER_CONN(d) {
+    if (first)
+      first = 0;
+    else
+      safe_chr(' ', buff, bp);
+    safe_integer(d->descriptor, buff, bp);
+  }
+}
+
+/* ARGSUSED */
-FUNCTION(fun_ports)
-{
@@ -3930 +4016 @@
-  int first;
-
-  if (!Priv_Who(executor)) {
-    notify(executor, T("Permission denied."));
-    return;
-  }
-  target = lookup_player(args[0]);
-  if (target == NOTHING) {
-    target = match_result(executor, args[0], TYPE_PLAYER,
-
-
-
+
+
+
+
+
-    return;
-  }
-
+
+
+
+
-  first = 1;
-  DESC_ITER_CONN(d) {
@@ -4264 +4351 @@
-  FILE *f;
-  DESC *d;
-
+ | RDBF_TTYPE
-  if (setjmp(db_err)) {
-    flag_broadcast(0, 0, T("GAME: Error writing reboot database!"));
@@ -4312 +4399 @@
-      putref(f, d->width);
-      putref(f, d->height);
+      putstring(f, d->ttype);
-    }               /* for loop */
-
@@ -4378 +4466 @@
-      d->width = getref(f);
-      d->height = getref(f);
-
+
+
+
+
+
+
+
+
-    d->input_chars = 0;
-    d->output_chars = 0;

1.7.7/src/chunk.c

@@ -278 +278 @@
-#define REGION_SIZE 65500
-
+/** Region capacity.
+ * This is the size minus the fixed region overhead.
+ */
+#define REGION_CAPACITY (REGION_SIZE - FIRST_CHUNK_OFFSET_IN_REGION)
+
-/** Maximum chunk length.
- * This is fairly arbitrary, but must be less than
-SIZE - FIRST_CHUNK_OFFSET_IN_REGION
+CAPACITY
- */
-#define MAX_CHUNK_LEN (16384-1)
@@ -299 +304 @@
- * Details in the migration discussion. */
-#define UNHAPPINESS_HARD 0
-16
+4
-#define UNHAPPINESS_MAYBE 32
-#define UNHAPPINESS_TWO 0
-16
+2
-#define UNHAPPINESS_ZERO 24
-#define UNHAPPINESS_SPACE_DIVISOR 1024
@@ -424 +429 @@
-        ((CHUNK_MEDIUM_LEN_MSB_MASK << 8) | CHUNK_MEDIUM_LEN_LSB_MASK)
-#define MAX_LONG_CHUNK_LEN \
-SIZE - FIRST_CHUNK_OFFSET_IN_REGION
+CAPACITY
-
-#define LenToFullLen(len) \
@@ -556 +561 @@
- * statistics
- */
-static int stat_used_count;     /**< How many chunks are used? */
-static int stat_used_bytes;     /**< How much chunk space is used,
-                                             including the headers? */
-static int stat_used_short_count;   /**< How many short chunks? */
-static int stat_used_short_bytes;   /**< How much space in short chunks? */
@@ -565 +567 @@
-static int stat_used_long_count;    /**< How many long chunks? */
-static int stat_used_long_bytes;    /**< How much space in long chunks? */
-static int stat_free_count;     /**< How many chunks are free? */
-static int stat_free_bytes;     /**< How many bytes in free chunks? */
-static int stat_free_fragmented;    /**< How much not in largest hole? */
-static int stat_deref_count;        /**< Dereferences this period */
-static int stat_deref_maxxed;       /**< Number of chunks with max derefs */
@@ -958 +957 @@
-    write_free_chunk(region, offset, full_len, next);
-    rp->free_count--;
-    stat_free_count--;
-    stat_free_fragmented -= rp->free_bytes - rp->largest_free_chunk;
-    if (rp->largest_free_chunk < full_len)
-      rp->largest_free_chunk = full_len;
-    stat_free_fragmented += rp->free_bytes - rp->largest_free_chunk;
-  }
-}
@@ -980 +976 @@
-  rp->used_count--;
-  rp->free_count++;
-  stat_free_fragmented -= rp->free_bytes - rp->largest_free_chunk;
-  rp->free_bytes += full_len;
-  if (rp->largest_free_chunk < full_len)
-    rp->largest_free_chunk = full_len;
-
-
-
-
+
-  if (ChunkIsShort(region, offset)) {
-    /* chunk is short */
@@ -1001 +993 @@
-    stat_used_long_bytes -= full_len;
-  }
-  stat_free_count++;
-  stat_free_bytes += full_len;
-
-  left = rp->in_memory->first_free;
@@ -1074 +1064 @@
-    stat_used_long_bytes += full_len;
-  }
-  stat_used_count++;
-  stat_used_bytes += full_len;
-
-  if (hole_len == full_len) {
-    rp->free_count--;
-    stat_free_fragmented -= rp->free_bytes - rp->largest_free_chunk;
-    rp->free_bytes -= full_len;
-    stat_free_count--;
-    stat_free_bytes -= full_len;
-    if (rp->in_memory->first_free == offset)
-      rp->in_memory->first_free = ChunkNextFree(region, offset);
@@ -1096 +1081 @@
-    if (rp->largest_free_chunk == hole_len)
-      rp->largest_free_chunk = largest_hole(region);
-    stat_free_fragmented += rp->free_bytes - rp->largest_free_chunk;
-    return offset;
-  }
@@ -1102 +1086 @@
-  ASSERT(hole_len >= full_len + MIN_REMNANT_LEN);
-  if (rp->in_memory->first_free == offset) {
-    stat_free_fragmented -= rp->free_bytes - rp->largest_free_chunk;
-    rp->free_bytes -= full_len;
-    stat_free_bytes -= full_len;
-    rp->in_memory->first_free += full_len;
-    write_free_chunk(region, offset + full_len,
@@ -1110 +1092 @@
-    if (rp->largest_free_chunk == hole_len)
-      rp->largest_free_chunk = largest_hole(region);
-    stat_free_fragmented += rp->free_bytes - rp->largest_free_chunk;
-    return offset;
-  } else {
-    stat_free_fragmented -= rp->free_bytes - rp->largest_free_chunk;
-    rp->free_bytes -= full_len;
-    stat_free_bytes -= full_len;
-    write_free_chunk(region, offset,
-             hole_len - full_len, ChunkNextFree(region, offset));
-    if (rp->largest_free_chunk == hole_len)
-      rp->largest_free_chunk = largest_hole(region);
-    stat_free_fragmented += rp->free_bytes - rp->largest_free_chunk;
-    return offset + hole_len - full_len;
-  }
@@ -1311 +1289 @@
-  regions[region].used_count = 0;
-  regions[region].free_count = 1;
-SIZE - FIRST_CHUNK_OFFSET_IN_REGION
+CAPACITY
-  regions[region].largest_free_chunk = regions[region].free_bytes;
-  regions[region].total_derefs = 0;
@@ -1321 +1299 @@
-  write_free_chunk(region, FIRST_CHUNK_OFFSET_IN_REGION,
-           regions[region].free_bytes, 0);
-
-  stat_free_count++;
-  stat_free_bytes += REGION_SIZE - FIRST_CHUNK_OFFSET_IN_REGION;
-
-  touch_cache_region(regions[region].in_memory);
@@ -2037 +2012 @@
-  const char *s;
-  int overhead;
+  int free_count = 0;
+  int free_bytes = 0;
+  int free_large = 0;
+  int used_count = 0;
+  int used_bytes = 0;
+  u_int_16 rid;
+
+  for (rid = 0; rid < region_count; rid++) {
+    free_count += regions[rid].free_count;
+    free_bytes += regions[rid].free_bytes;
+    free_large += regions[rid].largest_free_chunk;
+    used_count += regions[rid].used_count;
+  }
+  used_bytes = (REGION_CAPACITY * region_count) - free_bytes;
-
-  if (!GoodObject(player)) {
@@ -2046 +2035 @@
-  STAT_OUT(tprintf
-       ("Chunks:    %10d allocated (%10d bytes, %10d (%2d%%) overhead)",
-stat_used_count, stat_
-stat_used_bytes ? overhead * 100 / stat_
+used_count, 
+used_bytes ? overhead * 100 / 
-  overhead = stat_used_short_count * CHUNK_SHORT_DATA_OFFSET;
-  STAT_OUT(tprintf
@@ -2067 +2056 @@
-  STAT_OUT(tprintf
-       ("           %10d free      (%10d bytes, %10d (%2d%%) fragmented)",
-
-
-
+
+
-  STAT_OUT(tprintf("Regions:   %10d total, %8d cached",
-           region_count, cached_region_count));
-  overhead = region_count * REGION_SIZE + region_array_len * sizeof(Region);
-  STAT_OUT(tprintf("Storage:   %10d total (%2d%% saturation)",
-stat_
+
-  STAT_OUT(tprintf("Paging:    %10d out, %10d in",
-           stat_page_out, stat_page_in));
@@ -2088 +2076 @@
-  STAT_OUT(tprintf("             %10d fill inexact",
-           stat_migrate_fill_inexact));