1998-09-21 03:22:07 +02:00
|
|
|
/* Hash tables for Objective C internal structures
|
2004-05-25 21:10:54 +02:00
|
|
|
Copyright (C) 1993, 1996, 1997, 2004 Free Software Foundation, Inc.
|
1998-09-21 03:22:07 +02:00
|
|
|
|
hash.c, [...]: Replace "GNU CC" with "GCC".
* hash.c, init.c, libobjc.def, libobjc_entry.c, linking.m,
makefile.dos, misc.c, nil_method.c, objects.c, sarray.c,
selector.c, sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c,
thr-mach.c, thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c,
thr-rtems.c, thr-single.c, thr-solaris.c, thr-vxworks.c,
thr-win32.c, thr.c: Replace "GNU CC" with "GCC".
From-SVN: r67134
2003-05-23 22:25:39 +02:00
|
|
|
This file is part of GCC.
|
1998-09-21 03:22:07 +02:00
|
|
|
|
hash.c, [...]: Replace "GNU CC" with "GCC".
* hash.c, init.c, libobjc.def, libobjc_entry.c, linking.m,
makefile.dos, misc.c, nil_method.c, objects.c, sarray.c,
selector.c, sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c,
thr-mach.c, thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c,
thr-rtems.c, thr-single.c, thr-solaris.c, thr-vxworks.c,
thr-win32.c, thr.c: Replace "GNU CC" with "GCC".
From-SVN: r67134
2003-05-23 22:25:39 +02:00
|
|
|
GCC is free software; you can redistribute it and/or modify
|
1998-09-21 03:22:07 +02:00
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
hash.c, [...]: Replace "GNU CC" with "GCC".
* hash.c, init.c, libobjc.def, libobjc_entry.c, linking.m,
makefile.dos, misc.c, nil_method.c, objects.c, sarray.c,
selector.c, sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c,
thr-mach.c, thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c,
thr-rtems.c, thr-single.c, thr-solaris.c, thr-vxworks.c,
thr-win32.c, thr.c: Replace "GNU CC" with "GCC".
From-SVN: r67134
2003-05-23 22:25:39 +02:00
|
|
|
GCC is distributed in the hope that it will be useful,
|
1998-09-21 03:22:07 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
hash.c, [...]: Replace "GNU CC" with "GCC".
* hash.c, init.c, libobjc.def, libobjc_entry.c, linking.m,
makefile.dos, misc.c, nil_method.c, objects.c, sarray.c,
selector.c, sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c,
thr-mach.c, thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c,
thr-rtems.c, thr-single.c, thr-solaris.c, thr-vxworks.c,
thr-win32.c, thr.c: Replace "GNU CC" with "GCC".
From-SVN: r67134
2003-05-23 22:25:39 +02:00
|
|
|
along with GCC; see the file COPYING. If not, write to
|
2005-08-17 05:21:42 +02:00
|
|
|
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* As a special exception, if you link this library with files
|
|
|
|
compiled with GCC to produce an executable, this does not cause
|
|
|
|
the resulting executable to be covered by the GNU General Public License.
|
|
|
|
This exception does not however invalidate any other reasons why
|
|
|
|
the executable file might be covered by the GNU General Public License. */
|
|
|
|
|
|
|
|
#include "assert.h"
|
|
|
|
|
archive.c, [...]: Include hash.h.
2005-06-07 David Ayers <d.ayers@inode.at>
* archive.c, init.c, selector.c: Include hash.h.
* archive.c, class.c, encoding.c, gc.c, hash.c, hash_compat.c,
init.c, misc.c, nil_method.c, objects.c, sarray.c, selector.c,
sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c, thr-mach.c,
thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c, thr-rtems.c,
thr-single.c, thr-solaris.c, thr-vxworks.c, thr-win32.c, thr.c:
Include Objective-C headers with quotes and objc/ directory
prefix.
From-SVN: r100723
2005-06-07 23:04:19 +02:00
|
|
|
#include "objc/hash.h"
|
1998-09-21 03:22:07 +02:00
|
|
|
|
archive.c, [...]: Include hash.h.
2005-06-07 David Ayers <d.ayers@inode.at>
* archive.c, init.c, selector.c: Include hash.h.
* archive.c, class.c, encoding.c, gc.c, hash.c, hash_compat.c,
init.c, misc.c, nil_method.c, objects.c, sarray.c, selector.c,
sendmsg.c, thr-dce.c, thr-decosf1.c, thr-irix.c, thr-mach.c,
thr-objc.c, thr-os2.c, thr-posix.c, thr-pthreads.c, thr-rtems.c,
thr-single.c, thr-solaris.c, thr-vxworks.c, thr-win32.c, thr.c:
Include Objective-C headers with quotes and objc/ directory
prefix.
From-SVN: r100723
2005-06-07 23:04:19 +02:00
|
|
|
#include "objc/runtime.h" /* for DEBUG_PRINTF */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* These two macros determine when a hash table is full and
|
|
|
|
by how much it should be expanded respectively.
|
|
|
|
|
|
|
|
These equations are percentages. */
|
|
|
|
#define FULLNESS(cache) \
|
|
|
|
((((cache)->size * 75) / 100) <= (cache)->used)
|
|
|
|
#define EXPANSION(cache) \
|
|
|
|
((cache)->size * 2)
|
|
|
|
|
|
|
|
cache_ptr
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_new (unsigned int size, hash_func_type hash_func,
|
|
|
|
compare_func_type compare_func)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
cache_ptr cache;
|
|
|
|
|
|
|
|
/* Pass me a value greater than 0 and a power of 2. */
|
|
|
|
assert (size);
|
2002-07-02 21:43:03 +02:00
|
|
|
assert (! (size & (size - 1)));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Allocate the cache structure. calloc insures
|
|
|
|
its initialization for default values. */
|
|
|
|
cache = (cache_ptr) objc_calloc (1, sizeof (struct cache));
|
|
|
|
assert (cache);
|
|
|
|
|
|
|
|
/* Allocate the array of buckets for the cache.
|
|
|
|
calloc initializes all of the pointers to NULL. */
|
|
|
|
cache->node_table
|
|
|
|
= (node_ptr *) objc_calloc (size, sizeof (node_ptr));
|
|
|
|
assert (cache->node_table);
|
|
|
|
|
|
|
|
cache->size = size;
|
|
|
|
|
|
|
|
/* This should work for all processor architectures? */
|
|
|
|
cache->mask = (size - 1);
|
|
|
|
|
|
|
|
/* Store the hashing function so that codes can be computed. */
|
|
|
|
cache->hash_func = hash_func;
|
|
|
|
|
|
|
|
/* Store the function that compares hash keys to
|
|
|
|
determine if they are equal. */
|
|
|
|
cache->compare_func = compare_func;
|
|
|
|
|
|
|
|
return cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_delete (cache_ptr cache)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
node_ptr node;
|
|
|
|
node_ptr next_node;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
/* Purge all key/value pairs from the table. */
|
|
|
|
/* Step through the nodes one by one and remove every node WITHOUT
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
using objc_hash_next. this makes objc_hash_delete much more efficient. */
|
1998-09-21 03:22:07 +02:00
|
|
|
for (i = 0;i < cache->size;i++) {
|
|
|
|
if ((node = cache->node_table[i])) {
|
|
|
|
/* an entry in the hash table has been found, now step through the
|
|
|
|
nodes next in the list and free them. */
|
|
|
|
while ((next_node = node->next)) {
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_remove (cache,node->key);
|
1998-09-21 03:22:07 +02:00
|
|
|
node = next_node;
|
|
|
|
}
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_remove (cache,node->key);
|
1998-09-21 03:22:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Release the array of nodes and the cache itself. */
|
|
|
|
objc_free(cache->node_table);
|
|
|
|
objc_free(cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_add (cache_ptr *cachep, const void *key, void *value)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
size_t indx = (*(*cachep)->hash_func)(*cachep, key);
|
|
|
|
node_ptr node = (node_ptr) objc_calloc (1, sizeof (struct cache_node));
|
|
|
|
|
|
|
|
|
|
|
|
assert (node);
|
|
|
|
|
|
|
|
/* Initialize the new node. */
|
|
|
|
node->key = key;
|
|
|
|
node->value = value;
|
|
|
|
node->next = (*cachep)->node_table[indx];
|
|
|
|
|
|
|
|
/* Debugging.
|
|
|
|
Check the list for another key. */
|
|
|
|
#ifdef DEBUG
|
|
|
|
{ node_ptr node1 = (*cachep)->node_table[indx];
|
|
|
|
|
|
|
|
while (node1) {
|
|
|
|
|
|
|
|
assert (node1->key != key);
|
|
|
|
node1 = node1->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Install the node as the first element on the list. */
|
|
|
|
(*cachep)->node_table[indx] = node;
|
|
|
|
|
|
|
|
/* Bump the number of entries in the cache. */
|
|
|
|
++(*cachep)->used;
|
|
|
|
|
|
|
|
/* Check the hash table's fullness. We're going
|
|
|
|
to expand if it is above the fullness level. */
|
|
|
|
if (FULLNESS (*cachep)) {
|
|
|
|
|
|
|
|
/* The hash table has reached its fullness level. Time to
|
|
|
|
expand it.
|
|
|
|
|
|
|
|
I'm using a slow method here but is built on other
|
|
|
|
primitive functions thereby increasing its
|
|
|
|
correctness. */
|
|
|
|
node_ptr node1 = NULL;
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
cache_ptr new = objc_hash_new (EXPANSION (*cachep),
|
|
|
|
(*cachep)->hash_func,
|
|
|
|
(*cachep)->compare_func);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
DEBUG_PRINTF ("Expanding cache %#x from %d to %d\n",
|
2004-05-25 21:10:54 +02:00
|
|
|
(int) *cachep, (*cachep)->size, new->size);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Copy the nodes from the first hash table to the new one. */
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
while ((node1 = objc_hash_next (*cachep, node1)))
|
|
|
|
objc_hash_add (&new, node1->key, node1->value);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Trash the old cache. */
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_delete (*cachep);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Return a pointer to the new hash table. */
|
|
|
|
*cachep = new;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_remove (cache_ptr cache, const void *key)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
size_t indx = (*cache->hash_func)(cache, key);
|
|
|
|
node_ptr node = cache->node_table[indx];
|
|
|
|
|
|
|
|
|
|
|
|
/* We assume there is an entry in the table. Error if it is not. */
|
|
|
|
assert (node);
|
|
|
|
|
|
|
|
/* Special case. First element is the key/value pair to be removed. */
|
|
|
|
if ((*cache->compare_func)(node->key, key)) {
|
|
|
|
cache->node_table[indx] = node->next;
|
|
|
|
objc_free(node);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
/* Otherwise, find the hash entry. */
|
|
|
|
node_ptr prev = node;
|
|
|
|
BOOL removed = NO;
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
if ((*cache->compare_func)(node->key, key)) {
|
|
|
|
prev->next = node->next, removed = YES;
|
|
|
|
objc_free(node);
|
|
|
|
} else
|
|
|
|
prev = node, node = node->next;
|
2002-07-02 21:43:03 +02:00
|
|
|
} while (! removed && node);
|
1998-09-21 03:22:07 +02:00
|
|
|
assert (removed);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Decrement the number of entries in the hash table. */
|
|
|
|
--cache->used;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
node_ptr
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_next (cache_ptr cache, node_ptr node)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
/* If the scan is being started then reset the last node
|
|
|
|
visitied pointer and bucket index. */
|
2002-07-02 21:43:03 +02:00
|
|
|
if (! node)
|
1998-09-21 03:22:07 +02:00
|
|
|
cache->last_bucket = 0;
|
|
|
|
|
|
|
|
/* If there is a node visited last then check for another
|
|
|
|
entry in the same bucket; Otherwise step to the next bucket. */
|
|
|
|
if (node) {
|
|
|
|
if (node->next)
|
|
|
|
/* There is a node which follows the last node
|
|
|
|
returned. Step to that node and retun it. */
|
|
|
|
return node->next;
|
|
|
|
else
|
|
|
|
++cache->last_bucket;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the list isn't exhausted then search the buckets for
|
|
|
|
other nodes. */
|
|
|
|
if (cache->last_bucket < cache->size) {
|
|
|
|
/* Scan the remainder of the buckets looking for an entry
|
|
|
|
at the head of the list. Return the first item found. */
|
|
|
|
while (cache->last_bucket < cache->size)
|
|
|
|
if (cache->node_table[cache->last_bucket])
|
|
|
|
return cache->node_table[cache->last_bucket];
|
|
|
|
else
|
|
|
|
++cache->last_bucket;
|
|
|
|
|
|
|
|
/* No further nodes were found in the hash table. */
|
|
|
|
return NULL;
|
|
|
|
} else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Given KEY, return corresponding value for it in CACHE.
|
|
|
|
Return NULL if the KEY is not recorded. */
|
|
|
|
|
|
|
|
void *
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_value_for_key (cache_ptr cache, const void *key)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
node_ptr node = cache->node_table[(*cache->hash_func)(cache, key)];
|
|
|
|
void *retval = NULL;
|
|
|
|
|
|
|
|
if (node)
|
|
|
|
do {
|
|
|
|
if ((*cache->compare_func)(node->key, key)) {
|
|
|
|
retval = node->value;
|
|
|
|
break;
|
|
|
|
} else
|
|
|
|
node = node->next;
|
2002-07-02 21:43:03 +02:00
|
|
|
} while (! retval && node);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Given KEY, return YES if it exists in the CACHE.
|
|
|
|
Return NO if it does not */
|
|
|
|
|
|
|
|
BOOL
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_is_key_in_hash (cache_ptr cache, const void *key)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
node_ptr node = cache->node_table[(*cache->hash_func)(cache, key)];
|
|
|
|
|
|
|
|
if (node)
|
|
|
|
do {
|
|
|
|
if ((*cache->compare_func)(node->key, key))
|
|
|
|
return YES;
|
|
|
|
else
|
|
|
|
node = node->next;
|
|
|
|
} while (node);
|
|
|
|
|
|
|
|
return NO;
|
|
|
|
}
|