/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* @OSF_COPYRIGHT@
*/
#include <mach/mach_types.h>
+#include <mach/mach_traps.h>
#include <mach/kern_return.h>
#include <mach/semaphore.h>
#include <mach/sync_policy.h>
+#include <mach/task.h>
#include <kern/misc_protos.h>
#include <kern/sync_sema.h>
#include <kern/zalloc.h>
#include <kern/mach_param.h>
-unsigned int semaphore_event;
-#define SEMAPHORE_EVENT ((event_t)&semaphore_event)
+static unsigned int semaphore_event;
+#define SEMAPHORE_EVENT CAST_EVENT64_T(&semaphore_event)
zone_t semaphore_zone;
-unsigned int semaphore_max = SEMAPHORE_MAX;
+unsigned int semaphore_max;
+
+/* Forward declarations */
+
+
+kern_return_t
+semaphore_wait_trap_internal(
+ mach_port_name_t name,
+ void (*caller_cont)(kern_return_t));
+
+kern_return_t
+semaphore_wait_signal_trap_internal(
+ mach_port_name_t wait_name,
+ mach_port_name_t signal_name,
+ void (*caller_cont)(kern_return_t));
+
+kern_return_t
+semaphore_timedwait_trap_internal(
+ mach_port_name_t name,
+ unsigned int sec,
+ clock_res_t nsec,
+ void (*caller_cont)(kern_return_t));
+
+kern_return_t
+semaphore_timedwait_signal_trap_internal(
+ mach_port_name_t wait_name,
+ mach_port_name_t signal_name,
+ unsigned int sec,
+ clock_res_t nsec,
+ void (*caller_cont)(kern_return_t));
+
+kern_return_t
+semaphore_signal_internal_trap(mach_port_name_t sema_name);
+
+kern_return_t
+semaphore_signal_internal(
+ semaphore_t semaphore,
+ thread_t thread,
+ int options);
+
+kern_return_t
+semaphore_convert_wait_result(
+ int wait_result);
+
+void
+semaphore_wait_continue(void);
+
+static kern_return_t
+semaphore_wait_internal(
+ semaphore_t wait_semaphore,
+ semaphore_t signal_semaphore,
+ uint64_t deadline,
+ int option,
+ void (*caller_cont)(kern_return_t));
+
+static __inline__ uint64_t
+semaphore_deadline(
+ unsigned int sec,
+ clock_res_t nsec)
+{
+ uint64_t abstime;
+
+ nanoseconds_to_absolutetime((uint64_t)sec * NSEC_PER_SEC + nsec, &abstime);
+ clock_absolutetime_interval_to_deadline(abstime, &abstime);
+
+ return (abstime);
+}
/*
* ROUTINE: semaphore_init [private]
semaphore_max * sizeof(struct semaphore),
sizeof(struct semaphore),
"semaphores");
+ zone_change(semaphore_zone, Z_NOENCRYPT, TRUE);
}
/*
int value)
{
semaphore_t s = SEMAPHORE_NULL;
+ kern_return_t kret;
-
- if (task == TASK_NULL || value < 0 || policy > SYNC_POLICY_MAX) {
- *new_semaphore = SEMAPHORE_NULL;
+ *new_semaphore = SEMAPHORE_NULL;
+ if (task == TASK_NULL || value < 0 || policy > SYNC_POLICY_MAX)
return KERN_INVALID_ARGUMENT;
- }
s = (semaphore_t) zalloc (semaphore_zone);
- if (s == SEMAPHORE_NULL) {
- *new_semaphore = SEMAPHORE_NULL;
+ if (s == SEMAPHORE_NULL)
return KERN_RESOURCE_SHORTAGE;
+
+ kret = wait_queue_init(&s->wait_queue, policy); /* also inits lock */
+ if (kret != KERN_SUCCESS) {
+ zfree(semaphore_zone, s);
+ return kret;
}
- wait_queue_init(&s->wait_queue, policy); /* also inits lock */
s->count = value;
- s->ref_count = 1;
+ s->ref_count = (task == kernel_task) ? 1 : 2;
/*
* Create and initialize the semaphore port
*/
s->port = ipc_port_alloc_kernel();
if (s->port == IP_NULL) {
- /* This will deallocate the semaphore */
- semaphore_dereference(s);
- *new_semaphore = SEMAPHORE_NULL;
+ zfree(semaphore_zone, s);
return KERN_RESOURCE_SHORTAGE;
}
semaphore_t semaphore)
{
int old_count;
- thread_t thread;
spl_t spl_level;
semaphore->count = 0;
if (old_count < 0) {
- wait_queue_wakeup_all_locked(&semaphore->wait_queue,
+ wait_queue_wakeup64_all_locked(&semaphore->wait_queue,
SEMAPHORE_EVENT,
THREAD_RESTART,
TRUE); /* unlock? */
/*
* Deallocate
*
- * Drop the semaphore reference, which in turn deallocates the
- * semaphore structure if the reference count goes to zero.
+ * Drop the task's semaphore reference, which in turn deallocates
+ * the semaphore structure if the reference count goes to zero.
*/
- ipc_port_dealloc_kernel(semaphore->port);
semaphore_dereference(semaphore);
return KERN_SUCCESS;
}
kern_return_t
semaphore_signal_internal(
semaphore_t semaphore,
- thread_act_t thread_act,
- int options)
+ thread_t thread,
+ int options)
{
kern_return_t kr;
spl_t spl_level;
return KERN_TERMINATED;
}
- if (thread_act != THR_ACT_NULL) {
+ if (thread != THREAD_NULL) {
if (semaphore->count < 0) {
- kr = wait_queue_wakeup_thread_locked(
+ kr = wait_queue_wakeup64_thread_locked(
&semaphore->wait_queue,
SEMAPHORE_EVENT,
- thread_act->thread,
+ thread,
THREAD_AWAKENED,
TRUE); /* unlock? */
} else {
if (old_count < 0) {
semaphore->count = 0; /* always reset */
- kr = wait_queue_wakeup_all_locked(
+ kr = wait_queue_wakeup64_all_locked(
&semaphore->wait_queue,
SEMAPHORE_EVENT,
THREAD_AWAKENED,
}
if (semaphore->count < 0) {
- if (wait_queue_wakeup_one_locked(
+ if (wait_queue_wakeup64_one_locked(
&semaphore->wait_queue,
SEMAPHORE_EVENT,
THREAD_AWAKENED,
/*
* Routine: semaphore_signal_thread
*
- * If the specified thread_act is blocked on the semaphore, it is
- * woken up. If a NULL thread_act was supplied, then any one
+ * If the specified thread is blocked on the semaphore, it is
+ * woken up. If a NULL thread was supplied, then any one
* thread is woken up. Otherwise the caller gets KERN_NOT_WAITING
* and the semaphore is unchanged.
*/
kern_return_t
semaphore_signal_thread(
semaphore_t semaphore,
- thread_act_t thread_act)
+ thread_t thread)
{
kern_return_t ret;
return KERN_INVALID_ARGUMENT;
ret = semaphore_signal_internal(semaphore,
- thread_act,
+ thread,
SEMAPHORE_OPTION_NONE);
return ret;
}
*/
kern_return_t
semaphore_signal_thread_trap(
- mach_port_name_t sema_name,
- mach_port_name_t thread_name)
+ struct semaphore_signal_thread_trap_args *args)
{
-
+ mach_port_name_t sema_name = args->signal_name;
+ mach_port_name_t thread_name = args->thread_name;
semaphore_t semaphore;
- thread_act_t thread_act;
+ thread_t thread;
kern_return_t kr;
/*
* pre-post the semaphore.
*/
if (thread_name != MACH_PORT_NULL) {
- thread_act = port_name_to_act(thread_name);
- if (thread_act == THR_ACT_NULL)
+ thread = port_name_to_thread(thread_name);
+ if (thread == THREAD_NULL)
return KERN_INVALID_ARGUMENT;
} else
- thread_act = THR_ACT_NULL;
+ thread = THREAD_NULL;
kr = port_name_to_semaphore(sema_name, &semaphore);
- if (kr != KERN_SUCCESS) {
- act_deallocate(thread_act);
- return kr;
+ if (kr == KERN_SUCCESS) {
+ kr = semaphore_signal_internal(semaphore,
+ thread,
+ SEMAPHORE_OPTION_NONE);
+ semaphore_dereference(semaphore);
+ }
+ if (thread != THREAD_NULL) {
+ thread_deallocate(thread);
}
- kr = semaphore_signal_internal(semaphore,
- thread_act,
- SEMAPHORE_OPTION_NONE);
- semaphore_dereference(semaphore);
- act_deallocate(thread_act);
return kr;
}
return KERN_INVALID_ARGUMENT;
kr = semaphore_signal_internal(semaphore,
- THR_ACT_NULL,
+ THREAD_NULL,
SEMAPHORE_SIGNAL_PREPOST);
if (kr == KERN_NOT_WAITING)
return KERN_SUCCESS;
*/
kern_return_t
semaphore_signal_trap(
- mach_port_name_t sema_name)
+ struct semaphore_signal_trap_args *args)
+{
+ mach_port_name_t sema_name = args->signal_name;
+
+ return (semaphore_signal_internal_trap(sema_name));
+}
+
+kern_return_t
+semaphore_signal_internal_trap(mach_port_name_t sema_name)
{
-
semaphore_t semaphore;
kern_return_t kr;
kr = port_name_to_semaphore(sema_name, &semaphore);
- if (kr != KERN_SUCCESS) {
- return kr;
+ if (kr == KERN_SUCCESS) {
+ kr = semaphore_signal_internal(semaphore,
+ THREAD_NULL,
+ SEMAPHORE_SIGNAL_PREPOST);
+ semaphore_dereference(semaphore);
+ if (kr == KERN_NOT_WAITING)
+ kr = KERN_SUCCESS;
}
- kr = semaphore_signal_internal(semaphore,
- THR_ACT_NULL,
- SEMAPHORE_SIGNAL_PREPOST);
- semaphore_dereference(semaphore);
- if (kr == KERN_NOT_WAITING)
- return KERN_SUCCESS;
return kr;
}
return KERN_INVALID_ARGUMENT;
kr = semaphore_signal_internal(semaphore,
- THR_ACT_NULL,
+ THREAD_NULL,
SEMAPHORE_SIGNAL_ALL);
if (kr == KERN_NOT_WAITING)
return KERN_SUCCESS;
*/
kern_return_t
semaphore_signal_all_trap(
- mach_port_name_t sema_name)
+ struct semaphore_signal_all_trap_args *args)
{
-
+ mach_port_name_t sema_name = args->signal_name;
semaphore_t semaphore;
kern_return_t kr;
kr = port_name_to_semaphore(sema_name, &semaphore);
- if (kr != KERN_SUCCESS) {
- return kr;
+ if (kr == KERN_SUCCESS) {
+ kr = semaphore_signal_internal(semaphore,
+ THREAD_NULL,
+ SEMAPHORE_SIGNAL_ALL);
+ semaphore_dereference(semaphore);
+ if (kr == KERN_NOT_WAITING)
+ kr = KERN_SUCCESS;
}
- kr = semaphore_signal_internal(semaphore,
- THR_ACT_NULL,
- SEMAPHORE_SIGNAL_ALL);
- semaphore_dereference(semaphore);
- if (kr == KERN_NOT_WAITING)
- return KERN_SUCCESS;
return kr;
}
(*caller_cont)(semaphore_convert_wait_result(wait_result));
}
-/*
- * Routine: semaphore_timedwait_continue
- *
- * Common continuation routine after doing a timed wait on a
- * semaphore. It clears the timer before calling the semaphore
- * routine saved in the thread struct.
- */
-void
-semaphore_timedwait_continue(void)
-{
- thread_t self = current_thread();
- int wait_result = self->wait_result;
- void (*caller_cont)(kern_return_t) = self->sth_continuation;
-
- if (wait_result != THREAD_TIMED_OUT)
- thread_cancel_timer();
-
- assert(self->sth_waitsemaphore != SEMAPHORE_NULL);
- semaphore_dereference(self->sth_waitsemaphore);
- if (self->sth_signalsemaphore != SEMAPHORE_NULL)
- semaphore_dereference(self->sth_signalsemaphore);
-
- assert(caller_cont != (void (*)(kern_return_t))0);
- (*caller_cont)(semaphore_convert_wait_result(wait_result));
-}
-
-
/*
* Routine: semaphore_wait_internal
*
* The reference
* A reference is held on the signal semaphore.
*/
-kern_return_t
+static kern_return_t
semaphore_wait_internal(
semaphore_t wait_semaphore,
semaphore_t signal_semaphore,
- mach_timespec_t *wait_timep,
+ uint64_t deadline,
+ int option,
void (*caller_cont)(kern_return_t))
{
- void (*continuation)(void);
- AbsoluteTime abstime, nsinterval;
- boolean_t nonblocking;
- int wait_result;
- spl_t spl_level;
+ int wait_result;
+ spl_t spl_level;
kern_return_t kr = KERN_ALREADY_WAITING;
spl_level = splsched();
semaphore_lock(wait_semaphore);
- /*
- * Decide if we really have to wait.
- */
- nonblocking = (wait_timep != (mach_timespec_t *)0) ?
- (wait_timep->tv_sec == 0 && wait_timep->tv_nsec == 0) :
- FALSE;
-
if (!wait_semaphore->active) {
kr = KERN_TERMINATED;
} else if (wait_semaphore->count > 0) {
wait_semaphore->count--;
kr = KERN_SUCCESS;
- } else if (nonblocking) {
+ } else if (option & SEMAPHORE_TIMEOUT_NOBLOCK) {
kr = KERN_OPERATION_TIMED_OUT;
- } else {
+ } else {
+ thread_t self = current_thread();
+
wait_semaphore->count = -1; /* we don't keep an actual count */
- wait_queue_assert_wait_locked(&wait_semaphore->wait_queue,
- SEMAPHORE_EVENT,
- THREAD_ABORTSAFE,
- FALSE); /* unlock? */
+ thread_lock(self);
+ (void)wait_queue_assert_wait64_locked(
+ &wait_semaphore->wait_queue,
+ SEMAPHORE_EVENT,
+ THREAD_ABORTSAFE, deadline,
+ self);
+ thread_unlock(self);
}
semaphore_unlock(wait_semaphore);
splx(spl_level);
* our intention to wait above).
*/
signal_kr = semaphore_signal_internal(signal_semaphore,
- THR_ACT_NULL,
+ THREAD_NULL,
SEMAPHORE_SIGNAL_PREPOST);
if (signal_kr == KERN_NOT_WAITING)
*/
if (kr != KERN_ALREADY_WAITING)
return kr;
-
- /*
- * If it is a timed wait, go ahead and set up the timer.
- */
- if (wait_timep != (mach_timespec_t *)0) {
- clock_interval_to_absolutetime_interval(wait_timep->tv_sec,
- NSEC_PER_SEC,
- &abstime);
- clock_interval_to_absolutetime_interval(wait_timep->tv_nsec,
- 1,
- &nsinterval);
- ADD_ABSOLUTETIME(&abstime, &nsinterval);
- clock_absolutetime_interval_to_deadline(abstime, &abstime);
- thread_set_timer_deadline(abstime);
- continuation = semaphore_timedwait_continue;
- } else {
- continuation = semaphore_wait_continue;
- }
/*
* Now, we can block. If the caller supplied a continuation
self->sth_continuation = caller_cont;
self->sth_waitsemaphore = wait_semaphore;
self->sth_signalsemaphore = signal_semaphore;
- wait_result = thread_block(continuation);
- } else {
- wait_result = thread_block((void (*)(void))0);
+ wait_result = thread_block((thread_continue_t)semaphore_wait_continue);
+ }
+ else {
+ wait_result = thread_block(THREAD_CONTINUE_NULL);
}
-
- /*
- * If we came back here (not continuation case) cancel
- * any pending timers, convert the wait result to an
- * appropriate semaphore return value, and then return
- * that.
- */
- if (wait_timep && (wait_result != THREAD_TIMED_OUT))
- thread_cancel_timer();
return (semaphore_convert_wait_result(wait_result));
}
return KERN_INVALID_ARGUMENT;
return(semaphore_wait_internal(semaphore,
- SEMAPHORE_NULL,
- (mach_timespec_t *)0,
+ SEMAPHORE_NULL,
+ 0ULL, SEMAPHORE_OPTION_NONE,
+ (void (*)(kern_return_t))0));
+}
+
+kern_return_t
+semaphore_wait_noblock(
+ semaphore_t semaphore)
+{
+
+ if (semaphore == SEMAPHORE_NULL)
+ return KERN_INVALID_ARGUMENT;
+
+ return(semaphore_wait_internal(semaphore,
+ SEMAPHORE_NULL,
+ 0ULL, SEMAPHORE_TIMEOUT_NOBLOCK,
+ (void (*)(kern_return_t))0));
+}
+
+kern_return_t
+semaphore_wait_deadline(
+ semaphore_t semaphore,
+ uint64_t deadline)
+{
+
+ if (semaphore == SEMAPHORE_NULL)
+ return KERN_INVALID_ARGUMENT;
+
+ return(semaphore_wait_internal(semaphore,
+ SEMAPHORE_NULL,
+ deadline, SEMAPHORE_OPTION_NONE,
(void (*)(kern_return_t))0));
}
* Trap version of semaphore wait. Called on behalf of user-level
* clients.
*/
+
kern_return_t
semaphore_wait_trap(
- mach_port_name_t name)
+ struct semaphore_wait_trap_args *args)
+{
+ return(semaphore_wait_trap_internal(args->wait_name, thread_syscall_return));
+}
+
+
+
+kern_return_t
+semaphore_wait_trap_internal(
+ mach_port_name_t name,
+ void (*caller_cont)(kern_return_t))
{
semaphore_t semaphore;
kern_return_t kr;
kr = port_name_to_semaphore(name, &semaphore);
- if (kr != KERN_SUCCESS)
- return kr;
-
- kr = semaphore_wait_internal(semaphore,
- SEMAPHORE_NULL,
- (mach_timespec_t *)0,
- thread_syscall_return);
- semaphore_dereference(semaphore);
+ if (kr == KERN_SUCCESS) {
+ kr = semaphore_wait_internal(semaphore,
+ SEMAPHORE_NULL,
+ 0ULL, SEMAPHORE_OPTION_NONE,
+ caller_cont);
+ semaphore_dereference(semaphore);
+ }
return kr;
}
semaphore_timedwait(
semaphore_t semaphore,
mach_timespec_t wait_time)
-{
+{
+ int option = SEMAPHORE_OPTION_NONE;
+ uint64_t deadline = 0;
+
if (semaphore == SEMAPHORE_NULL)
return KERN_INVALID_ARGUMENT;
if(BAD_MACH_TIMESPEC(&wait_time))
return KERN_INVALID_VALUE;
+
+ if (wait_time.tv_sec == 0 && wait_time.tv_nsec == 0)
+ option = SEMAPHORE_TIMEOUT_NOBLOCK;
+ else
+ deadline = semaphore_deadline(wait_time.tv_sec, wait_time.tv_nsec);
return (semaphore_wait_internal(semaphore,
SEMAPHORE_NULL,
- &wait_time,
+ deadline, option,
(void(*)(kern_return_t))0));
}
*/
kern_return_t
semaphore_timedwait_trap(
- mach_port_name_t name,
- unsigned int sec,
- clock_res_t nsec)
+ struct semaphore_timedwait_trap_args *args)
{
+
+ return(semaphore_timedwait_trap_internal(args->wait_name, args->sec, args->nsec, thread_syscall_return));
+}
+
+
+kern_return_t
+semaphore_timedwait_trap_internal(
+ mach_port_name_t name,
+ unsigned int sec,
+ clock_res_t nsec,
+ void (*caller_cont)(kern_return_t))
+{
semaphore_t semaphore;
mach_timespec_t wait_time;
kern_return_t kr;
return KERN_INVALID_VALUE;
kr = port_name_to_semaphore(name, &semaphore);
- if (kr != KERN_SUCCESS)
- return kr;
-
- kr = semaphore_wait_internal(semaphore,
- SEMAPHORE_NULL,
- &wait_time,
- thread_syscall_return);
- semaphore_dereference(semaphore);
+ if (kr == KERN_SUCCESS) {
+ int option = SEMAPHORE_OPTION_NONE;
+ uint64_t deadline = 0;
+
+ if (sec == 0 && nsec == 0)
+ option = SEMAPHORE_TIMEOUT_NOBLOCK;
+ else
+ deadline = semaphore_deadline(sec, nsec);
+
+ kr = semaphore_wait_internal(semaphore,
+ SEMAPHORE_NULL,
+ deadline, option,
+ caller_cont);
+ semaphore_dereference(semaphore);
+ }
return kr;
}
return(semaphore_wait_internal(wait_semaphore,
signal_semaphore,
- (mach_timespec_t *)0,
+ 0ULL, SEMAPHORE_OPTION_NONE,
(void(*)(kern_return_t))0));
}
*/
kern_return_t
semaphore_wait_signal_trap(
- mach_port_name_t wait_name,
- mach_port_name_t signal_name)
+ struct semaphore_wait_signal_trap_args *args)
+{
+ return(semaphore_wait_signal_trap_internal(args->wait_name, args->signal_name, thread_syscall_return));
+}
+
+kern_return_t
+semaphore_wait_signal_trap_internal(
+ mach_port_name_t wait_name,
+ mach_port_name_t signal_name,
+ void (*caller_cont)(kern_return_t))
{
semaphore_t wait_semaphore;
semaphore_t signal_semaphore;
kern_return_t kr;
kr = port_name_to_semaphore(signal_name, &signal_semaphore);
- if (kr != KERN_SUCCESS)
- return kr;
-
- kr = port_name_to_semaphore(wait_name, &wait_semaphore);
- if (kr != KERN_SUCCESS) {
+ if (kr == KERN_SUCCESS) {
+ kr = port_name_to_semaphore(wait_name, &wait_semaphore);
+ if (kr == KERN_SUCCESS) {
+ kr = semaphore_wait_internal(wait_semaphore,
+ signal_semaphore,
+ 0ULL, SEMAPHORE_OPTION_NONE,
+ caller_cont);
+ semaphore_dereference(wait_semaphore);
+ }
semaphore_dereference(signal_semaphore);
- return kr;
}
-
- kr = semaphore_wait_internal(wait_semaphore,
- signal_semaphore,
- (mach_timespec_t *)0,
- thread_syscall_return);
-
- semaphore_dereference(wait_semaphore);
- semaphore_dereference(signal_semaphore);
return kr;
}
semaphore_t signal_semaphore,
mach_timespec_t wait_time)
{
+ int option = SEMAPHORE_OPTION_NONE;
+ uint64_t deadline = 0;
+
if (wait_semaphore == SEMAPHORE_NULL)
return KERN_INVALID_ARGUMENT;
if(BAD_MACH_TIMESPEC(&wait_time))
return KERN_INVALID_VALUE;
+
+ if (wait_time.tv_sec == 0 && wait_time.tv_nsec == 0)
+ option = SEMAPHORE_TIMEOUT_NOBLOCK;
+ else
+ deadline = semaphore_deadline(wait_time.tv_sec, wait_time.tv_nsec);
return(semaphore_wait_internal(wait_semaphore,
signal_semaphore,
- &wait_time,
+ deadline, option,
(void(*)(kern_return_t))0));
}
*/
kern_return_t
semaphore_timedwait_signal_trap(
- mach_port_name_t wait_name,
- mach_port_name_t signal_name,
- unsigned int sec,
- clock_res_t nsec)
+ struct semaphore_timedwait_signal_trap_args *args)
+{
+ return(semaphore_timedwait_signal_trap_internal(args->wait_name, args->signal_name, args->sec, args->nsec, thread_syscall_return));
+}
+
+kern_return_t
+semaphore_timedwait_signal_trap_internal(
+ mach_port_name_t wait_name,
+ mach_port_name_t signal_name,
+ unsigned int sec,
+ clock_res_t nsec,
+ void (*caller_cont)(kern_return_t))
{
semaphore_t wait_semaphore;
semaphore_t signal_semaphore;
return KERN_INVALID_VALUE;
kr = port_name_to_semaphore(signal_name, &signal_semaphore);
- if (kr != KERN_SUCCESS)
- return kr;
-
- kr = port_name_to_semaphore(wait_name, &wait_semaphore);
- if (kr != KERN_SUCCESS) {
+ if (kr == KERN_SUCCESS) {
+ kr = port_name_to_semaphore(wait_name, &wait_semaphore);
+ if (kr == KERN_SUCCESS) {
+ int option = SEMAPHORE_OPTION_NONE;
+ uint64_t deadline = 0;
+
+ if (sec == 0 && nsec == 0)
+ option = SEMAPHORE_TIMEOUT_NOBLOCK;
+ else
+ deadline = semaphore_deadline(sec, nsec);
+
+ kr = semaphore_wait_internal(wait_semaphore,
+ signal_semaphore,
+ deadline, option,
+ caller_cont);
+ semaphore_dereference(wait_semaphore);
+ }
semaphore_dereference(signal_semaphore);
- return kr;
}
-
- kr = semaphore_wait_internal(wait_semaphore,
- signal_semaphore,
- &wait_time,
- thread_syscall_return);
-
- semaphore_dereference(wait_semaphore);
- semaphore_dereference(signal_semaphore);
return kr;
}
semaphore_reference(
semaphore_t semaphore)
{
- spl_t spl_level;
-
- spl_level = splsched();
- semaphore_lock(semaphore);
-
- semaphore->ref_count++;
-
- semaphore_unlock(semaphore);
- splx(spl_level);
+ (void)hw_atomic_add(&semaphore->ref_count, 1);
}
/*
semaphore_t semaphore)
{
int ref_count;
- spl_t spl_level;
if (semaphore != NULL) {
- spl_level = splsched();
- semaphore_lock(semaphore);
-
- ref_count = --(semaphore->ref_count);
+ ref_count = hw_atomic_sub(&semaphore->ref_count, 1);
- semaphore_unlock(semaphore);
- splx(spl_level);
-
- if (ref_count == 0) {
+ if (ref_count == 0) {
assert(wait_queue_empty(&semaphore->wait_queue));
- zfree(semaphore_zone, (vm_offset_t)semaphore);
- }
+ ipc_port_dealloc_kernel(semaphore->port);
+ zfree(semaphore_zone, semaphore);
+ }
}
}
projects / apple / xnu.git / blobdiff