i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use send_signal_etc() instead of resume_thread() to prevent immediate

Browse Source 
rescheduling; this allows DPC queues to be created before the scheduler is
  running.
* Removed BeOS R5 support.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36289 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-15 12:31:56 +00:00
parent eec1db5a07
commit e1bef3de00
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/dpc/dpc.c
+19 -20
View File
@@ -1,21 +1,24 @@
/* Deferred Procedure Call support kernel module /*
* * Copyright 2007-2010, Haiku, Inc. All Rights Reserved.
* Copyright 2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Philippe Houdoin, [email protected] * Philippe Houdoin, [email protected]
*/ */
//! Deferred Procedure Call support kernel module
#include <KernelExport.h> #include <KernelExport.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef COMPILE_FOR_R5
#include <stdio.h> // For snprintf()
#endif
#include <dpc.h> #include <dpc.h>
// Private DPC queue structures // Private DPC queue structures
typedef struct { typedef struct {
dpc_func function; dpc_func function;
@@ -42,15 +45,15 @@ dpc_thread(void *arg)
{ {
dpc_queue *queue = arg; dpc_queue *queue = arg;
dpc_slot dpc; dpc_slot dpc;
// Let's wait forever/until semaphore death for new DPC slot to show up // Let's wait forever/until semaphore death for new DPC slot to show up
while (acquire_sem(queue->wakeup_sem) == B_OK) { while (acquire_sem(queue->wakeup_sem) == B_OK) {
cpu_status former; cpu_status former;
// grab the next dpc slot // grab the next dpc slot
former = disable_interrupts(); former = disable_interrupts();
acquire_spinlock(&queue->lock); acquire_spinlock(&queue->lock);
dpc = queue->slots[queue->head]; dpc = queue->slots[queue->head];
queue->head = (queue->head++) % queue->size; queue->head = (queue->head++) % queue->size;
queue->count--; queue->count--;
@@ -73,7 +76,9 @@ dpc_thread(void *arg)
return 0; return 0;
} }
// ---- Public API
// #pragma mark - public API
static status_t static status_t
new_dpc_queue(void **handle, const char *name, int32 priority) new_dpc_queue(void **handle, const char *name, int32 priority)
@@ -93,14 +98,8 @@ new_dpc_queue(void **handle, const char *name, int32 priority)
queue->count = 0; queue->count = 0;
B_INITIALIZE_SPINLOCK(&queue->lock); // Init the spinlock B_INITIALIZE_SPINLOCK(&queue->lock); // Init the spinlock
#ifdef __HAIKU__
snprintf(str, sizeof(str), "%.*s_wakeup_sem", snprintf(str, sizeof(str), "%.*s_wakeup_sem",
(int) sizeof(str) - 11, name); (int) sizeof(str) - 11, name);
#else
strncpy(str, name, sizeof(str) - 1);
strncat(str, "_wakeup_sem", sizeof(str) - 1);
str[sizeof(str) - 1] = '\0';
#endif
queue->wakeup_sem = create_sem(0, str); queue->wakeup_sem = create_sem(0, str);
if (queue->wakeup_sem < B_OK) { if (queue->wakeup_sem < B_OK) {
@@ -108,7 +107,6 @@ new_dpc_queue(void **handle, const char *name, int32 priority)
free(queue); free(queue);
return status; return status;
} }
set_sem_owner(queue->wakeup_sem, B_SYSTEM_TEAM);
// Fire a kernel thread to actually handle (aka call them!) // Fire a kernel thread to actually handle (aka call them!)
// the queued/deferred procedure calls // the queued/deferred procedure calls
@@ -119,7 +117,7 @@ new_dpc_queue(void **handle, const char *name, int32 priority)
free(queue); free(queue);
return status; return status;
} }
resume_thread(queue->thread); send_signal_etc(queue->thread, SIGCONT, B_DO_NOT_RESCHEDULE);
*handle = queue; *handle = queue;
@@ -167,7 +165,7 @@ queue_dpc(void *handle, dpc_func function, void *arg)
if (!queue || !function) if (!queue || !function)
return B_BAD_VALUE; return B_BAD_VALUE;
// Try to be safe being called from interrupt handlers: // Try to be safe being called from interrupt handlers:
former = disable_interrupts(); former = disable_interrupts();
acquire_spinlock(&queue->lock); acquire_spinlock(&queue->lock);
@@ -212,6 +210,7 @@ std_ops(int32 op, ...)
} }
} }
static dpc_module_info sDPCModule = { static dpc_module_info sDPCModule = {
{ {
B_DPC_MODULE_NAME, B_DPC_MODULE_NAME,