comparison src/profile.c @ 5191:71ee43b8a74d

Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API tests/ChangeLog addition: 2010-04-05 Aidan Kehoe <kehoea@parhasard.net> * automated/hash-table-tests.el: Test the new built-in #'equalp hash table test. Test #'define-hash-table-test. * automated/lisp-tests.el: When asserting that two objects are #'equalp, also assert that their #'equalp-hash is identical. man/ChangeLog addition: 2010-04-03 Aidan Kehoe <kehoea@parhasard.net> * lispref/hash-tables.texi (Introduction to Hash Tables): Document that we now support #'equalp as a hash table test by default, and mention #'define-hash-table-test. (Working With Hash Tables): Document #'define-hash-table-test. src/ChangeLog addition: 2010-04-05 Aidan Kehoe <kehoea@parhasard.net> * elhash.h: * elhash.c (struct Hash_Table_Test, lisp_object_eql_equal) (lisp_object_eql_hash, lisp_object_equal_equal) (lisp_object_equal_hash, lisp_object_equalp_hash) (lisp_object_equalp_equal, lisp_object_general_hash) (lisp_object_general_equal, Feq_hash, Feql_hash, Fequal_hash) (Fequalp_hash, define_hash_table_test, Fdefine_hash_table_test) (init_elhash_once_early, mark_hash_table_tests, string_equalp_hash): * glyphs.c (vars_of_glyphs): Add a new hash table test in C, #'equalp. Make it possible to specify new hash table tests with functions define_hash_table_test, #'define-hash-table-test. Use define_hash_table_test() in glyphs.c. Expose the hash functions (besides that used for #'equal) to Lisp, for people writing functions to be used with #'define-hash-table-test. Call define_hash_table_test() very early in temacs, to create the built-in hash table tests. * ui-gtk.c (emacs_gtk_boxed_hash): * specifier.h (struct specifier_methods): * specifier.c (specifier_hash): * rangetab.c (range_table_entry_hash, range_table_hash): * number.c (bignum_hash, ratio_hash, bigfloat_hash): * marker.c (marker_hash): * lrecord.h (struct lrecord_implementation): * keymap.c (keymap_hash): * gui.c (gui_item_id_hash, gui_item_hash): * glyphs.c (image_instance_hash, glyph_hash): * glyphs-x.c (x_image_instance_hash): * glyphs-msw.c (mswindows_image_instance_hash): * glyphs-gtk.c (gtk_image_instance_hash): * frame-msw.c (mswindows_set_title_from_ibyte): * fontcolor.c (color_instance_hash, font_instance_hash): * fontcolor-x.c (x_color_instance_hash): * fontcolor-tty.c (tty_color_instance_hash): * fontcolor-msw.c (mswindows_color_instance_hash): * fontcolor-gtk.c (gtk_color_instance_hash): * fns.c (bit_vector_hash): * floatfns.c (float_hash): * faces.c (face_hash): * extents.c (extent_hash): * events.c (event_hash): * data.c (weak_list_hash, weak_box_hash): * chartab.c (char_table_entry_hash, char_table_hash): * bytecode.c (compiled_function_hash): * alloc.c (vector_hash): Change the various object hash methods to take a new EQUALP parameter, hashing appropriately for #'equalp if it is true.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 05 Apr 2010 13:03:35 +0100
parents 6c6d78781d59
children c096d8051f89 308d34e9f07d
comparison
equal deleted inserted replaced
5190:1c1d8843de5e 5191:71ee43b8a74d
136 create_profile_tables (void) 136 create_profile_tables (void)
137 { 137 {
138 create_timing_profile_table (); 138 create_timing_profile_table ();
139 if (NILP (Vtotal_timing_profile_table)) 139 if (NILP (Vtotal_timing_profile_table))
140 Vtotal_timing_profile_table = 140 Vtotal_timing_profile_table =
141 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); 141 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, Qeq);
142 if (NILP (Vcall_count_profile_table)) 142 if (NILP (Vcall_count_profile_table))
143 Vcall_count_profile_table = 143 Vcall_count_profile_table =
144 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); 144 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, Qeq);
145 if (NILP (Vgc_usage_profile_table)) 145 if (NILP (Vgc_usage_profile_table))
146 Vgc_usage_profile_table = 146 Vgc_usage_profile_table =
147 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); 147 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, Qeq);
148 if (NILP (Vtotal_gc_usage_profile_table)) 148 if (NILP (Vtotal_gc_usage_profile_table))
149 Vtotal_gc_usage_profile_table = 149 Vtotal_gc_usage_profile_table =
150 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); 150 make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, Qeq);
151 } 151 }
152 152
153 static Lisp_Object 153 static Lisp_Object
154 current_profile_function (void) 154 current_profile_function (void)
155 { 155 {
474 static Lisp_Object 474 static Lisp_Object
475 copy_hash_table_or_blank (Lisp_Object table) 475 copy_hash_table_or_blank (Lisp_Object table)
476 { 476 {
477 return !NILP (table) ? Fcopy_hash_table (table) : 477 return !NILP (table) ? Fcopy_hash_table (table) :
478 make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, 478 make_lisp_hash_table (100, HASH_TABLE_NON_WEAK,
479 HASH_TABLE_EQ); 479 Qeq);
480 } 480 }
481 481
482 DEFUN ("get-profiling-info", Fget_profiling_info, 0, 0, 0, /* 482 DEFUN ("get-profiling-info", Fget_profiling_info, 0, 0, 0, /*
483 Return the currently recorded profiling info. 483 Return the currently recorded profiling info.
484 The format is a plist of symbols describing type of info recorded and 484 The format is a plist of symbols describing type of info recorded and
513 Lisp_Object retv; 513 Lisp_Object retv;
514 int depth = internal_bind_int (&in_profiling, 1 + in_profiling); 514 int depth = internal_bind_int (&in_profiling, 1 + in_profiling);
515 const void *overhead; 515 const void *overhead;
516 516
517 closure.timing = 517 closure.timing =
518 make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); 518 make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, Qequal);
519 519
520 if (big_profile_table) 520 if (big_profile_table)
521 { 521 {
522 int count = internal_bind_int ((int *) &profiling_lock, 1); 522 int count = internal_bind_int ((int *) &profiling_lock, 1);
523 maphash (get_profiling_info_timing_maphash, big_profile_table, &closure); 523 maphash (get_profiling_info_timing_maphash, big_profile_table, &closure);