diff options
| author | raf <none@none> | 2008-01-23 12:00:31 -0800 |
|---|---|---|
| committer | raf <none@none> | 2008-01-23 12:00:31 -0800 |
| commit | a574db851cdc636fc3939b68e80d79fe7fbd57f2 (patch) | |
| tree | 7a28122042d1d24d9c4df92ba257e2d34d111e2e /usr/src/lib/libumem/common/umem_update_thread.c | |
| parent | 4a7ceb24cfcc0a97f96d86cfe5852ae445b50e57 (diff) | |
| download | illumos-gate-a574db851cdc636fc3939b68e80d79fe7fbd57f2.tar.gz | |
6598890 cancellation code abuses synonyms
--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c
Diffstat (limited to 'usr/src/lib/libumem/common/umem_update_thread.c')
| -rw-r--r-- | usr/src/lib/libumem/common/umem_update_thread.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/lib/libumem/common/umem_update_thread.c b/usr/src/lib/libumem/common/umem_update_thread.c index 25abf20ae9..413f51d1f5 100644 --- a/usr/src/lib/libumem/common/umem_update_thread.c +++ b/usr/src/lib/libumem/common/umem_update_thread.c @@ -18,23 +18,20 @@ * * CDDL HEADER END */ + /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "c_synonyms.h" #include "umem_base.h" #include "vmem_base.h" #include <signal.h> -/* - * we use the _ version, since we don't want to be cancelled. - */ -extern int _cond_timedwait(cond_t *cv, mutex_t *mutex, const timespec_t *delay); - /*ARGSUSED*/ static void * umem_update_thread(void *arg) @@ -105,12 +102,16 @@ umem_update_thread(void *arg) * next update, or someone wakes us. */ if (umem_null_cache.cache_unext == &umem_null_cache) { + int cancel_state; timespec_t abs_time; abs_time.tv_sec = umem_update_next.tv_sec; abs_time.tv_nsec = umem_update_next.tv_usec * 1000; - (void) _cond_timedwait(&umem_update_cv, + (void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, + &cancel_state); + (void) cond_timedwait(&umem_update_cv, &umem_update_lock, &abs_time); + (void) pthread_setcancelstate(cancel_state, NULL); } } /* LINTED no return statement */ |