annotate lib-src/make-dump-id.c @ 4967:0d4c9d0f6a8d

rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 20:51:18 -0600
parents ecf1ebac70d8
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
1 /* Generate a unique dump-id for use with the portable dumper.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
2 Copyright (C) 2000 Olivier Galibert, Martin Buchholz
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
3
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
4 This file is part of XEmacs.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
5
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
6 XEmacs is free software; you can redistribute it and/or modify it
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
7 under the terms of the GNU General Public License as published by the
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
8 Free Software Foundation; either version 2, or (at your option) any
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
9 later version.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
10
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
14 for more details.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
15
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
17 along with XEmacs; see the file COPYING. If not, write to
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
19 Boston, MA 02111-1307, USA. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
20
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
21 #include <config.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
22 #include <stdio.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
23 #include <stdlib.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
24 #include "../src/systime.h"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
25
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
26 #ifdef WIN32_NATIVE
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
27 #include <sys/timeb.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
28
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
29 /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
30 void
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
31 gettimeofday (struct timeval *tv, struct timezone *tz)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
32 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
33 struct _timeb tb;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
34 _ftime (&tb);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
35
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
36 tv->tv_sec = tb.time;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
37 tv->tv_usec = tb.millitm * 1000L;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
38 if (tz)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
39 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
40 tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
41 tz->tz_dsttime = tb.dstflag; /* type of dst correction */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
42 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
43 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
44 #endif
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
45
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
46 /* Generates an (extremely) pseudo random number for the dump-id */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
47 static unsigned int
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
48 generate_dump_id (void)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
49 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
50 EMACS_TIME thyme;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
51 EMACS_GET_TIME (thyme);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
52
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
53 return (unsigned int) (EMACS_SECS (thyme) ^ EMACS_USECS (thyme));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
54 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
55
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
56 int
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
57 main (int argc, char **argv)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
58 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
59 FILE *f;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
60
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
61 if ((f = fopen ("dump-id.c", "w")) == NULL)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
62 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
63 perror ("open dump-id.c");
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
64 return EXIT_FAILURE;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
65 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
66
1688
034a2ddf5b6b [xemacs-hg @ 2003-09-16 03:57:54 by james]
james
parents: 1663
diff changeset
67 /* dump_id is declared as extern "C" in dumper.h */
034a2ddf5b6b [xemacs-hg @ 2003-09-16 03:57:54 by james]
james
parents: 1663
diff changeset
68 fputs ("extern\n", f);
034a2ddf5b6b [xemacs-hg @ 2003-09-16 03:57:54 by james]
james
parents: 1663
diff changeset
69 fputs ("#ifdef __cplusplus\n", f);
034a2ddf5b6b [xemacs-hg @ 2003-09-16 03:57:54 by james]
james
parents: 1663
diff changeset
70 fputs ("\"C\"\n", f);
034a2ddf5b6b [xemacs-hg @ 2003-09-16 03:57:54 by james]
james
parents: 1663
diff changeset
71 fputs ("#endif\n", f);
034a2ddf5b6b [xemacs-hg @ 2003-09-16 03:57:54 by james]
james
parents: 1663
diff changeset
72 fputs ("unsigned int dump_id;\n", f);
460
223736d75acb Import from CVS: tag r21-2-45
cvs
parents: 442
diff changeset
73 fprintf (f, "unsigned int dump_id = %uU;\n", generate_dump_id ());
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
74
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
75 if ((fclose (f)) != 0)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
76 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
77 perror ("close dump-id.c");
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
78 return EXIT_FAILURE;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
79 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
80
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
81 return EXIT_SUCCESS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
82 }