Mercurial > hg > xemacs-beta

diff src/elhash.c @ 2421:ab71ad6ff3dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-12-06 03:50:53 by ben] (none) README.packages: Document use of --package-prefix. Fix error in specifying standard package location. make-docfile.c: Use QXE_PATH_MAX. info.el: Correct doc string giving example package path. menubar-items.el: Move Prefix Rectangle command up one level. xemacs/packages.texi: Add long form of Lisp Reference Manual to links. Add links pointing to Lisp Reference Manual for more detailed package discussion. lispref/range-tables.texi: Document range-table changes. internals/internals.texi: Update history section. elhash.c, elhash.h, profile.c: Create inchash_eq() to allow direct incrementing of hash-table entry. Use in profile.c to try to reduce profiling overhead. Increase initial size of profile hash tables to reduce profiling overhead. buffer.c, device-msw.c, dialog-msw.c, dired-msw.c, editfns.c, event-msw.c, events.c, glyphs-msw.c, keymap.c, objects-msw.c, process-nt.c, syswindows.h, text.c, text.h, unexnt.c: Rename xetcs* -> qxetcs* for consistency with qxestr*. Rename ei*_c(_*) -> ei*_ascii(_*) since they work with ASCII-only strings not "C strings", whatever those are. This is the last place where "c" was incorrectly being used for "ascii". dialog-msw.c, dumper.c, event-msw.c, fileio.c, glyphs-gtk.c, glyphs-x.c, nt.c, process-nt.c, realpath.c, sysdep.c, sysfile.h, unexcw.c, unexnext.c, unexnt.c: Try to avoid differences in systems that do or do not include final null byte in PATH_MAX. Create PATH_MAX_INTERNAL and PATH_MAX_EXTERNAL and use them everywhere. Rewrite code in dumper.c to avoid use of PATH_MAX. When necessary in nt.c, use _MAX_PATH instead of MAX_PATH to be consistent with other places. text.c: Code to short-circuit when binary or Unicode was not working due to EOL wrapping. Fix this code to work when either no EOL autodetection or no CR's or LF's in the text. lisp.h, rangetab.c, rangetab.h, regex.c, search.c: Implement different types of ranges (open/closed start and end). Change default to be start-closed, end-open.
author ben
date Mon, 06 Dec 2004 03:52:23 +0000
parents ecf1ebac70d8
children 3d8143fc88e1
line wrap: on
line diff
--- a/src/elhash.c	Mon Dec 06 03:46:07 2004 +0000
+++ b/src/elhash.c	Mon Dec 06 03:52:23 2004 +0000
@@ -1,6 +1,6 @@
 /* Implementation of the hash table lisp object type.
    Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 2002 Ben Wing.
+   Copyright (C) 1995, 1996, 2002, 2004 Ben Wing.
    Copyright (C) 1997 Free Software Foundation, Inc.
 
 This file is part of XEmacs.
@@ -402,9 +402,7 @@
   if (print_readably)
     write_c_string (printcharfun, ")");
   else
-    {
-      write_fmt_string (printcharfun, " 0x%x>", ht->header.uid);
-    }
+    write_fmt_string (printcharfun, " 0x%x>", ht->header.uid);
 }
 
 static void
@@ -790,12 +788,8 @@
   Lisp_Object weakness	       = Qnil;
   Lisp_Object data	       = Qnil;
 
-  while (!NILP (plist))
+  PROPERTY_LIST_LOOP_3 (key, value, plist)
     {
-      Lisp_Object key, value;
-      key   = XCAR (plist); plist = XCDR (plist);
-      value = XCAR (plist); plist = XCDR (plist);
-
       if      (EQ (key, Qtest))		    test	     = value;
       else if (EQ (key, Qsize))		    size	     = value;
       else if (EQ (key, Qrehash_size))	    rehash_size	     = value;
@@ -1065,6 +1059,35 @@
   return probe;
 }
 
+/* A version of Fputhash() that increments the value by the specified
+   amount and dispenses will all error checks.  Assumes that tables does
+   comparison using EQ.  Used by the profiling routines to avoid
+   overhead -- profiling overhead was being recorded at up to 15% of the
+   total time. */
+
+void
+inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset)
+{
+  Lisp_Hash_Table *ht = XHASH_TABLE (table);
+  htentry *entries = ht->hentries;
+  htentry *probe = entries + HASHCODE (key, ht);
+
+  LINEAR_PROBING_LOOP (probe, entries, ht->size)
+    if (EQ (probe->key, key))
+      break;
+
+  if (!HTENTRY_CLEAR_P (probe))
+    probe->value = make_int (XINT (probe->value) + offset);
+  else
+    {
+      probe->key   = key;
+      probe->value = make_int (offset);
+
+      if (++ht->count >= ht->rehash_count)
+	enlarge_hash_table (ht);
+    }
+}
+
 DEFUN ("gethash", Fgethash, 2, 3, 0, /*
 Find hash value for KEY in HASH-TABLE.
 If there is no corresponding value, return DEFAULT (which defaults to nil).