projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some more FEC source code documentation.
[paraslash.git]
/
sched.c
diff --git
a/sched.c
b/sched.c
index 2500406005614dc3850a283e37057cc844608ac3..9e346df20f5f4d03e6d1dfaa4322a3eace524db1 100644
(file)
--- a/
sched.c
+++ b/
sched.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-200
9
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.
*/
@@
-32,17
+32,17
@@
struct timeval *now = &now_struct;
* If the pre_select pointer of \a t is not \p NULL, it is removed from
* the pre_select list of the scheduler. Same goes for \a post_select.
*/
* If the pre_select pointer of \a t is not \p NULL, it is removed from
* the pre_select list of the scheduler. Same goes for \a post_select.
*/
-void unregister_task(struct task *t)
+
static
void unregister_task(struct task *t)
{
if (!initialized)
return;
{
if (!initialized)
return;
- PARA_INFO_LOG("unregistering %s (%p)\n", t->status, t);
+ PARA_INFO_LOG("unregistering %s (%s)\n", t->status,
+ t->error <0? para_strerror(-t->error) : "shutdown");
if (t->pre_select)
list_del(&t->pre_select_node);
if (t->post_select)
list_del(&t->post_select_node);
if (t->pre_select)
list_del(&t->pre_select_node);
if (t->post_select)
list_del(&t->post_select_node);
- if (t->error >= 0)
- t->error = -E_TASK_KILLED;
+ t->error = -E_TASK_UNREGISTERED;
};
};
@@
-105,6
+105,8
@@
int schedule(struct sched *s)
if (!initialized)
return -E_NOT_INITIALIZED;
if (!initialized)
return -E_NOT_INITIALIZED;
+ if (!s->select_function)
+ s->select_function = para_select;
gettimeofday(now, NULL);
again:
FD_ZERO(&s->rfds);
gettimeofday(now, NULL);
again:
FD_ZERO(&s->rfds);
@@
-114,7
+116,7
@@
again:
sched_preselect(s);
if (list_empty(&pre_select_list) && list_empty(&post_select_list))
return 0;
sched_preselect(s);
if (list_empty(&pre_select_list) && list_empty(&post_select_list))
return 0;
- ret =
para_select
(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
+ ret =
s->select_function
(s->max_fileno + 1, &s->rfds, &s->wfds, &s->timeout);
if (ret < 0)
return ret;
gettimeofday(now, NULL);
if (ret < 0)
return ret;
gettimeofday(now, NULL);