git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: Update the clock of runqueue select_task_rq() selected
[safe/jmp/linux-2.6]
/
kernel
/
async.c
diff --git
a/kernel/async.c
b/kernel/async.c
index
b5f0d4b
..
27235f5
100644
(file)
--- a/
kernel/async.c
+++ b/
kernel/async.c
@@
-49,6
+49,7
@@
asynchronous and synchronous parts of the kernel.
*/
#include <linux/async.h>
*/
#include <linux/async.h>
+#include <linux/bug.h>
#include <linux/module.h>
#include <linux/wait.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/wait.h>
#include <linux/sched.h>
@@
-91,19
+92,18
@@
extern int initcall_debug;
static async_cookie_t __lowest_in_progress(struct list_head *running)
{
struct async_entry *entry;
static async_cookie_t __lowest_in_progress(struct list_head *running)
{
struct async_entry *entry;
+
if (!list_empty(running)) {
entry = list_first_entry(running,
struct async_entry, list);
return entry->cookie;
if (!list_empty(running)) {
entry = list_first_entry(running,
struct async_entry, list);
return entry->cookie;
- } else if (!list_empty(&async_pending)) {
- entry = list_first_entry(&async_pending,
- struct async_entry, list);
- return entry->cookie;
- } else {
- /* nothing in progress... next_cookie is "infinity" */
- return next_cookie;
}
}
+ list_for_each_entry(entry, &async_pending, list)
+ if (entry->running == running)
+ return entry->cookie;
+
+ return next_cookie; /* "infinity" value */
}
static async_cookie_t lowest_in_progress(struct list_head *running)
}
static async_cookie_t lowest_in_progress(struct list_head *running)
@@
-133,8
+133,7
@@
static void run_one_entry(void)
entry = list_first_entry(&async_pending, struct async_entry, list);
/* 2) move it to the running queue */
entry = list_first_entry(&async_pending, struct async_entry, list);
/* 2) move it to the running queue */
- list_del(&entry->list);
- list_add_tail(&entry->list, entry->running);
+ list_move_tail(&entry->list, entry->running);
spin_unlock_irqrestore(&async_lock, flags);
/* 3) run it (and print duration)*/
spin_unlock_irqrestore(&async_lock, flags);
/* 3) run it (and print duration)*/
@@
-224,22
+223,23
@@
async_cookie_t async_schedule(async_func_ptr *ptr, void *data)
EXPORT_SYMBOL_GPL(async_schedule);
/**
EXPORT_SYMBOL_GPL(async_schedule);
/**
- * async_schedule_
special - schedule a function for asynchronous execution with a special running queue
+ * async_schedule_
domain - schedule a function for asynchronous execution within a certain domain
* @ptr: function to execute asynchronously
* @data: data pointer to pass to the function
* @ptr: function to execute asynchronously
* @data: data pointer to pass to the function
- * @running:
list head to add to while running
+ * @running:
running list for the domain
*
* Returns an async_cookie_t that may be used for checkpointing later.
*
* Returns an async_cookie_t that may be used for checkpointing later.
- * @running may be used in the async_synchronize_*_
special
() functions
- * to wait
on a special running queue rather than on the global running
- *
queu
e.
+ * @running may be used in the async_synchronize_*_
domain
() functions
+ * to wait
within a certain synchronization domain rather than globally.
+ *
A synchronization domain is specified via the running queue @running to us
e.
* Note: This function may be called from atomic or non-atomic contexts.
*/
* Note: This function may be called from atomic or non-atomic contexts.
*/
-async_cookie_t async_schedule_special(async_func_ptr *ptr, void *data, struct list_head *running)
+async_cookie_t async_schedule_domain(async_func_ptr *ptr, void *data,
+ struct list_head *running)
{
return __async_schedule(ptr, data, running);
}
{
return __async_schedule(ptr, data, running);
}
-EXPORT_SYMBOL_GPL(async_schedule_
special
);
+EXPORT_SYMBOL_GPL(async_schedule_
domain
);
/**
* async_synchronize_full - synchronize all asynchronous function calls
/**
* async_synchronize_full - synchronize all asynchronous function calls
@@
-255,27
+255,29
@@
void async_synchronize_full(void)
EXPORT_SYMBOL_GPL(async_synchronize_full);
/**
EXPORT_SYMBOL_GPL(async_synchronize_full);
/**
- * async_synchronize_full_
special - synchronize all asynchronous function calls for a running list
+ * async_synchronize_full_
domain - synchronize all asynchronous function within a certain domain
* @list: running list to synchronize on
*
* @list: running list to synchronize on
*
- * This function waits until all asynchronous function calls for the
running
- * list @list have been done.
+ * This function waits until all asynchronous function calls for the
+ *
synchronization domain specified by the running
list @list have been done.
*/
*/
-void async_synchronize_full_
special
(struct list_head *list)
+void async_synchronize_full_
domain
(struct list_head *list)
{
{
- async_synchronize_cookie_
special
(next_cookie, list);
+ async_synchronize_cookie_
domain
(next_cookie, list);
}
}
-EXPORT_SYMBOL_GPL(async_synchronize_full_
special
);
+EXPORT_SYMBOL_GPL(async_synchronize_full_
domain
);
/**
/**
- * async_synchronize_cookie_
special - synchronize asynchronous function calls on a running list
with cookie checkpointing
+ * async_synchronize_cookie_
domain - synchronize asynchronous function calls within a certain domain
with cookie checkpointing
* @cookie: async_cookie_t to use as checkpoint
* @running: running list to synchronize on
*
* @cookie: async_cookie_t to use as checkpoint
* @running: running list to synchronize on
*
- * This function waits until all asynchronous function calls for the running
- * list @list submitted prior to @cookie have been done.
+ * This function waits until all asynchronous function calls for the
+ * synchronization domain specified by the running list @list submitted
+ * prior to @cookie have been done.
*/
*/
-void async_synchronize_cookie_special(async_cookie_t cookie, struct list_head *running)
+void async_synchronize_cookie_domain(async_cookie_t cookie,
+ struct list_head *running)
{
ktime_t starttime, delta, endtime;
{
ktime_t starttime, delta, endtime;
@@
-295,7
+297,7
@@
void async_synchronize_cookie_special(async_cookie_t cookie, struct list_head *r
(long long)ktime_to_ns(delta) >> 10);
}
}
(long long)ktime_to_ns(delta) >> 10);
}
}
-EXPORT_SYMBOL_GPL(async_synchronize_cookie_
special
);
+EXPORT_SYMBOL_GPL(async_synchronize_cookie_
domain
);
/**
* async_synchronize_cookie - synchronize asynchronous function calls with cookie checkpointing
/**
* async_synchronize_cookie - synchronize asynchronous function calls with cookie checkpointing
@@
-306,7
+308,7
@@
EXPORT_SYMBOL_GPL(async_synchronize_cookie_special);
*/
void async_synchronize_cookie(async_cookie_t cookie)
{
*/
void async_synchronize_cookie(async_cookie_t cookie)
{
- async_synchronize_cookie_
special
(cookie, &async_running);
+ async_synchronize_cookie_
domain
(cookie, &async_running);
}
EXPORT_SYMBOL_GPL(async_synchronize_cookie);
}
EXPORT_SYMBOL_GPL(async_synchronize_cookie);
@@
-385,20
+387,11
@@
static int async_manager_thread(void *unused)
static int __init async_init(void)
{
static int __init async_init(void)
{
- if (async_enabled)
- if (IS_ERR(kthread_run(async_manager_thread, NULL,
- "async/mgr")))
- async_enabled = 0;
- return 0;
-}
+ async_enabled =
+ !IS_ERR(kthread_run(async_manager_thread, NULL, "async/mgr"));
-static int __init setup_async(char *str)
-{
- async_enabled = 1;
- return 1;
+ WARN_ON(!async_enabled);
+ return 0;
}
}
-__setup("fastboot", setup_async);
-
-
core_initcall(async_init);
core_initcall(async_init);