1998-09-21 03:22:07 +02:00
|
|
|
|
/* Sparse Arrays for Objective C dispatch tables
|
2004-05-25 21:10:54 +02:00
|
|
|
|
Copyright (C) 1993, 1995, 1996, 2002, 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
|
1998-09-21 03:22:07 +02:00
|
|
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
1998-09-30 04:13:15 +02:00
|
|
|
|
#include "sarray.h"
|
|
|
|
|
#include "runtime.h"
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include "assert.h"
|
|
|
|
|
|
|
|
|
|
int nbuckets = 0; /* !T:MUTEX */
|
|
|
|
|
int nindices = 0; /* !T:MUTEX */
|
|
|
|
|
int narrays = 0; /* !T:MUTEX */
|
|
|
|
|
int idxsize = 0; /* !T:MUTEX */
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
static void *first_free_data = NULL; /* !T:MUTEX */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE2
|
2002-07-02 21:43:03 +02:00
|
|
|
|
const char *__objc_sparse2_id = "2 level sparse indices";
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
const char *__objc_sparse3_id = "3 level sparse indices";
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* This function removes any structures left over from free operations
|
|
|
|
|
that were not safe in a multi-threaded environment. */
|
|
|
|
|
void
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_remove_garbage (void)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
|
|
|
|
void **vp;
|
|
|
|
|
void *np;
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
objc_mutex_lock (__objc_runtime_mutex);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
vp = first_free_data;
|
|
|
|
|
first_free_data = NULL;
|
|
|
|
|
|
|
|
|
|
while (vp) {
|
|
|
|
|
np = *vp;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
objc_free (vp);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
vp = np;
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
objc_mutex_unlock (__objc_runtime_mutex);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free a block of dynamically allocated memory. If we are in multi-threaded
|
|
|
|
|
mode, it is ok to free it. If not, we add it to the garbage heap to be
|
|
|
|
|
freed later. */
|
|
|
|
|
|
|
|
|
|
static void
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (void *vp)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
2002-07-02 21:43:03 +02:00
|
|
|
|
objc_mutex_lock (__objc_runtime_mutex);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
if (__objc_runtime_threads_alive == 1) {
|
2002-07-02 21:43:03 +02:00
|
|
|
|
objc_free (vp);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
if (first_free_data)
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_remove_garbage ();
|
1998-09-21 03:22:07 +02:00
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
*(void **)vp = first_free_data;
|
|
|
|
|
first_free_data = vp;
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
objc_mutex_unlock (__objc_runtime_mutex);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* sarray_at_put : copies data in such a way as to be thread reader safe. */
|
|
|
|
|
void
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_at_put (struct sarray *array, sidx index, void *element)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sindex **the_index;
|
|
|
|
|
struct sindex *new_index;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sbucket **the_bucket;
|
|
|
|
|
struct sbucket *new_bucket;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
size_t ioffset;
|
|
|
|
|
#endif
|
|
|
|
|
size_t boffset;
|
|
|
|
|
size_t eoffset;
|
|
|
|
|
#ifdef PRECOMPUTE_SELECTORS
|
|
|
|
|
union sofftype xx;
|
|
|
|
|
xx.idx = index;
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
ioffset = xx.off.ioffset;
|
|
|
|
|
#endif
|
|
|
|
|
boffset = xx.off.boffset;
|
|
|
|
|
eoffset = xx.off.eoffset;
|
|
|
|
|
#else /* not PRECOMPUTE_SELECTORS */
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
ioffset = index/INDEX_CAPACITY;
|
|
|
|
|
boffset = (index/BUCKET_SIZE)%INDEX_SIZE;
|
|
|
|
|
eoffset = index%BUCKET_SIZE;
|
|
|
|
|
#else
|
|
|
|
|
boffset = index/BUCKET_SIZE;
|
|
|
|
|
eoffset = index%BUCKET_SIZE;
|
|
|
|
|
#endif
|
|
|
|
|
#endif /* not PRECOMPUTE_SELECTORS */
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
assert (soffset_decode (index) < array->capacity); /* Range check */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
the_index = &(array->indices[ioffset]);
|
|
|
|
|
the_bucket = &((*the_index)->buckets[boffset]);
|
|
|
|
|
#else
|
|
|
|
|
the_bucket = &(array->buckets[boffset]);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if ((*the_bucket)->elems[eoffset] == element)
|
|
|
|
|
return; /* great! we just avoided a lazy copy */
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
|
|
|
|
|
/* First, perform lazy copy/allocation of index if needed */
|
|
|
|
|
|
|
|
|
|
if ((*the_index) == array->empty_index) {
|
|
|
|
|
|
|
|
|
|
/* The index was previously empty, allocate a new */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_index = (struct sindex *) objc_malloc (sizeof (struct sindex));
|
|
|
|
|
memcpy (new_index, array->empty_index, sizeof (struct sindex));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_index->version.version = array->version.version;
|
|
|
|
|
*the_index = new_index; /* Prepared for install. */
|
|
|
|
|
the_bucket = &((*the_index)->buckets[boffset]);
|
|
|
|
|
|
|
|
|
|
nindices += 1;
|
|
|
|
|
} else if ((*the_index)->version.version != array->version.version) {
|
|
|
|
|
|
|
|
|
|
/* This index must be lazy copied */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sindex *old_index = *the_index;
|
|
|
|
|
new_index = (struct sindex *) objc_malloc (sizeof (struct sindex));
|
|
|
|
|
memcpy (new_index, old_index, sizeof (struct sindex));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_index->version.version = array->version.version;
|
|
|
|
|
*the_index = new_index; /* Prepared for install. */
|
|
|
|
|
the_bucket = &((*the_index)->buckets[boffset]);
|
|
|
|
|
|
|
|
|
|
nindices += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* OBJC_SPARSE3 */
|
|
|
|
|
|
|
|
|
|
/* next, perform lazy allocation/copy of the bucket if needed */
|
|
|
|
|
|
|
|
|
|
if ((*the_bucket) == array->empty_bucket) {
|
|
|
|
|
|
|
|
|
|
/* The bucket was previously empty (or something like that), */
|
|
|
|
|
/* allocate a new. This is the effect of `lazy' allocation */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_bucket = (struct sbucket *) objc_malloc (sizeof (struct sbucket));
|
|
|
|
|
memcpy ((void *) new_bucket, (const void *) array->empty_bucket,
|
|
|
|
|
sizeof (struct sbucket));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_bucket->version.version = array->version.version;
|
|
|
|
|
*the_bucket = new_bucket; /* Prepared for install. */
|
|
|
|
|
|
|
|
|
|
nbuckets += 1;
|
|
|
|
|
|
|
|
|
|
} else if ((*the_bucket)->version.version != array->version.version) {
|
|
|
|
|
|
|
|
|
|
/* Perform lazy copy. */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sbucket *old_bucket = *the_bucket;
|
|
|
|
|
new_bucket = (struct sbucket *) objc_malloc (sizeof (struct sbucket));
|
|
|
|
|
memcpy (new_bucket, old_bucket, sizeof (struct sbucket));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_bucket->version.version = array->version.version;
|
|
|
|
|
*the_bucket = new_bucket; /* Prepared for install. */
|
|
|
|
|
|
|
|
|
|
nbuckets += 1;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
(*the_bucket)->elems[eoffset] = element;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_at_put_safe (struct sarray *array, sidx index, void *element)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
2002-07-02 21:43:03 +02:00
|
|
|
|
if (soffset_decode (index) >= array->capacity)
|
|
|
|
|
sarray_realloc (array, soffset_decode (index) + 1);
|
|
|
|
|
sarray_at_put (array, index, element);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sarray *
|
|
|
|
|
sarray_new (int size, void *default_element)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sarray *arr;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t num_indices = ((size - 1)/(INDEX_CAPACITY)) + 1;
|
|
|
|
|
struct sindex **new_indices;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#else /* OBJC_SPARSE2 */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t num_indices = ((size - 1)/BUCKET_SIZE) + 1;
|
|
|
|
|
struct sbucket **new_buckets;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
Object.m: Fix signed/unsigned warning.
* Object.m: Fix signed/unsigned warning.
* Protocol.m: Likewise.
* archive.c: Always include stdlib.h.
(objc_read_short, objc_read_unsigned_short, objc_read_int,
objc_read_long, __objc_read_nbyte_uint, __objc_read_nbyte_ulong):
Fix signed/unsigned warning.
(objc_write_type, objc_read_type, objc_write_types,
objc_read_types): Ensure ctype 8-bit safety.
(__objc_no_write, __objc_no_read): Mark unused parameters.
* class.c (class_table_setup): Specify void arg.
* encoding.c (atoi, objc_sizeof_type, objc_alignof_type,
objc_skip_typespec, objc_skip_offset,
objc_layout_structure_next_member): Ensure ctype 8-bit safety.
(objc_layout_structure_next_member): Ensure variables are
initialized.
* gc.c (__objc_generate_gc_type_description,
class_ivar_set_gcinvisible): Mark unused parameters.
* init.c (__objc_send_load, __objc_destroy_class_tree_node): Mark
unused parameters.
(__objc_init_protocols) Fix signed/unsigned warning.
* nil_method.c (nil_method): Mark unused parameters.
* thr.h (objc_thread_callback): Specify void arg.
* sarray.c (sarray_new, sarray_realloc, sarray_free): Fix
signed/unsigned warning.
(sarray_free): Fix formatting.
* selector.c (sel_types_match): Ensure ctype 8-bit safety.
* sendmsg.c (__objc_init_install_dtable) Mark unused parameters.
From-SVN: r54649
2002-06-15 19:50:14 +02:00
|
|
|
|
size_t counter;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
assert (size > 0);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
/* Allocate core array */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
arr = (struct sarray *) objc_malloc (sizeof (struct sarray));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->version.version = 0;
|
|
|
|
|
|
|
|
|
|
/* Initialize members */
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
arr->capacity = num_indices*INDEX_CAPACITY;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_indices = (struct sindex **)
|
|
|
|
|
objc_malloc (sizeof (struct sindex *) * num_indices);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
arr->empty_index = (struct sindex *) objc_malloc (sizeof (struct sindex));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->empty_index->version.version = 0;
|
|
|
|
|
|
|
|
|
|
narrays += 1;
|
|
|
|
|
idxsize += num_indices;
|
|
|
|
|
nindices += 1;
|
|
|
|
|
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
arr->capacity = num_indices*BUCKET_SIZE;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_buckets = (struct sbucket **)
|
|
|
|
|
objc_malloc (sizeof (struct sbucket *) * num_indices);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
narrays += 1;
|
|
|
|
|
idxsize += num_indices;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
arr->empty_bucket = (struct sbucket *) objc_malloc (sizeof (struct sbucket));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->empty_bucket->version.version = 0;
|
|
|
|
|
|
|
|
|
|
nbuckets += 1;
|
|
|
|
|
|
|
|
|
|
arr->ref_count = 1;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
arr->is_copy_of = (struct sarray *) 0;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = 0; counter < BUCKET_SIZE; counter++)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->empty_bucket->elems[counter] = default_element;
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = 0; counter < INDEX_SIZE; counter++)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->empty_index->buckets[counter] = arr->empty_bucket;
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = 0; counter < num_indices; counter++)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_indices[counter] = arr->empty_index;
|
|
|
|
|
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = 0; counter < num_indices; counter++)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_buckets[counter] = arr->empty_bucket;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
arr->indices = new_indices;
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
arr->buckets = new_buckets;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return arr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Reallocate the sparse array to hold `newsize' entries
|
|
|
|
|
Note: We really allocate and then free. We have to do this to ensure that
|
|
|
|
|
any concurrent readers notice the update. */
|
|
|
|
|
|
|
|
|
|
void
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_realloc (struct sarray *array, int newsize)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t old_max_index = (array->capacity - 1)/INDEX_CAPACITY;
|
|
|
|
|
size_t new_max_index = ((newsize - 1)/INDEX_CAPACITY);
|
|
|
|
|
size_t rounded_size = (new_max_index + 1) * INDEX_CAPACITY;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sindex **new_indices;
|
|
|
|
|
struct sindex **old_indices;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t old_max_index = (array->capacity - 1)/BUCKET_SIZE;
|
|
|
|
|
size_t new_max_index = ((newsize - 1)/BUCKET_SIZE);
|
|
|
|
|
size_t rounded_size = (new_max_index + 1) * BUCKET_SIZE;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sbucket **new_buckets;
|
|
|
|
|
struct sbucket **old_buckets;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
Object.m: Fix signed/unsigned warning.
* Object.m: Fix signed/unsigned warning.
* Protocol.m: Likewise.
* archive.c: Always include stdlib.h.
(objc_read_short, objc_read_unsigned_short, objc_read_int,
objc_read_long, __objc_read_nbyte_uint, __objc_read_nbyte_ulong):
Fix signed/unsigned warning.
(objc_write_type, objc_read_type, objc_write_types,
objc_read_types): Ensure ctype 8-bit safety.
(__objc_no_write, __objc_no_read): Mark unused parameters.
* class.c (class_table_setup): Specify void arg.
* encoding.c (atoi, objc_sizeof_type, objc_alignof_type,
objc_skip_typespec, objc_skip_offset,
objc_layout_structure_next_member): Ensure ctype 8-bit safety.
(objc_layout_structure_next_member): Ensure variables are
initialized.
* gc.c (__objc_generate_gc_type_description,
class_ivar_set_gcinvisible): Mark unused parameters.
* init.c (__objc_send_load, __objc_destroy_class_tree_node): Mark
unused parameters.
(__objc_init_protocols) Fix signed/unsigned warning.
* nil_method.c (nil_method): Mark unused parameters.
* thr.h (objc_thread_callback): Specify void arg.
* sarray.c (sarray_new, sarray_realloc, sarray_free): Fix
signed/unsigned warning.
(sarray_free): Fix formatting.
* selector.c (sel_types_match): Ensure ctype 8-bit safety.
* sendmsg.c (__objc_init_install_dtable) Mark unused parameters.
From-SVN: r54649
2002-06-15 19:50:14 +02:00
|
|
|
|
size_t counter;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
assert (newsize > 0);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
/* The size is the same, just ignore the request */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
if (rounded_size <= array->capacity)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
assert (array->ref_count == 1); /* stop if lazy copied... */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
/* We are asked to extend the array -- allocate new bucket table, */
|
|
|
|
|
/* and insert empty_bucket in newly allocated places. */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
if (rounded_size > array->capacity)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
new_max_index += 4;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
rounded_size = (new_max_index + 1) * INDEX_CAPACITY;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
new_max_index += 4;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
rounded_size = (new_max_index + 1) * BUCKET_SIZE;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* update capacity */
|
|
|
|
|
array->capacity = rounded_size;
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* alloc to force re-read by any concurrent readers. */
|
|
|
|
|
old_indices = array->indices;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_indices = (struct sindex **)
|
|
|
|
|
objc_malloc ((new_max_index + 1) * sizeof (struct sindex *));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
old_buckets = array->buckets;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_buckets = (struct sbucket **)
|
|
|
|
|
objc_malloc ((new_max_index + 1) * sizeof (struct sbucket *));
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* copy buckets below old_max_index (they are still valid) */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = 0; counter <= old_max_index; counter++ ) {
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
new_indices[counter] = old_indices[counter];
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
new_buckets[counter] = old_buckets[counter];
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* reset entries above old_max_index to empty_bucket */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = old_max_index + 1; counter <= new_max_index; counter++)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_indices[counter] = array->empty_index;
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
/* reset entries above old_max_index to empty_bucket */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = old_max_index + 1; counter <= new_max_index; counter++)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
new_buckets[counter] = array->empty_bucket;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* install the new indices */
|
|
|
|
|
array->indices = new_indices;
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
|
|
|
|
array->buckets = new_buckets;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* free the old indices */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (old_indices);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#else /* OBJC_SPARSE2 */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (old_buckets);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
idxsize += (new_max_index-old_max_index);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Free a sparse array allocated with sarray_new */
|
|
|
|
|
|
|
|
|
|
void
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free (struct sarray *array) {
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t old_max_index = (array->capacity - 1)/INDEX_CAPACITY;
|
|
|
|
|
struct sindex **old_indices;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#else
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t old_max_index = (array->capacity - 1)/BUCKET_SIZE;
|
|
|
|
|
struct sbucket **old_buckets;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
Object.m: Fix signed/unsigned warning.
* Object.m: Fix signed/unsigned warning.
* Protocol.m: Likewise.
* archive.c: Always include stdlib.h.
(objc_read_short, objc_read_unsigned_short, objc_read_int,
objc_read_long, __objc_read_nbyte_uint, __objc_read_nbyte_ulong):
Fix signed/unsigned warning.
(objc_write_type, objc_read_type, objc_write_types,
objc_read_types): Ensure ctype 8-bit safety.
(__objc_no_write, __objc_no_read): Mark unused parameters.
* class.c (class_table_setup): Specify void arg.
* encoding.c (atoi, objc_sizeof_type, objc_alignof_type,
objc_skip_typespec, objc_skip_offset,
objc_layout_structure_next_member): Ensure ctype 8-bit safety.
(objc_layout_structure_next_member): Ensure variables are
initialized.
* gc.c (__objc_generate_gc_type_description,
class_ivar_set_gcinvisible): Mark unused parameters.
* init.c (__objc_send_load, __objc_destroy_class_tree_node): Mark
unused parameters.
(__objc_init_protocols) Fix signed/unsigned warning.
* nil_method.c (nil_method): Mark unused parameters.
* thr.h (objc_thread_callback): Specify void arg.
* sarray.c (sarray_new, sarray_realloc, sarray_free): Fix
signed/unsigned warning.
(sarray_free): Fix formatting.
* selector.c (sel_types_match): Ensure ctype 8-bit safety.
* sendmsg.c (__objc_init_install_dtable) Mark unused parameters.
From-SVN: r54649
2002-06-15 19:50:14 +02:00
|
|
|
|
size_t counter = 0;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
assert (array->ref_count != 0); /* Freed multiple times!!! */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
if (--(array->ref_count) != 0) /* There exists copies of me */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
old_indices = array->indices;
|
|
|
|
|
#else
|
|
|
|
|
old_buckets = array->buckets;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Free all entries that do not point to empty_bucket */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (counter = 0; counter <= old_max_index; counter++ ) {
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sindex *idx = old_indices[counter];
|
|
|
|
|
if ((idx != array->empty_index) &&
|
1998-09-21 03:22:07 +02:00
|
|
|
|
(idx->version.version == array->version.version)) {
|
|
|
|
|
int c2;
|
2002-07-02 21:43:03 +02:00
|
|
|
|
for (c2 = 0; c2 < INDEX_SIZE; c2++) {
|
|
|
|
|
struct sbucket *bkt = idx->buckets[c2];
|
|
|
|
|
if ((bkt != array->empty_bucket) &&
|
1998-09-21 03:22:07 +02:00
|
|
|
|
(bkt->version.version == array->version.version))
|
|
|
|
|
{
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (bkt);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
nbuckets -= 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (idx);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
nindices -= 1;
|
|
|
|
|
}
|
|
|
|
|
#else /* OBJC_SPARSE2 */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sbucket *bkt = array->buckets[counter];
|
1998-09-21 03:22:07 +02:00
|
|
|
|
if ((bkt != array->empty_bucket) &&
|
|
|
|
|
(bkt->version.version == array->version.version))
|
|
|
|
|
{
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (bkt);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
nbuckets -= 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* free empty_index */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
if (array->empty_index->version.version == array->version.version) {
|
|
|
|
|
sarray_free_garbage (array->empty_index);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
nindices -= 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* free empty_bucket */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
if (array->empty_bucket->version.version == array->version.version) {
|
|
|
|
|
sarray_free_garbage (array->empty_bucket);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
nbuckets -= 1;
|
|
|
|
|
}
|
2002-07-02 21:43:03 +02:00
|
|
|
|
idxsize -= (old_max_index + 1);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
narrays -= 1;
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* free bucket table */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (array->indices);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
/* free bucket table */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (array->buckets);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-05-25 21:10:54 +02:00
|
|
|
|
/* If this is a copy of another array, we free it (which might just
|
|
|
|
|
* decrement its reference count so it will be freed when no longer in use).
|
|
|
|
|
*/
|
2004-01-10 06:47:42 +01:00
|
|
|
|
if (array->is_copy_of)
|
|
|
|
|
sarray_free (array->is_copy_of);
|
|
|
|
|
|
1998-09-21 03:22:07 +02:00
|
|
|
|
/* free array */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
sarray_free_garbage (array);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is a lazy copy. Only the core of the structure is actually */
|
|
|
|
|
/* copied. */
|
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sarray *
|
|
|
|
|
sarray_lazy_copy (struct sarray *oarr)
|
1998-09-21 03:22:07 +02:00
|
|
|
|
{
|
2002-07-02 21:43:03 +02:00
|
|
|
|
struct sarray *arr;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t num_indices = ((oarr->capacity - 1)/INDEX_CAPACITY) + 1;
|
|
|
|
|
struct sindex **new_indices;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#else /* OBJC_SPARSE2 */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
size_t num_indices = ((oarr->capacity - 1)/BUCKET_SIZE) + 1;
|
|
|
|
|
struct sbucket **new_buckets;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Allocate core array */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
arr = (struct sarray *) objc_malloc (sizeof (struct sarray)); /* !!! */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->version.version = oarr->version.version + 1;
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
arr->empty_index = oarr->empty_index;
|
|
|
|
|
#endif
|
|
|
|
|
arr->empty_bucket = oarr->empty_bucket;
|
|
|
|
|
arr->ref_count = 1;
|
|
|
|
|
oarr->ref_count += 1;
|
|
|
|
|
arr->is_copy_of = oarr;
|
|
|
|
|
arr->capacity = oarr->capacity;
|
|
|
|
|
|
|
|
|
|
#ifdef OBJC_SPARSE3
|
|
|
|
|
/* Copy bucket table */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_indices = (struct sindex **)
|
|
|
|
|
objc_malloc (sizeof (struct sindex *) * num_indices);
|
|
|
|
|
memcpy (new_indices, oarr->indices, sizeof (struct sindex *) * num_indices);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->indices = new_indices;
|
|
|
|
|
#else
|
|
|
|
|
/* Copy bucket table */
|
2002-07-02 21:43:03 +02:00
|
|
|
|
new_buckets = (struct sbucket **)
|
|
|
|
|
objc_malloc (sizeof (struct sbucket *) * num_indices);
|
|
|
|
|
memcpy (new_buckets, oarr->buckets, sizeof (struct sbucket *) * num_indices);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
arr->buckets = new_buckets;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
idxsize += num_indices;
|
|
|
|
|
narrays += 1;
|
|
|
|
|
|
|
|
|
|
return arr;
|
|
|
|
|
}
|