From 5b330d6859b6a289d9593b0e300e2052ccf7a705 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Jan 2008 01:05:43 +0000 Subject: remove now-unused files (per akira) git-svn-id: svn://tug.org/texlive/trunk@6364 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 2 + Build/source/texk/kpathsea/remote.h | 29 -- Build/source/texk/kpathsea/win32.mak | 359 ---------------- Build/source/texk/kpathsea/win32hash.c | 760 --------------------------------- 4 files changed, 2 insertions(+), 1148 deletions(-) delete mode 100644 Build/source/texk/kpathsea/remote.h delete mode 100644 Build/source/texk/kpathsea/win32.mak delete mode 100644 Build/source/texk/kpathsea/win32hash.c diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 1a95fffbe41..4eb5c8cfd3a 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,5 +1,7 @@ 2008-01-21 Karl Berry + * kpsewhich.c, kpathsea.texi: document --all and --subdir. + * db.c through tex-file.c: replace FSF physical address with url. 2008-01-18 Karl Berry diff --git a/Build/source/texk/kpathsea/remote.h b/Build/source/texk/kpathsea/remote.h deleted file mode 100644 index 3938ac869a8..00000000000 --- a/Build/source/texk/kpathsea/remote.h +++ /dev/null @@ -1,29 +0,0 @@ -/* remote.h: declarations for retrieving remote files - -Copyright (C) 1994, 95 Karl Berry. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef REMOTE_H -#define REMOTE_H - -#ifdef HAVE_GETURL -#include - -extern KPSEDLL string get_remote_file(const_string); -extern void cleanup_remote_files(); -#endif - -#endif /* REMOTE_H */ diff --git a/Build/source/texk/kpathsea/win32.mak b/Build/source/texk/kpathsea/win32.mak deleted file mode 100644 index cd9fe7a6a4d..00000000000 --- a/Build/source/texk/kpathsea/win32.mak +++ /dev/null @@ -1,359 +0,0 @@ -################################################################################ -# -# Makefile : Web2C / Kpathsea -# Author : Fabrice Popineau -# Platform : Win32, Microsoft VC++ 6.0, depends upon fpTeX 0.5 sources -# Time-stamp: <03/06/22 01:11:48 popineau> -# -################################################################################ -root_srcdir=..\.. -!ifdef DEVELOPMENT -INCLUDE=$(INCLUDE);$(root_srcdir)\texk.development -!else -INCLUDE=$(INCLUDE);$(root_srcdir)\texk -!endif - -# Add -DNO_DEBUG to disable debugging, for vanishingly better performance. - -USE_KPATHSEA = 1 -USE_GNUW32 = 1 -MAKE_KPATHSEA = 1 -USE_GETURL = 1 -USE_REGEX = 1 -USE_GSW32 = 1 -USE_INET = 1 -#USE_NETWORK = 1 -#USE_NETWORK2 = 1 -# USE_MKTEX = 1 - -!include - -kpathseadir=. - -{$(root_srcdir)/libs/libgnuw32}.c{$(objdir)}.obj: - $(compile) $< - -{$(root_srcdir)/libs/regex}.c{$(objdir)}.obj: - $(compile) $< - -DEFS = $(DEFS) -DHAVE_CONFIG_H -DHAVE_GETURL \ - -DNO_MULTIPLE_EXTENSIONS -UNORMALIZED \ - -DHASH_SHARED -DHASH_MAPPING_NAME=\"$(library_prefix)_hash_mapping\" - -# Put $(objdir)\tex-file.obj first, because it's what depends on the paths, and may -# reduce frustration if the paths are wrong by doing it first. - -objects = $(objdir)\tex-file.obj \ - $(objdir)\absolute.obj \ - $(objdir)\atou.obj \ - $(objdir)\cnf.obj \ - $(objdir)\concat.obj \ - $(objdir)\concat3.obj \ - $(objdir)\concatn.obj \ - $(objdir)\db.obj \ - $(objdir)\debug.obj \ - $(objdir)\dir.obj \ - $(objdir)\elt-dirs.obj \ - $(objdir)\expand.obj \ - $(objdir)\extend-fname.obj \ - $(objdir)\find-suffix.obj \ - $(objdir)\fn.obj \ - $(objdir)\fontmap.obj \ - $(objdir)\getopt.obj \ - $(objdir)\getopt1.obj \ - $(objdir)\hash.obj \ - $(objdir)\win32hash.obj \ - $(objdir)\kdefault.obj \ - $(objdir)\line.obj \ - $(objdir)\magstep.obj \ - $(objdir)\make-suffix.obj \ - $(objdir)\path-elt.obj \ - $(objdir)\pathsearch.obj \ - $(objdir)\proginit.obj \ - $(objdir)\progname.obj \ - $(objdir)\readable.obj \ - $(objdir)\remote.obj \ - $(objdir)\rm-suffix.obj \ - $(objdir)\str-list.obj \ - $(objdir)\str-llist.obj \ - $(objdir)\tex-glyph.obj \ - $(objdir)\tex-hush.obj \ - $(objdir)\tex-make.obj \ - $(objdir)\tilde.obj \ - $(objdir)\truncate.obj \ - $(objdir)\uppercasify.obj \ - $(objdir)\variable.obj \ - $(objdir)\version.obj \ - $(objdir)\xbasename.obj \ - $(objdir)\xcalloc.obj \ - $(objdir)\xdirname.obj \ - $(objdir)\xfopen.obj \ - $(objdir)\xfseek.obj \ - $(objdir)\xftell.obj \ - $(objdir)\xgetcwd.obj \ - $(objdir)\xmalloc.obj \ - $(objdir)\xputenv.obj \ - $(objdir)\xrealloc.obj \ - $(objdir)\xstrdup.obj \ - $(liblobjs) \ - $(malloc) - -liblobjs = \ - $(objdir)\error.obj \ - $(objdir)\lookcmd.obj \ - $(objdir)\stat.obj \ - $(objdir)\system.obj \ - $(objdir)\popen.obj \ -# $(objdir)\dirent.obj \ - $(objdir)\user.obj \ - $(objdir)\time.obj \ - $(objdir)\volume.obj \ - $(objdir)\filename.obj \ - $(objdir)\home.obj - -programs = \ - $(objdir)\kpsewhich.exe \ - $(objdir)\kpsecheck.exe \ - $(objdir)\kpsestat.exe \ - $(objdir)\access.exe - -default: all - -all: $(objdir) $(kpathsea) $(programs) info man - -lib: $(objdir) $(kpathsealib) - -!ifdef KPSE_DLL -DEFS = $(DEFS) -DMAKE_KPSE_DLL - -$(kpathsealib): $(objects) - $(archive) /DEF $(objects) - -$(kpathseadll): $(objects) $(objdir)\kpathsea.res $(geturllib) # $(mktexlib) - $(link_dll) $(**) $(kpathsealib:.lib=.exp) $(conlibs) -!else -$(kpathsealib): $(objects) $(geturllib) # $(mktexlib) - $(archive) $(**) -!endif - -$(objdir)\kpsewhich.exe: $(objdir)\kpsewhich.obj $(objdir)\kpsewhich.res $(kpathsealib) - $(link) $(**) $(conlibs) - -$(objdir)\kpsecheck.exe: $(objdir)\kpsecheck.obj $(objdir)\fnmatch.obj $(gsw32lib) $(kpathsealib) - $(link) $(**) $(conlibs) - -$(objdir)\kpsestat.exe: $(objdir)\kpsestat.obj $(gnuw32lib) - $(link) $(**) $(conlibs) - -$(objdir)\access.exe: $(objdir)\access.obj - $(link) $(objdir)\access.obj $(conlibs) - -$(objdir)\kpsewhich.obj: kpsewhich.c - $(compile) -UMAKE_KPSE_DLL kpsewhich.c - -$(objdir)\kpsecheck.obj: kpsecheck.c - $(compile) -UMAKE_KPSE_DLL kpsecheck.c - -$(objdir)\kpsestat.obj: kpsestat.c - $(compile) -UMAKE_KPSE_DLL -UKPSE_DLL kpsestat.c - -$(objdir)\access.obj: access.c - $(compile) access.c - - -# Make variable substitutions for paths.h. -texmf.cnf: texmf.in texmf.sed - $(sed) -e "/^[^%]/s/:/;/g" texmf.in \ - | $(sed) -e "/^TEXMFMAIN/s/@texmf@/$$SELFAUTOPARENT\/texmf/" \ - | $(sed) -e "/^TEXMFCNF/s/\(.*\);[^;]*;\([^;]*\);@web2c@/\1;\2;@web2c@/" \ - | $(sed) -f texmf.sed \ -# Better to ensure c:/TeX is choosen, instead of e:/... -# | $(sed) -e "s%$(prefix:\=/)%c:/TeX%g" \ - >$@ - -# makevars.mk -- the directory names we pass. -# It's important that none of these values contain [ @%], for the sake -# of kpathsea/texmf.sed. -makevars = prefix=$(prefix) exec_prefix=$(exec_prefix) \ - bindir=$(bindir) scriptdir=$(scriptdir) libdir=$(libdir) \ - datadir=$(datadir) infodir=$(infodir) includedir=$(includedir) \ - manext=$(manext) mandir=$(mandir) \ - texmf=$(texmf) web2cdir=$(web2cdir) vartexfonts=$(vartexfonts)\ - texinputdir=$(texinputdir) mfinputdir=$(mfinputdir) mpinputdir=$(mpinputdir)\ - fontdir=$(fontdir) fmtdir=$(fmtdir) basedir=$(basedir) memdir=$(memdir) \ - texpooldir=$(texpooldir) mfpooldir=$(mfpooldir) mppooldir=$(mppooldir) \ - dvips_plain_macrodir=$(dvips_plain_macrodir) \ - dvilj_latex2e_macrodir=$(dvilj_latex2e_macrodir) \ - dvipsdir=$(dvipsdir) psheaderdir=$(psheaderdir) \ - default_texsizes="$(default_texsizes)" -# End of makevars.mk. - -# The idea is to turn each var=value into s%@var@%value%g. Seems simpler -# to put the substitutions in a file than to play shell quoting games. -texmf.sed: $(win32makedir)/paths.mak - -@$(del) texmf.sed - @echo < $@ -# Insert $TEXMF in as many of the hardwired paths as possible. We could -# use the slightly different rule 's%$(texmf)/%\$$TEXMF/%g' and avoid -# the need for the corrections below. But if texmf.in is edited -# the heuristic may no longer work. - echo s%$(texmf:\=/)%$$TEXMF%g>>$@ -# Now we repair the damage this may have caused. Don't replace the rhs of -# the TEXMFMAIN assignment itself, then we'd end up with TEXMFMAIN = $TEXMF -# and TEXMF = $TEXMFMAIN. The (commented) assignment of TEXMFLOCAL is -# likely to have been mangled as well. - echo /^ *TEXMFMAIN[ =]/s%\$$TEXMF%$(texmf:\=/)%>>$@ - echo /^[% ]*TEXMFLOCAL[ =]/s%\$$TEXMF%$(texmf:\=/)%>>$@ -# echo /^[% ]*TEXMF_CNF[ =]/s%\$$TEXMF%$(texmf:\=/)%>>$@ -# echo /^[% ]*TEXMFCNF[ =]/s%\$$TEXMF%$(texmf:\=/)%>>$@ -# And fill in the last clause of TEXMFCNF with an absolute path. - echo /^ *TEXMFCNF[ =]/s%@web2c@%$(web2cdir:\=/)%>>$@ - -@$(del) makevars.txt - -# First null out comments and leading/trailing whitespace, then remove -# lines that define invalid C identifiers, then remove blank lines and -# lines that define lowercase values (those are never path values). Each -# line remaining looks like -# = -# (but = and surrounding spaces are optional, hence can't remove all spaces). -# Change this to #ifndef DEFAULT_name@#define DEFAULT_name "value"@#endif, -# then change the @'s to newlines (sed isn't good at multiline replacements). -# -# No backslash-newline escapes in the long sed replacement because that -# will turn into a space in the output. -# -# Without the $TEXMF/prefix/etc. substitutions, if the cnf file was -# not found, the compile-time paths would be of little use, since TEXMF -# (etc.) wouldn't be defined. Alternatively, we could have a way to -# specify compile-time default values for variables in general, but I -# think it's better to keep the last-resort paths as simple as possible. -# -# The definition of DEFAULT_TEXMF (and other variables) -# that winds up in the final paths.h will not be used. -# -# We don't want to rewrite paths.h when we have only changed comments -# in texmf.in that have no effect on paths.h, since that would cause -# almost everything to be rebuilt. -# -# We also replace all semicolons with colons in the paths. Ultimately -# the path-splitting code should be changed to understand both. -$(kpathseadir)/paths.h: stamp-paths -stamp-paths: texmf.cnf - echo /* paths.h: Generated from texmf.cnf. */ > paths.tmp - $(sed) -e "s/%.*//" -e "s/^[ ]*//" -e "s/[ ]*$$//" texmf.cnf \ - | $(grep) "^[ ]*[A-Z0-9_]*[ =]" \ - | $(sed) "/^$$/d" \ - | $(sed) "s/^\([^ =]*\)[ ]*=*[ ]*\(.*\)/#ifndef DEFAULT_\1@#define DEFAULT_\1 \"\2\"@#endif/" \ - | $(tr) @ "\012" \ - | $(sed) -e "s@\$$TEXMFMAIN@$(texmf:\=/)@g" \ - -e "s@\$$TEXMF@$(texmf:\=/)@g" \ - -e "s@\$$VARTEXFONTS@c:/tex/fonts@g" \ - -e "s@\$$web2cdir@$(web2cdir:\=/)@g" \ - -e "s@\$$prefix@$(prefix:\=/)@g" \ -# Better to ensure c:/Program Files/TeXLive is choosen, instead of e:/... - -e "s@$(prefix:\=/)@c:/Program Files/TeXLive@g" \ -# | $(sed) -e "s%;%:%g" \ - >>paths.tmp -# fc paths.h paths.tmp > nul -# if %ERRORLEVEL% NEQ 0 \ -# echo copying paths.tmp paths.h\ -# & $(CP) paths.tmp paths.h -# $(del) paths.tmp - $(copy) paths.tmp paths.h & $(del) paths.tmp - date /t > stamp-paths - time /t >> stamp-paths - -!include - -# Need an extra definition for this. Dependencies included below. -$(objdir)\tex-file.obj: - $(compile) -DDEFAULT_FONT_SIZES=\"$(default_texsizes)\" tex-file.c - -check: $(objdir)\kpsewhich.exe - .\$(objdir)\kpsewhich -expand-var $$TEXMF - -install:: all install-exec install-data - -install-exec:: - -@$(mkdir) $(bindir) $(libdir) $(web2cdir) 2>nul - -@echo $(verbose) & for %i in ($(kpathseadll) $(programs)) do \ - $(copy) %i $(bindir) $(redir_stdout) - -install-data:: install-info install-doc install-man kpathsea.h -# Should we install the headers? They are not just system-dependent, -# which is bad enough, but even compiler-dependent. - -@$(mkdir) $(includedir)\kpathsea 2>nul - -@echo $(verbose) & for %f in (*.h) do \ - $(copy) %f $(includedir)\kpathsea $(redir_stdout) - -@$(del) $(includedir)\kpathsea\acconfig.h - -# I don't use this, but other programmers want it. acconfig.h is an -# autoheader input file, not an includable C header. Bad name. -kpathsea.h: always - -@$(del) $@ - @echo off <<$@ -#include -<," >>$@ -# touch -r `ls -1t *.h | tail +2 | head -1` $@ -always: -.PHONY: always - -# The manual pages -manfiles = access.1 kpsestat.1 kpsewhich.1 \ - mktexlsr.1 mktexmf.1 mktextfm.1 mktexpk.1 - -infofiles = kpathsea.info -docsubdir = kpathsea -pdfdocfiles = kpathsea.pdf -htmldocfiles = kpathsea.html - -!include - -info: kpathsea.info -dvi: kpathsea.dvi -ps: kpathsea.ps - -kpathsea.info: kpathsea.texi bugs.texi hier.texi install.texi unixtex.texi - -$(makeinfo) $(makeinfo_flags) kpathsea.texi -o $@ - -!IFDEF MAINT -INSTALL.txt: install.texi - $(makefinfo) $(one_info) $(MAKEINFO_FLAGS) install.texi -o $@ - $(perl) $(win32perldir)\add-info-toc.pl $@ - $(copy) $@ $(@:.txt=) $(redir_stderr) -BUGS: bugs.texi - $(makefinfo) $(one_info) $(MAKEINFO_FLAGS) bugs.texi -o $@ - $(perl) $(win32perldir)\add-info-toc.pl $@ -HIER: hier.texi - $(makefinfo) $(one_info) $(MAKEINFO_FLAGS) hier.texi -o $@ -unixtex.ftp: unixtex.texi - $(makefinfo) $(one_info) $(MAKEINFO_FLAGS) unixtex.texi -o $@ -doc: info dvi ps HIER BUGS INSTALL unixtex.ftp -!endif - -!include - -extraclean:: - -@echo $(verbose) & ($(del) kpathsea*.html kpathsea*.pdf) 2>nul - -distclean:: - -@$(del) paths.h texmf.cnf texmf.sed - -!include -!include "./depend.mak" - -# Local Variables: -# mode: Makefile -# End: diff --git a/Build/source/texk/kpathsea/win32hash.c b/Build/source/texk/kpathsea/win32hash.c deleted file mode 100644 index 1c1252b3797..00000000000 --- a/Build/source/texk/kpathsea/win32hash.c +++ /dev/null @@ -1,760 +0,0 @@ -/* hash.c: hash table operations. - -Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 Karl Berry & Olaf Weber. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include -#include - -#include -#include - -#ifdef HAVE_GETURL -#include -#endif - -/* The hash function. We go for simplicity here. */ - -/* All our hash tables are related to filenames. */ -#ifdef MONOCASE_FILENAMES -#if defined(WIN32) && !defined(__i386_pc_gnu__) -/* This is way faster under Win32. */ -#define TRANSFORM(x) ((unsigned)CharLower((LPTSTR)(BYTE)(x))) -#else -#define TRANSFORM(x) (tolower(x)) -#endif -#else -#define TRANSFORM(x) (x) -#endif - -#define MAX_HASH_TABLES 64 - -#define HASH_NULL(ptr) (ptr == hash_memory) -#define HASH_PTR(ptr) ((char *)hash_memory + (unsigned long)(ptr)) -#define HASH_REL(rel) ((unsigned long)((char *)(rel) - (char *)hash_memory)) -#define HASH_BUCKETS(table, n) (*((hash_element_type **)((char *)hash_memory + (unsigned long)table->buckets + (n) * sizeof(hash_element_type *)))) -/* #define HASH_BUCKETS(table, n) *((hash_element_type **)(HASH_PTR((unsigned long) ((hash_element_type **)HASH_PTR(table->buckets))[n]))) */ -HANDLE hash_handle = 0; -void *hash_memory = NULL; -static unsigned long hash_memory_allocated = 0; -unsigned long hash_memory_size = 8L*1024L*1024L; - -typedef struct _hash_memory_description { - unsigned long sig; - unsigned long memory_size; - unsigned long first_free_address; - unsigned long hash_offsets[MAX_HASH_TABLES]; - unsigned long db_dir_list_len; - unsigned long db_dir_list; -} hash_memory_description; - -hash_memory_description *hash_bloc; - -/* We need to protect initialisation and insert / lookup */ -static HANDLE hash_mutex; -static boolean hash_init_done = false; - -extern str_list_type db_dir_list; - -void hash_restore_str_list(unsigned long ptr, unsigned len, str_list_type *l); -void hash_save_str_list(str_list_type l); - -#if 0 -extern unsigned hash P2H(hash_table_type *table, const_string key); -#ifdef NORMALIZED -extern unsigned hash_normalized P2H(hash_table_type *table, const_string key); -#endif -#else -static unsigned -hash P2C(hash_table_type *, table, const_string, key) -{ - unsigned n = 0; - - // fprintf(stderr, "Hashing %s to ", key); - - /* Our keys aren't often anagrams of each other, so no point in - weighting the characters. */ - while (*key != 0) - n = (n + n + TRANSFORM (*key++)) % table->size; - - // fprintf(stderr, "%d\n", n); - - return n; -} - -#ifdef NORMALIZED -/* Identical has function as above, but does not normalize keys. */ -static unsigned -hash_normalized P2C(hash_table_type *, table, const_string, key) -{ - unsigned n = 0; - - // fprintf(stderr, "Hashing (normalized) %s to ", key); - - /* Our keys aren't often anagrams of each other, so no point in - weighting the characters. */ - while (*key != 0) - n = (n + n + (*key++)) % table->size; - - // fprintf(stderr, "%d\n", n); - - return n; -} -#endif -#endif - -/* - This function will be registered by atexit() to be called upon - program termination. It will free resources allocated for - hash-tables. It has to be registered only once, when the very first - hash-table is allocated. -*/ -void CDECL -hash_cleanup (void) -{ -#ifdef HAVE_GETURL - cleanup_remote_files(); -#endif - - if (hash_memory != NULL) { - if (UnmapViewOfFile(hash_memory) == 0) { - /* Report an error */ - WARNING2("Can't UnMapViewOfFile(%x) (Error %d)!\n", hash_memory, GetLastError()); - } - hash_memory = NULL; - } - - if (hash_handle) { - if (CloseHandle(hash_handle) == 0) { - /* Report an error */ - WARNING2("Can't CloseHandle(%x) (Error %d)!\n", hash_handle, GetLastError()); - } - hash_handle = NULL; - } - - if (hash_mutex) { - if (CloseHandle(hash_mutex) == 0) { - /* Report an error */ - WARNING2("Can't CloseHandle(%x) (Error %d)!\n", hash_mutex, GetLastError()); - } - hash_mutex = NULL; - } - -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_SHM)) - DEBUGF1("Cleaned up shared hash tables, %ld memory was allocated.\n", hash_memory_allocated); -#endif -} - -KPSEDLL boolean hash_init_needed = false; - -boolean -hash_lock(boolean force) -{ - int dwWaitResult; - - if (!force && !hash_init_done) - return true; - - /* Request ownership of mutex. */ - dwWaitResult = WaitForSingleObject(hash_mutex, 25000L); - - switch (dwWaitResult) { - /* The thread got mutex ownership. */ - case WAIT_OBJECT_0: - return true; - - /* Cannot get mutex ownership due to time-out. */ - case WAIT_TIMEOUT: - WARNING("Timeout waiting to lock shared memory access!\n"); - return false; - - /* Got ownership of the abandoned mutex object. */ - case WAIT_ABANDONED: - WARNING("Waiting to lock shared memory access abandoned!\n"); - return false; - } - - return false; -} - -void -hash_unlock(void) -{ - if (! hash_init_done) - return; - - if (ReleaseMutex(hash_mutex) == 0) { - FATAL2("%s: Can't ReleaseMutex() access to shared memory databases (Error %d)!\n", kpse_program_name, GetLastError()); - } -} - -static void -hash_start_init() -{ -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_SHM)) - DEBUGF1("%s: Start of shared hash tables initialisation.\n", kpse_program_name); -#endif - hash_lock(true); -} - -void -hash_end_init() -{ - hash_init_done = true; - hash_unlock(); - -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_SHM)) - DEBUGF1("%s: End of shared hash tables initialisation.\n", kpse_program_name); -#endif -} - -void -hash_init (void) -{ - SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; - - hash_init_done = false; - if ((hash_mutex = CreateMutex(NULL, FALSE, "kpse_initialization")) == 0) { - FATAL1("Can't CreateMutex() for shared memory locking (Error %d)!\n", GetLastError()); - } - - if ((hash_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, TRUE, HASH_MAPPING_NAME)) == 0) { - - hash_start_init(); - - /* First call, need to allocate memory. */ - if ((hash_handle = CreateFileMapping(INVALID_HANDLE_VALUE, &sa, PAGE_READWRITE, - 0, hash_memory_size, HASH_MAPPING_NAME)) == 0) { - /* Report an error. */ - FATAL2("Can't CreateFileMapping() of size %ul (Error %d)!\n", hash_memory_size, GetLastError()); - }; - atexit(hash_cleanup); - hash_init_needed = true; - } - - if ((hash_memory = MapViewOfFile(hash_handle, FILE_MAP_ALL_ACCESS, 0, 0, 0)) == NULL) { - /* Report an error. */ - FATAL2("Can't MapViewOfFile(%x) (Error %d)!\n", hash_handle, GetLastError()); - } - - hash_bloc = (hash_memory_description *)hash_memory; - if (hash_init_needed) { - /* Is it more efficient to zero the whole block first ? */ - ZeroMemory(hash_memory, sizeof(hash_bloc)); - hash_bloc->sig = sizeof(hash_memory_description); - hash_bloc->memory_size = hash_memory_size; - hash_bloc->first_free_address = sizeof(hash_memory_description); - } - else { - extern boolean first_search; - - hash_start_init(); - -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_SHM)) - DEBUGF1("Reusing shared hash tables at %x.\n", hash_memory); -#endif - - assert(hash_bloc->sig == sizeof(hash_memory_description)); - /* - We could be a little bit cleaner here, just - relying on the hashtable_instances enumeration. - */ - cnf_hash = (hash_table_type *)hash_exists_p(hashtable_cnf); - db = (hash_table_type *)hash_exists_p(hashtable_db); - alias_db = (hash_table_type *)hash_exists_p(hashtable_alias); - map = (hash_table_type *)hash_exists_p(hashtable_map); - link_table = (hash_table_type *)hash_exists_p(hashtable_links); - remote_db = (hash_table_type *)hash_exists_p(hashtable_remote); - - db_dir_list = str_list_init(); - /* Awful kludge ! */ - first_search = false; - hash_restore_str_list(hash_bloc->db_dir_list, hash_bloc->db_dir_list_len, &db_dir_list); - - } -} - -void -hash_reinit() -{ - if (!hash_init_needed) { - fprintf(stderr, "%s: your `ls-R' database files have been modified\n", kpse_program_name); - fprintf(stderr, "while kpathsea Dll was loaded by other programs.\n"); - fprintf(stderr, "It is recommended that you terminate all of them.\n"); - fprintf(stderr, "in order to reinitialize the shared databases.\n"); - } -} - -boolean -hash_extend_memory () -{ - /* We need to allocate a new memory bloc twice the size - of the previous one, copy everything and free the previous block. - */ - SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; - HANDLE new_hash_handle = 0; - void *new_hash_memory = NULL; - unsigned long new_hash_memory_size = 2 * hash_memory_size; - - assert(hash_memory != NULL); - - /* First, create some private unnamed bloc */ - if ((new_hash_handle = CreateFileMapping(INVALID_HANDLE_VALUE, &sa, PAGE_READWRITE, - 0, new_hash_memory_size, NULL)) == 0) { - /* Report an error. */ - FATAL2("Can't CreateFileMapping() of size %ul (Error %d)!\n", new_hash_memory_size, GetLastError()); - }; - - if ((new_hash_memory = MapViewOfFile(new_hash_handle, FILE_MAP_ALL_ACCESS, 0, 0, 0)) == NULL) { - /* Report an error. */ - FATAL2("Can't MapViewOfFile(%x) (Error %d)!\n", new_hash_handle, GetLastError()); - } - /* Copy the data */ - CopyMemory(new_hash_memory, hash_memory, hash_memory_size); - /* Cleanup handles */ - hash_cleanup(); - /* make the values point to the new bloc */ - hash_memory_size = new_hash_memory_size; - hash_memory = new_hash_memory; - hash_handle = new_hash_handle; - - /* Now, create the actual named, shareable bloc */ - if ((new_hash_handle = CreateFileMapping(INVALID_HANDLE_VALUE, &sa, PAGE_READWRITE, - 0, hash_memory_size, HASH_MAPPING_NAME)) == 0) { - /* Report an error. */ - FATAL2("Can't CreateFileMapping() of size %ul (Error %d)!\n", new_hash_memory_size, GetLastError()); - }; - - if ((new_hash_memory = MapViewOfFile(new_hash_handle, FILE_MAP_ALL_ACCESS, 0, 0, 0)) == NULL) { - /* Report an error. */ - FATAL2("Can't MapViewOfFile(%x) (Error %d)!\n", new_hash_handle, GetLastError()); - } - /* Copy the data */ - CopyMemory(new_hash_memory, hash_memory, hash_memory_size); - /* Cleanup the handles */ - hash_cleanup(); - - hash_memory = new_hash_memory; - hash_handle = new_hash_handle; - hash_bloc = (hash_memory_description *)hash_memory; - - return true; -} - -unsigned long -hash_malloc P1C(unsigned, size) -{ - unsigned long ret = hash_bloc->first_free_address; - hash_bloc->first_free_address += size; - - if ((unsigned long)hash_bloc->first_free_address > (unsigned long)hash_bloc->memory_size) { - if (! hash_extend_memory()) { - fprintf(stderr, "Memory exhausted: base = %x, first_free_address = %x, size = %x\n", - hash_memory, hash_bloc->first_free_address, hash_bloc->memory_size); - } - } - assert((unsigned long)hash_bloc->first_free_address < (unsigned long)hash_bloc->memory_size); - - hash_memory_allocated += size; - - return ret; -} - -unsigned long -hash_strdup P1C(const_string, p) -{ - unsigned long q = hash_malloc(strlen(p)+1); - memcpy(HASH_PTR(q), p, strlen(p)+1); - return q; -} - -void -hash_free P1C(void *, address) -{ - /* Don't want to play with this for the moment. - Hash-Tables just grow up, no need to remove - anything from them. The `hash_remove' function - is only called from contrib/variables.c . - */ -} - -void -hash_save_str_list(str_list_type l) -{ - unsigned int i; - unsigned long *q; - assert(hash_bloc != NULL); - hash_bloc->db_dir_list_len = STR_LIST_LENGTH(l); - - if (hash_bloc->db_dir_list_len == 0) return; - - hash_bloc->db_dir_list = hash_malloc(hash_bloc->db_dir_list_len * sizeof(unsigned long)); - for (i = 0, q = (unsigned long *)HASH_PTR(hash_bloc->db_dir_list); - i < hash_bloc->db_dir_list_len; - i++, q++) { - *q = hash_strdup(STR_LIST_ELT(l, i)); - } -} - -void -hash_restore_str_list(unsigned long ptr, unsigned len, str_list_type *l) -{ - int i; - unsigned long *q; - for (i = 0, q = (unsigned long *)HASH_PTR(ptr); - i < len; - i++, q++) { - str_list_add (l, HASH_PTR(*q)); - } -#if 0 - fprintf(stderr, "Restored db_dir_list :\n"); - for (i = 0; i < STR_LIST_LENGTH(*l); i++) { - fprintf(stderr, "\t%s\n", STR_LIST_ELT(*l, i)); - } -#endif -} - -hash_table_type * -hash_exists_p P1C(hashtable_instances, hash_number) -{ - unsigned long rel; - - assert(hash_memory != NULL); - assert(hash_bloc != NULL); - -#if 0 - fprintf(stderr, "Looking up for table %d ... ", hash_number); -#endif - if (hash_bloc) { - if (rel = hash_bloc->hash_offsets[hash_number]) { -#if 0 - fprintf(stderr, "found (%x) for %d\n", (char *)hash_memory + rel, hash_number); -#endif - return (hash_table_type *)((char *)hash_memory + rel); - } - } -#if 0 - fprintf(stderr, "found (null) for %d\n", hash_number); -#endif - return NULL; -} - -hash_table_type * -hash_create P2C(unsigned, size, hashtable_instances, hash_number) -{ - /* hash_table_type ret; changed into "static ..." to work around gcc - optimizer bug for Alpha. */ - static hash_table_type *ret; - unsigned b; - - if (hash_memory == NULL) { - hash_init(); - } - - if (ret = hash_exists_p(hash_number)) { - assert(size == ret->size); - return ret; - } - - hash_lock(false); - -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_SHM)) - DEBUGF2("Hash: creating shared hash table %u of size %u\n", hash_number, size); -#endif - - hash_bloc->hash_offsets[hash_number] = hash_malloc(sizeof(hash_table_type)); - ret = (hash_table_type *)HASH_PTR(hash_bloc->hash_offsets[hash_number]); - - ret->buckets = (hash_element_type **)hash_malloc(size * sizeof(hash_element_type *)); - ret->size = size; - - /* calloc's zeroes aren't necessarily NULL, so be safe. */ - for (b = 0; b size; b++) - HASH_BUCKETS(ret, b) = NULL; - - hash_unlock(); - - return ret; -} - -#if 0 -/* Not really usable. */ -hash_table_type * -hash_reset P1C(hashtable_instances, hash_number) -{ - /* hash_table_type ret; changed into "static ..." to work around gcc - optimizer bug for Alpha. */ - static hash_table_type *ret; - unsigned b; - - if (hash_memory == NULL - || (ret = hash_exists_p(hash_number)) == NULL) { - return NULL; - } - - hash_lock(false); - -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_SHM)) - DEBUGF1("Hash: resetting shared hash table %u\n", hash_number); -#endif - - /* calloc's zeroes aren't necessarily NULL, so be safe. */ - for (b = 0; b size; b++) - HASH_BUCKETS(ret, b) = NULL; - - hash_unlock(); - - return ret; -} - -#endif -/* WARNING: the comment below is frightening ! - However, it does not seem to be the case that the strings - are changed after being inserted in the map. - IHMO, this should be strictly forbidden. -*/ -/* Whether or not KEY is already in MAP, insert it and VALUE. Do not - duplicate the strings, in case they're being purposefully shared. */ - -void -hash_insert P3C(hash_table_type *, table, const_string, key, - const_string, value) -{ - - unsigned n = hash (table, key); - unsigned long new_elt; - - hash_lock(false); - - new_elt = hash_malloc(sizeof(hash_element_type)); - - ((hash_element_type *)(HASH_PTR(new_elt)))->key = (const_string)hash_strdup(key); - ((hash_element_type *)(HASH_PTR(new_elt)))->value = (const_string)hash_strdup(value); - ((hash_element_type *)(HASH_PTR(new_elt)))->next = NULL; - - /* Insert the new element at the end of the list. */ - if (! HASH_BUCKETS(table, n)) - /* first element in bucket is a special case. */ - HASH_BUCKETS(table, n) = (hash_element_type *)new_elt; - else - { - hash_element_type *loc = (hash_element_type *)HASH_PTR(HASH_BUCKETS(table, n)); - while (loc->next) /* Find the last element. */ - loc = (hash_element_type *)HASH_PTR(loc->next); - loc->next = (hash_element_type *)new_elt; /* Insert the new one after. */ - } - - hash_unlock(); -} - -#ifdef NORMALIZED -/* Same as above, for normalized keys. */ -void -hash_insert_normalized P3C(hash_table_type *, table, - const_string, key, - const_string, value) -{ - unsigned n = hash_normalized (table, key); - unsigned long new_elt; - - hash_lock(false); - - new_elt = hash_malloc(sizeof(hash_element_type)); - - ((hash_element_type *)(HASH_PTR(new_elt)))->key = (const_string)hash_strdup(key); - ((hash_element_type *)(HASH_PTR(new_elt)))->value = (const_string)hash_strdup(value); - ((hash_element_type *)(HASH_PTR(new_elt)))->next = NULL; - - /* Insert the new element at the end of the list. */ - if (! HASH_BUCKETS(table, n)) - /* first element in bucket is a special case. */ - HASH_BUCKETS(table, n) = (hash_element_type *)new_elt; - else - { - hash_element_type *loc = (hash_element_type *)HASH_PTR(HASH_BUCKETS(table, n)); - while (loc->next) /* Find the last element. */ - loc = (hash_element_type *)HASH_PTR(loc->next); - loc->next = (hash_element_type *)new_elt; /* Insert the new one after. */ - } - - hash_unlock(); -} -#endif /* WIN32*/ - -/* Remove a (KEY, VALUE) pair. */ - -void -hash_remove P3C(hash_table_type *, table, const_string, key, - const_string, value) -{ - hash_element_type *p; - hash_element_type *q; - unsigned n = hash (table, key); - - hash_lock(false); - - /* Find pair. */ - for (q = NULL, p = (hash_element_type *)HASH_PTR(HASH_BUCKETS(table, n)); ! HASH_NULL(p); q = p, p = (hash_element_type *)HASH_PTR(p->next)) - if (FILESTRCASEEQ (key, HASH_PTR(p->key)) && STREQ (value, HASH_PTR(p->value))) - break; - if (p) { - /* We found something, remove it from the chain. */ - if (q) q->next = p->next; else HASH_BUCKETS(table, n) = p->next; - /* We cannot dispose of the contents. */ - hash_free ((void *)HASH_REL(p)); - } - - hash_unlock(); -} - -/* Look up STR in MAP. Return a (dynamically-allocated) list of the - corresponding strings or NULL if no match. */ - -#ifdef KPSE_DEBUG -/* Print the hash values as integers if this is nonzero. */ -boolean kpse_debug_hash_lookup_int = false; -#endif - -string * -hash_lookup P2C(hash_table_type *, table, const_string, key) -{ - hash_element_type *p; - str_list_type ret; - unsigned n = hash (table, key); - - ret = str_list_init (); - - hash_lock(false); - - /* Look at everything in this bucket. */ - for (p = (hash_element_type *)HASH_PTR(HASH_BUCKETS(table, n)); ! HASH_NULL(p); p = (hash_element_type *)HASH_PTR(p->next)) - if (FILESTRCASEEQ (key, HASH_PTR(p->key))) - /* Cast because the general str_list_type shouldn't force const data. */ - str_list_add (&ret, (string) xstrdup((string)HASH_PTR(p->value))); - - /* If we found anything, mark end of list with null. */ - if (STR_LIST (ret)) - str_list_add (&ret, NULL); - -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_HASH)) - { - DEBUGF1 ("hash_shared_lookup(%s) =>", key); - if (!STR_LIST (ret)) - fputs (" (nil)\n", stderr); - else - { - string *r; - for (r = STR_LIST (ret); *r; r++) - { - putc (' ', stderr); - if (kpse_debug_hash_lookup_int) - fprintf (stderr, "%ld", (long) *r); - else - fputs (*r, stderr); - } - putc ('\n', stderr); - } - fflush (stderr); - } -#endif - - hash_unlock(); - - return STR_LIST (ret); -} - -/* We only print nonempty buckets, to decrease output volume. */ - -void -hash_print P2C(hash_table_type *, table, boolean, summary_only) -{ - unsigned b; - unsigned total_elements = 0, total_buckets = 0; - - if (table == NULL) return; - - hash_lock(false); - - for (b = 0; b < table->size; b++) { - hash_element_type *bucket = (hash_element_type *)HASH_PTR(HASH_BUCKETS(table, b)); - - if (! HASH_NULL(bucket)) { - unsigned len = 1; - hash_element_type *tb; - - total_buckets++; - if (!summary_only) fprintf (stderr, "%4d ", b); - - for (tb = (hash_element_type *)HASH_PTR(bucket->next); ! HASH_NULL(tb); tb = (hash_element_type *)HASH_PTR(tb->next)) - len++; - if (!summary_only) fprintf (stderr, ":%-5d", len); - total_elements += len; - - if (!summary_only) { - for (tb = bucket; ! HASH_NULL(tb); tb = (hash_element_type *)HASH_PTR(tb->next)) - fprintf (stderr, " %s=>%s", HASH_PTR(tb->key), HASH_PTR(tb->value)); - putc ('\n', stderr); - } - } - } - - hash_unlock(); - - fprintf (stderr, - "%u buckets, %u nonempty (%u%%); %u entries, average chain %.1f.\n", - table->size, - total_buckets, - 100 * total_buckets / table->size, - total_elements, - total_buckets ? total_elements / (double) total_buckets : 0.0); -} - -/* Simple iterator over hash-table elements */ -void -hash_iter P2C(hash_table_type *, table, hash_iter_fn, fn) -{ - unsigned b; - - if (! table) return; - - hash_lock(false); - - for (b = 0; b < table->size; b++) { - hash_element_type *bucket = (hash_element_type *)HASH_PTR(HASH_BUCKETS(table, b)); - if (! HASH_NULL(bucket)) { - unsigned len = 1; - hash_element_type *tb; - for (tb = bucket; ! HASH_NULL(tb); tb = (hash_element_type *)HASH_PTR(tb->next)) { -#ifdef KPSE_DEBUG - if (KPSE_DEBUG_P (KPSE_DEBUG_HASH)) - { - DEBUGF2("applying (shared) fn to %s%s\n", HASH_PTR(tb->value), HASH_PTR(tb->key)); - } -#endif - (*fn)(HASH_PTR(tb->key), HASH_PTR(tb->value)); - } - } - } - - hash_unlock(); -} -- cgit v1.2.3