mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-14 21:32:49 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed marking of read-write locks

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2010-12-10 22:53:56 +01:00
parent f7328fb74a
commit be3e31abb0
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/c/alloc_2.d
View file

@ -456,6 +456,12 @@ cl_object_mark_proc(void *addr, struct GC_ms_entry *msp, struct GC_ms_entry *msl
MAYBE_MARK(o->lock.holder);
MAYBE_MARK(o->lock.name);
break;
case t_rwlock:
MAYBE_MARK(o->rwlock.name);
# ifndef ECL_RWLOCK
MAYBE_MARK(o->rwlock.mutex);
break;
# endif
# endif
case t_codeblock:
MAYBE_MARK(o->cblock.source);
@ -834,7 +840,7 @@ init_alloc(void)
#ifdef ECL_THREADS
init_tm(t_process, "PROCESS", sizeof(struct ecl_process), 8);
init_tm(t_lock, "LOCK", sizeof(struct ecl_lock), 2);
init_tm(t_rwlock, "LOCK", sizeof(struct ecl_rwlock), 2);
init_tm(t_rwlock, "LOCK", sizeof(struct ecl_rwlock), 0);
init_tm(t_condition_variable, "CONDITION-VARIABLE",
sizeof(struct ecl_condition_variable), 0);
# ifdef ECL_SEMAPHORES
@ -975,6 +981,14 @@ init_alloc(void)
type_info[t_lock].descriptor =
to_bitmap(&o, &(o.lock.name)) |
to_bitmap(&o, &(o.lock.holder));
# ifdef ECL_RWLOCK
type_info[t_rwlock].descriptor =
to_bitmap(&o, &(o.rwlock.name));
# else
type_info[t_rwlock].descriptor =
to_bitmap(&o, &(o.rwlock.name)) |
to_bitmap(&o, &(o.rwlock.mutex));
# endif
type_info[t_condition_variable].descriptor = 0;
# ifdef ECL_SEMAPHORES
type_info[t_semaphore].descriptor = 0;

2
src/c/threads/rwlock.d
View file

@ -94,7 +94,7 @@ cl_object
mp_rwlock_name(cl_object lock)
{
const cl_env_ptr env = ecl_process_env();
if (type_of(lock) != t_lock)
if (type_of(lock) != t_rwlock)
FEerror_not_a_rwlock(lock);
ecl_return1(env, lock->rwlock.name);
}