Mercurial > hg > xemacs-beta
annotate lib-src/make-dump-id.c @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 16 Jan 2014 16:27:52 +0000 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 442 | 1 /* Generate a unique dump-id for use with the portable dumper. |
| 2 Copyright (C) 2000 Olivier Galibert, Martin Buchholz | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 442 | 7 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
8 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
9 option) any later version. |
| 442 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 442 | 18 |
| 19 #include <config.h> | |
| 20 #include <stdio.h> | |
| 21 #include <stdlib.h> | |
| 22 #include "../src/systime.h" | |
| 23 | |
| 24 #ifdef WIN32_NATIVE | |
| 25 #include <sys/timeb.h> | |
| 26 | |
| 27 /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */ | |
| 28 void | |
| 29 gettimeofday (struct timeval *tv, struct timezone *tz) | |
| 30 { | |
| 31 struct _timeb tb; | |
| 32 _ftime (&tb); | |
| 33 | |
| 34 tv->tv_sec = tb.time; | |
| 35 tv->tv_usec = tb.millitm * 1000L; | |
| 36 if (tz) | |
| 37 { | |
| 38 tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich */ | |
| 39 tz->tz_dsttime = tb.dstflag; /* type of dst correction */ | |
| 40 } | |
| 41 } | |
| 42 #endif | |
| 43 | |
| 44 /* Generates an (extremely) pseudo random number for the dump-id */ | |
| 45 static unsigned int | |
| 46 generate_dump_id (void) | |
| 47 { | |
| 48 EMACS_TIME thyme; | |
| 49 EMACS_GET_TIME (thyme); | |
| 50 | |
| 51 return (unsigned int) (EMACS_SECS (thyme) ^ EMACS_USECS (thyme)); | |
| 52 } | |
| 53 | |
| 54 int | |
| 2367 | 55 main (int argc, char **argv) |
| 442 | 56 { |
| 57 FILE *f; | |
| 58 | |
| 59 if ((f = fopen ("dump-id.c", "w")) == NULL) | |
| 60 { | |
| 61 perror ("open dump-id.c"); | |
| 62 return EXIT_FAILURE; | |
| 63 } | |
| 64 | |
| 1688 | 65 /* dump_id is declared as extern "C" in dumper.h */ |
| 66 fputs ("extern\n", f); | |
| 67 fputs ("#ifdef __cplusplus\n", f); | |
| 68 fputs ("\"C\"\n", f); | |
| 69 fputs ("#endif\n", f); | |
| 70 fputs ("unsigned int dump_id;\n", f); | |
| 460 | 71 fprintf (f, "unsigned int dump_id = %uU;\n", generate_dump_id ()); |
| 442 | 72 |
| 73 if ((fclose (f)) != 0) | |
| 74 { | |
| 75 perror ("close dump-id.c"); | |
| 76 return EXIT_FAILURE; | |
| 77 } | |
| 78 | |
| 79 return EXIT_SUCCESS; | |
| 80 } |