CLEANUP: connection: rename the wait_event.task field to .tasklet
It's really confusing to call it a task because it's a tasklet and used
in places where tasks and tasklets are used together. Let's rename it
to tasklet to remove this confusion.
diff --git a/include/proto/connection.h b/include/proto/connection.h
index 67177c5..115e7aa 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -716,9 +716,9 @@
static inline struct wait_event *wl_set_waitcb(struct wait_event *wl, struct task *(*cb)(struct task *, void *, unsigned short), void *ctx)
{
- if (!wl->task->process) {
- wl->task->process = cb;
- wl->task->context = ctx;
+ if (!wl->tasklet->process) {
+ wl->tasklet->process = cb;
+ wl->tasklet->context = ctx;
}
return wl;
}
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 50373ac..63f1738 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -122,11 +122,11 @@
si->end = NULL;
si->state = si->prev_state = SI_ST_INI;
si->ops = &si_embedded_ops;
- si->wait_event.task = tasklet_new();
- if (!si->wait_event.task)
+ si->wait_event.tasklet = tasklet_new();
+ if (!si->wait_event.tasklet)
return -1;
- si->wait_event.task->process = si_cs_io_cb;
- si->wait_event.task->context = si;
+ si->wait_event.tasklet->process = si_cs_io_cb;
+ si->wait_event.tasklet->context = si;
si->wait_event.events = 0;
return 0;
}
diff --git a/include/types/connection.h b/include/types/connection.h
index 54f8d1a..cc2fb17 100644
--- a/include/types/connection.h
+++ b/include/types/connection.h
@@ -65,7 +65,7 @@
};
struct wait_event {
- struct tasklet *task;
+ struct tasklet *tasklet;
int events; /* set of enum sub_event_type above */
};