Mercurial > hg > xemacs-beta
annotate modules/postgresql/postgresql.h @ 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 | 8bda66cd0414 |
| children |
| rev | line source |
|---|---|
| 996 | 1 /* |
| 2 postgresql.h -- Emacs Lisp binding to libpq.so | |
| 3 Copyright (C) 2000 Electrotechnical Laboratory, JAPAN. | |
| 4 Licensed to the Free Software Foundation. | |
| 5 | |
| 3820 | 6 Author: SL Baur <steve@xemacs.org> |
| 7 Maintainer: SL Baur <steve@xemacs.org> | |
| 996 | 8 |
|
5425
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
9 This file is part of XEmacs. |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
10 |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
11 XEmacs is free software: you can redistribute it and/or modify it |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
12 under the terms of the GNU General Public License as published by the |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
13 Free Software Foundation, either version 3 of the License, or (at your |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
14 option) any later version. |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
15 |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
16 XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
17 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
18 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
19 for more details. |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
20 |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
21 You should have received a copy of the GNU General Public License |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
22 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
|
8bda66cd0414
Convert misc remaining files with GPLv2 or later to GPLv3 or later
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
23 |
| 996 | 24 Please send patches to this file to me first before submitting them to |
| 25 xemacs-patches. | |
| 26 */ | |
| 27 | |
| 28 #ifndef INCLUDED_postgresql_h_ | |
| 29 #define INCLUDED_postgresql_h_ 1 | |
| 30 | |
| 31 #define message message_ /* Yuck */ | |
| 32 #include LIBPQ_FE_H_FILE /* main PostgreSQL header file */ | |
| 33 #undef message | |
| 34 | |
| 35 #define BLCKSZ 8192 /* size of a default Postgres disk block */ | |
| 36 /* | |
| 37 This file contains the GCC bug workaround code for the private | |
| 38 LRECORD types. | |
| 39 */ | |
| 40 | |
| 41 /* PGconn is an opaque object and we need to be able to store them in | |
| 42 Lisp code because libpq supports multiple connections. | |
| 43 */ | |
| 44 struct Lisp_PGconn | |
| 45 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
46 NORMAL_LISP_OBJECT_HEADER header; |
| 996 | 47 PGconn *pgconn; |
| 48 }; | |
| 49 typedef struct Lisp_PGconn Lisp_PGconn; | |
| 50 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3820
diff
changeset
|
51 DECLARE_LISP_OBJECT (pgconn, Lisp_PGconn); |
| 996 | 52 |
| 53 #define XPGCONN(x) XRECORD (x, pgconn, Lisp_PGconn) | |
| 54 #define wrap_pgconn(p) wrap_record (p, pgconn) | |
| 55 #define PGCONNP(x) RECORDP (x, pgconn) | |
| 56 #define CHECK_PGCONN(x) CHECK_RECORD (x, pgconn) | |
| 57 #define CONCHECK_PGCONN(x) CONCHECK_RECORD (x, pgconn) | |
| 58 | |
| 59 /****/ | |
| 60 | |
| 61 /* PGresult is an opaque object and we need to be able to store them in | |
| 62 Lisp code. | |
| 63 */ | |
| 64 struct Lisp_PGresult | |
| 65 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
66 NORMAL_LISP_OBJECT_HEADER header; |
| 996 | 67 PGresult *pgresult; |
| 68 }; | |
| 69 typedef struct Lisp_PGresult Lisp_PGresult; | |
| 70 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3820
diff
changeset
|
71 DECLARE_LISP_OBJECT (pgresult, Lisp_PGresult); |
| 996 | 72 |
| 73 #define XPGRESULT(x) XRECORD (x, pgresult, Lisp_PGresult) | |
| 74 #define wrap_pgresult(p) wrap_record (p, pgresult) | |
| 75 #define PGRESULTP(x) RECORDP (x, pgresult) | |
| 76 #define CHECK_PGRESULT(x) CHECK_RECORD (x, pgresult) | |
| 77 #define CONCHECK_PGRESULT(x) CONCHECK_RECORD (x, pgresult) | |
| 78 | |
| 79 #endif /* INCLUDED_postgresql_h_ */ |