projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Check return value of para_exec_cmdline_pid().
[paraslash.git]
/
sched.c
diff --git
a/sched.c
b/sched.c
index 06aabe02b9934e5107ea97f1a8769af060184da7..74f6a1b8a5effa6e13996771f4492fdee47d4bc0 100644
(file)
--- a/
sched.c
+++ b/
sched.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006-201
1
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-201
2
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-9,7
+9,6
@@
#include <regex.h>
#include <assert.h>
#include <sys/time.h>
#include <regex.h>
#include <assert.h>
#include <sys/time.h>
-#include <stdbool.h>
#include "para.h"
#include "ipc.h"
#include "para.h"
#include "ipc.h"
@@
-20,9
+19,6
@@
#include "time.h"
#include "error.h"
#include "time.h"
#include "error.h"
-static struct list_head pre_select_list, post_select_list;
-static int initialized;
-
static struct timeval now_struct;
struct timeval *now = &now_struct;
static struct timeval now_struct;
struct timeval *now = &now_struct;
@@
-36,8
+32,6
@@
struct timeval *now = &now_struct;
*/
static void unregister_task(struct task *t)
{
*/
static void unregister_task(struct task *t)
{
- if (!initialized)
- return;
assert(t->error < 0);
PARA_INFO_LOG("unregistering %s (%s)\n", t->status,
para_strerror(-t->error));
assert(t->error < 0);
PARA_INFO_LOG("unregistering %s (%s)\n", t->status,
para_strerror(-t->error));
@@
-56,7
+50,7
@@
static inline bool timeout_is_zero(struct sched *s)
static void sched_preselect(struct sched *s)
{
struct task *t, *tmp;
static void sched_preselect(struct sched *s)
{
struct task *t, *tmp;
- list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
+ list_for_each_entry_safe(t, tmp, &
s->
pre_select_list, pre_select_node) {
if (t->error < 0) {
unregister_task(t);
continue;
if (t->error < 0) {
unregister_task(t);
continue;
@@
-93,7
+87,7
@@
static void sched_post_select(struct sched *s)
{
struct task *t, *tmp;
{
struct task *t, *tmp;
- list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
+ list_for_each_entry_safe(t, tmp, &
s->
post_select_list, post_select_node) {
if (t->error >= 0)
call_post_select(s, t);
// PARA_INFO_LOG("%s: %d\n", t->status, t->ret);
if (t->error >= 0)
call_post_select(s, t);
// PARA_INFO_LOG("%s: %d\n", t->status, t->ret);
@@
-105,7
+99,7
@@
static void sched_post_select(struct sched *s)
* this case t has been unregistered already, so we must not
* unregister it again.
*/
* this case t has been unregistered already, so we must not
* unregister it again.
*/
- if (list_empty(&post_select_list))
+ if (list_empty(&
s->
post_select_list))
return;
unregister_task(t);
}
return;
unregister_task(t);
}
@@
-130,8
+124,6
@@
int schedule(struct sched *s)
{
int ret;
{
int ret;
- if (!initialized)
- return -E_NOT_INITIALIZED;
if (!s->select_function)
s->select_function = para_select;
again:
if (!s->select_function)
s->select_function = para_select;
again:
@@
-141,7
+133,7
@@
again:
s->max_fileno = -1;
gettimeofday(now, NULL);
sched_preselect(s);
s->max_fileno = -1;
gettimeofday(now, NULL);
sched_preselect(s);
- if (list_empty(&
pre_select_list) && list_empty(&
post_select_list))
+ if (list_empty(&
s->pre_select_list) && list_empty(&s->
post_select_list))
return 0;
if (!timeout_is_zero(s)) {
ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds,
return 0;
if (!timeout_is_zero(s)) {
ret = s->select_function(s->max_fileno + 1, &s->rfds, &s->wfds,
@@
-164,44
+156,36
@@
again:
FD_ZERO(&s->wfds);
}
sched_post_select(s);
FD_ZERO(&s->wfds);
}
sched_post_select(s);
- if (list_empty(&
pre_select_list) && list_empty(&
post_select_list))
+ if (list_empty(&
s->pre_select_list) && list_empty(&s->
post_select_list))
return 0;
goto again;
}
return 0;
goto again;
}
-/*
- * Initialize the paraslash scheduler.
- */
-static void init_sched(void)
-{
- PARA_INFO_LOG("initializing scheduler\n");
- INIT_LIST_HEAD(&pre_select_list);
- INIT_LIST_HEAD(&post_select_list);
- initialized = 1;
-}
-
/**
* Add a task to the scheduler.
*
/**
* Add a task to the scheduler.
*
- * \param t the task to add
+ * \param t The task to add.
+ * \param s The scheduler instance to add the task to.
*
* If the pre_select pointer of \a t is not \p NULL, it is added to
* the pre_select list of the scheduler. Same goes for post_select.
*
* \sa task::pre_select, task::post_select
*/
*
* If the pre_select pointer of \a t is not \p NULL, it is added to
* the pre_select list of the scheduler. Same goes for post_select.
*
* \sa task::pre_select, task::post_select
*/
-void register_task(struct task *t)
+void register_task(struct
sched *s, struct
task *t)
{
{
- if (!initialized)
- init_sched();
PARA_INFO_LOG("registering %s (%p)\n", t->status, t);
PARA_INFO_LOG("registering %s (%p)\n", t->status, t);
+ if (!s->pre_select_list.next)
+ INIT_LIST_HEAD(&s->pre_select_list);
+ if (!s->post_select_list.next)
+ INIT_LIST_HEAD(&s->post_select_list);
if (t->pre_select) {
PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select);
if (t->pre_select) {
PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select);
- list_add_tail(&t->pre_select_node, &pre_select_list);
+ list_add_tail(&t->pre_select_node, &
s->
pre_select_list);
}
if (t->post_select) {
PARA_DEBUG_LOG("post_select: %p\n", &t->post_select);
}
if (t->post_select) {
PARA_DEBUG_LOG("post_select: %p\n", &t->post_select);
- list_add_tail(&t->post_select_node, &post_select_list);
+ list_add_tail(&t->post_select_node, &
s->
post_select_list);
}
}
}
}
@@
-212,21
+196,18
@@
void register_task(struct task *t)
* \a pre_select_list and the \a post_select_list are empty. This function
* must be called from the post_select (rather than the pre_select) method.
*/
* \a pre_select_list and the \a post_select_list are empty. This function
* must be called from the post_select (rather than the pre_select) method.
*/
-void sched_shutdown(
void
)
+void sched_shutdown(
struct sched *s
)
{
struct task *t, *tmp;
{
struct task *t, *tmp;
- if (!initialized)
- return;
- list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
+ list_for_each_entry_safe(t, tmp, &s->pre_select_list, pre_select_node) {
t->error = -E_SCHED_SHUTDOWN;
unregister_task(t);
}
t->error = -E_SCHED_SHUTDOWN;
unregister_task(t);
}
- list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
+ list_for_each_entry_safe(t, tmp, &
s->
post_select_list, post_select_node) {
t->error = -E_SCHED_SHUTDOWN;
unregister_task(t);
}
t->error = -E_SCHED_SHUTDOWN;
unregister_task(t);
}
- initialized = 0;
}
/**
}
/**
@@
-237,20
+218,18
@@
void sched_shutdown(void)
* Each entry of the list contains an identifier which is simply a hex number.
* The result is dynamically allocated and must be freed by the caller.
*/
* Each entry of the list contains an identifier which is simply a hex number.
* The result is dynamically allocated and must be freed by the caller.
*/
-char *get_task_list(
void
)
+char *get_task_list(
struct sched *s
)
{
struct task *t, *tmp;
char *msg = NULL;
{
struct task *t, *tmp;
char *msg = NULL;
- if (!initialized)
- return NULL;
- list_for_each_entry_safe(t, tmp, &pre_select_list, pre_select_node) {
+ list_for_each_entry_safe(t, tmp, &s->pre_select_list, pre_select_node) {
char *tmp_msg;
tmp_msg = make_message("%s%p\tpre\t%s\n", msg? msg : "", t, t->status);
free(msg);
msg = tmp_msg;
}
char *tmp_msg;
tmp_msg = make_message("%s%p\tpre\t%s\n", msg? msg : "", t, t->status);
free(msg);
msg = tmp_msg;
}
- list_for_each_entry_safe(t, tmp, &post_select_list, post_select_node) {
+ list_for_each_entry_safe(t, tmp, &
s->
post_select_list, post_select_node) {
char *tmp_msg;
// if (t->pre_select)
// continue;
char *tmp_msg;
// if (t->pre_select)
// continue;
@@
-335,8
+314,8
@@
int sched_request_barrier(struct timeval *barrier, struct sched *s)
* \param barrier Absolute time before select() should return.
* \param s Pointer to the scheduler struct.
*
* \param barrier Absolute time before select() should return.
* \param s Pointer to the scheduler struct.
*
- *
If \a barrier is in the past, this function requests a minimal timeout and
- * returns zero. Otherwise it returns one.
+ *
\return If \a barrier is in the past, this function requests a minimal
+ *
timeout and
returns zero. Otherwise it returns one.
*
* \sa sched_min_delay(), sched_request_barrier().
*/
*
* \sa sched_min_delay(), sched_request_barrier().
*/