Module Name: src
Committed By: joerg
Date: Sat Mar 10 18:01:10 UTC 2012
Modified Files:
src/lib/libpthread: pthread.c sem.c
Log Message:
Use correct size.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libpthread/sem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.129 src/lib/libpthread/pthread.c:1.130
--- src/lib/libpthread/pthread.c:1.129 Fri Mar 9 12:06:44 2012
+++ src/lib/libpthread/pthread.c Sat Mar 10 18:01:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.129 2012/03/09 12:06:44 drochner Exp $ */
+/* $NetBSD: pthread.c,v 1.130 2012/03/10 18:01:10 joerg Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread.c,v 1.129 2012/03/09 12:06:44 drochner Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.130 2012/03/10 18:01:10 joerg Exp $");
#define __EXPOSE_STACK 1
@@ -339,7 +339,7 @@ pthread__newstack(pthread_t newthread, c
return ENOMEM;
mapped_stack = true;
}
- newthread->pt_stack.ss_size = pthread__stacksize - pthread__pagesize;
+ newthread->pt_stack.ss_size = stacksize - pthread__pagesize;
newthread->pt_stack.ss_sp = stackbase;
#ifdef __MACHINE_STACK_GROWS_UP
redzone = (char *)stackbase + newthread->pt_stack.ss_size;
Index: src/lib/libpthread/sem.c
diff -u src/lib/libpthread/sem.c:1.23 src/lib/libpthread/sem.c:1.24
--- src/lib/libpthread/sem.c:1.23 Thu Mar 8 21:59:28 2012
+++ src/lib/libpthread/sem.c Sat Mar 10 18:01:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.23 2012/03/08 21:59:28 joerg Exp $ */
+/* $NetBSD: sem.c,v 1.24 2012/03/10 18:01:10 joerg Exp $ */
/*-
* Copyright (c) 2003, 2006, 2007 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.23 2012/03/08 21:59:28 joerg Exp $");
+__RCSID("$NetBSD: sem.c,v 1.24 2012/03/10 18:01:10 joerg Exp $");
#include <sys/types.h>
#include <sys/ksem.h>
@@ -135,6 +135,7 @@ sem_init(sem_t *sem, int pshared, unsign
int
sem_destroy(sem_t *sem)
{
+ int error, save_errno;
#ifdef ERRORCHECK
if (sem == NULL || *sem == NULL || (*sem)->ksem_magic != KSEM_MAGIC) {
@@ -143,12 +144,12 @@ sem_destroy(sem_t *sem)
}
#endif
- if (_ksem_destroy((*sem)->ksem_semid) == -1)
- return (-1);
-
+ error = _ksem_destroy((*sem)->ksem_semid);
+ save_errno = errno;
sem_free(*sem);
+ errno = save_errno;
- return (0);
+ return error;
}
sem_t *
@@ -218,6 +219,7 @@ sem_open(const char *name, int oflag, ..
int
sem_close(sem_t *sem)
{
+ int error, save_errno;
#ifdef ERRORCHECK
if (sem == NULL || *sem == NULL || (*sem)->ksem_magic != KSEM_MAGIC) {
@@ -227,16 +229,14 @@ sem_close(sem_t *sem)
#endif
pthread_mutex_lock(&named_sems_mtx);
- if (_ksem_close((*sem)->ksem_semid) == -1) {
- pthread_mutex_unlock(&named_sems_mtx);
- return (-1);
- }
-
+ error = _ksem_close((*sem)->ksem_semid);
LIST_REMOVE((*sem), ksem_list);
+ save_errno = errno;
pthread_mutex_unlock(&named_sems_mtx);
sem_free(*sem);
free(sem);
- return (0);
+ errno = save_errno;
+ return error;
}
int
