From a5a0310d8e9d7176bb17e91c916272006a871016 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 30 Sep 1997 17:10:40 +0000 Subject: Update. 1997-09-30 18:03 Ulrich Drepper * Makerules: Undo last change. * csu/Makefile: Define before-compile at the right place. * aclocal.m4: Remove a.out file created by assembler test. * set-init.c: Find set-hooks.h using <...>. Update to db 2.3.10. * db2/Makefile: Update. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_page.h: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/txn.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_register.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * elf/link.h: Define struct libname_list outside struct link_map to not confuse C++ compilers. * include/features.h: Recognize _XOPEN_SOURCE == 500 and set __USE_UNIX98. * manual/creature.texi: Explain this. * libc.map: Add new functions. * libio/Makefile (routines): Add fseeko and ftello. * libio/ftello.c: New file. * libio/fseeko.c: New file. * libio/stdio.h: Add prototypes for new functions. * manual/stdio.texi: Document fseeko and ftello. * posix/Makefile (routines): Add pread and pwrite. * sysdeps/posix/pread.c: New file. * sysdeps/posix/pwrite.c: New file. * sysdeps/stub/pread.c: New file. * sysdeps/stub/pwrite.c: New file. * posix/unistd.h: Add prototypes for pread and pwrite. Pretty print header. Define gid_t, uid_t, off_t, pid_t if __USE_UNIX98. Declare ctermid and cuserid if __USE_UNIX98. (swab): Change to take void * arguments. * string/swab.c: Change parameter to void *. * posix/sys/types: Define gid_t, uid_t, off_t, pid_t only if not already happened. * manual/llio.texi: Document pread and pwrite. * string/strings.h: Don't simply include string.h. Define BSD functions according to Unix98. * stdlib/tst-strtol.c: Include not . * sunrpc/clnt_simp.c: Likewise. * malloc/Makefile (aux): Add set-freeres. * malloc/mtrace.c: Define function release_libc_mem which calls the __libc_subfreeres handler. (mtrace): Register release_libc_mem. * malloc/set-freeres.c: New file. * intl/dcgettext.c: Define free_mem function and add to __libc_subfreeres list. * intl/finddomain.c: Likewise. * intl/gettextP.h (struct loaded_domain): Add new fields use_mmap and mmap_size. Add prototype for _nl_unloaded_domain. * intl/loadmsgcat.c: Define new function _nl_unload_domain. (_nl_load_domain): Store informaiton about mmap use and file size. * intl/localealias.c (read_alias_file): Optimize locale alias file reading by avoid frequen mallocs. Define free_mem function and add to __libc_subfreeres list. * locale/localeinfo.h: Make a difference between MAX_USAGE_COUNT and undeletable. Add prototype for _nl_unload_locale. * locale/C-collate: Mark data as undeletable by using UNDELETABLE. * locale/C-ctype: Likewise. * locale/C-messages: Likewise. * locale/C-monetary: Likewise. * locale/C-numeric: Likewise. * locale/C-time: Likewise. * locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Handle MAX_USAGE_COUNT and UNDELETABLE. (free_mem): New function. Add it to __libc_subfreeres list. * locale/loadlocale.c: Define _nl_unload_locale function. * misc/hsearch.c: Register hdestroy in __libc_subfreeres list. * stdlib/fmtmsg.c (addseverity): Handle illegal severity arguments correctly Define free_mem function and add to __libc_subfreeres list. * locale/programs/localedef.c (options): short form os verbose is v. Reported by Andreas Jaeger. * misc/sys/select.h: Define pselect only is __USE_POSIX since this header is used in some others as well for historical reasons. * resolv/resolv.h: Include to make self-contained. * string/bits/string2.h: Add missing braces and optimize strcmp a bit more. * sysdeps/i386/i486/bits/string.h: Likewise. * sunrpc/rpc/auth_des.h: Include rpc/auth.h to be self-contained. Pretty print. * sysdeps/mach/hurd/cthreads.c: Add copyright text. * sysdeps/unix/sysv/linux/syscalls.list: Correct prctl entry. * sysdeps/unix/sysv/linux/sys/mman.h: Get definition of size_t. * time/time.h: Pretty print. 1997-09-29 Paul Eggert * time/strftime.c: Synchronize with GNU Emacs strftime.c. (HAVE_MEMCPY): Define if emacs is defined and HAVE_BCOPY isn't. (gmtime_r, localtime_r): Undef before defining. (iso_week_days): Use __inline__, not inline. 1997-09-27 Andreas Schwab * sysdeps/m68k/fpu/bits/mathinline.h: Rename exp2{,l,f} to __ieee754_exp2{,l,f}. * sysdeps/m68k/fpu/s_exp2.c: Likewise. * sysdeps/m68k/fpu/s_exp2l.c: Likewise. * sysdeps/m68k/fpu/s_exp2f.c: Likewise. 1997-09-27 Andreas Schwab * elf/soinit.c (__EH_FRAME_BEGIN__): Don't make the .eh_frame section read-only, it contains relocations. * elf/sofini.c (__FRAME_END__): Likewise. 1997-09-29 03:08 Ulrich Drepper * sysdeps/i386/i486/bits/string.h [__PIC__] (__strspn_cg, __strcspn_cg, __strpbrk_cg, __strstr_cg): Optimize even more. No spill register needed. Patch by NIIBE Yutaka . 1997-09-28 08:27 Thorsten Kukuk * nis/nis_call.c (__do_niscall2): Fix return code, add missing break in switch case. * nis/nis_mkdir.c: Fix return codes to match Solaris version. * nis/nis_rmdir.c: Likewise. * nis/rpcsvc/yp_prot.h: Rename struct keydat to struct keydat_t for C++. 1997-09-28 04:32 Ulrich Drepper * configure.in: Fix typo. Patch by Zack Weinberg . 1997-09-25 20:14 Philip Blundell * sysdeps/unix/sysv/linux/scsi/sg.h: New file. * sysdeps/unix/sysv/linux/Makefile: Install . --- locale/C-collate.c | 2 +- locale/C-ctype.c | 2 +- locale/C-messages.c | 2 +- locale/C-monetary.c | 2 +- locale/C-numeric.c | 2 +- locale/C-time.c | 2 +- locale/findlocale.c | 27 +++++++++++++++++++++++++-- locale/loadlocale.c | 11 +++++++++++ locale/localeinfo.h | 6 +++++- locale/programs/localedef.c | 2 +- 10 files changed, 48 insertions(+), 10 deletions(-) (limited to 'locale') diff --git a/locale/C-collate.c b/locale/C-collate.c index 5c049e1f59..ba85002d5c 100644 --- a/locale/C-collate.c +++ b/locale/C-collate.c @@ -147,7 +147,7 @@ const struct locale_data _nl_C_LC_COLLATE = { _nl_C_name, NULL, 0, 0, /* no file mapped */ - MAX_USAGE_COUNT, + UNDELETABLE, 21, { { word: 0 }, diff --git a/locale/C-ctype.c b/locale/C-ctype.c index 6a1c3fc7be..851b95fd98 100644 --- a/locale/C-ctype.c +++ b/locale/C-ctype.c @@ -342,7 +342,7 @@ const struct locale_data _nl_C_LC_CTYPE = { _nl_C_name, NULL, 0, 0, /* no file mapped */ - MAX_USAGE_COUNT, + UNDELETABLE, 15, { { string: _nl_C_LC_CTYPE_class }, diff --git a/locale/C-messages.c b/locale/C-messages.c index 70eeb8cc80..0363020476 100644 --- a/locale/C-messages.c +++ b/locale/C-messages.c @@ -28,7 +28,7 @@ const struct locale_data _nl_C_LC_MESSAGES = { _nl_C_name, NULL, 0, 0, /* no file mapped */ - MAX_USAGE_COUNT, + UNDELETABLE, 4, { { string: "^[yY]" }, diff --git a/locale/C-monetary.c b/locale/C-monetary.c index 8dd361a2e0..0133319740 100644 --- a/locale/C-monetary.c +++ b/locale/C-monetary.c @@ -31,7 +31,7 @@ const struct locale_data _nl_C_LC_MONETARY = { _nl_C_name, NULL, 0, 0, /* no file mapped */ - MAX_USAGE_COUNT, + UNDELETABLE, 15, { { string: "" }, diff --git a/locale/C-numeric.c b/locale/C-numeric.c index a456214213..d42c5266be 100644 --- a/locale/C-numeric.c +++ b/locale/C-numeric.c @@ -31,7 +31,7 @@ const struct locale_data _nl_C_LC_NUMERIC = { _nl_C_name, NULL, 0, 0, /* no file mapped */ - MAX_USAGE_COUNT, + UNDELETABLE, 3, { { string: "." }, diff --git a/locale/C-time.c b/locale/C-time.c index 095d097e2b..673d9bd478 100644 --- a/locale/C-time.c +++ b/locale/C-time.c @@ -26,7 +26,7 @@ const struct locale_data _nl_C_LC_TIME = { _nl_C_name, NULL, 0, 0, /* no file mapped */ - MAX_USAGE_COUNT, + UNDELETABLE, 54, { { string: "Sun" }, diff --git a/locale/findlocale.c b/locale/findlocale.c index c027968530..b651dbaaad 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -176,7 +176,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, /* Increment the usage count. */ if (((struct locale_data *) locale_file->data)->usage_count - != MAX_USAGE_COUNT) + < MAX_USAGE_COUNT) ++((struct locale_data *) locale_file->data)->usage_count; return (struct locale_data *) locale_file->data; @@ -213,7 +213,7 @@ _nl_remove_locale (int locale, struct locale_data *data) permanent. */ if (__munmap ((caddr_t) data->filedata, data->filesize) != 0) { - data->usage_count = MAX_USAGE_COUNT; + data->usage_count = UNDELETABLE; return; } } @@ -225,3 +225,26 @@ _nl_remove_locale (int locale, struct locale_data *data) free (data); } } + +static void __attribute__ ((unused)) +free_mem (void) +{ + int locale; + + for (locale = 0; locale < LC_ALL; ++locale) + { + struct loaded_l10nfile *runp = locale_file_list[locale]; + + while (runp != NULL) + { + struct loaded_l10nfile *here = runp; + struct locale_data *data = (struct locale_data *) runp->data; + + if (data != NULL && data->usage_count != UNDELETABLE) + _nl_unload_locale (data); + runp = runp->next; + free (here); + } + } +} +text_set_element (__libc_subfreeres, free_mem); diff --git a/locale/loadlocale.c b/locale/loadlocale.c index 15570c36d1..3ac161eb3a 100644 --- a/locale/loadlocale.c +++ b/locale/loadlocale.c @@ -221,3 +221,14 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) __close (fd); file->data = newdata; } + +void +_nl_unload_locale (struct locale_data *locale) +{ + if (locale->mmaped) + __munmap ((caddr_t) locale->filedata, locale->filesize); + else + free ((void *) locale->filedata); + + free (locale); +} diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 29731fa4c6..f50565c54a 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -38,7 +38,8 @@ /* We use a special value for the usage counter in `locale_data' to signal that this data must never be removed anymore. */ -#define MAX_USAGE_COUNT UINT_MAX +#define MAX_USAGE_COUNT (UINT_MAX - 1) +#define UNDELETABLE UINT_MAX /* Structure describing locale data in core for a category. */ struct locale_data @@ -135,6 +136,9 @@ extern struct locale_data *_nl_find_locale (const char *locale_path, /* Try to load the file described by FILE. */ extern void _nl_load_locale (struct loaded_l10nfile *file, int category); +/* Free all resource. */ +extern void _nl_unload_locale (struct locale_data *locale); + /* Free the locale and give back all memory if the usage count is one. */ extern void _nl_remove_locale (int locale, struct locale_data *data); diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 6290274a72..c511d4246c 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -108,7 +108,7 @@ static const struct argp_option options[] = { "posix", OPT_POSIX, NULL, 0, N_("Be strictly POSIX conform") }, { "quiet", OPT_QUIET, NULL, 0, N_("Suppress warnings and information messages") }, - { "verbose", 'V', NULL, 0, N_("Print more messages") }, + { "verbose", 'v', NULL, 0, N_("Print more messages") }, { NULL, 0, NULL, 0, NULL } }; -- cgit 1.4.1