We don't need actor_init because static variables are already initialized
to zero.
Rename actor_new to actor_init because "new" sounds like we're allocating
something and we're not -- the function is initializing the existing
struct actor.
Signed-off-by: Andy Grover <agro...@redhat.com>
---
usr/actor.c | 8 +-------
usr/actor.h | 2 +-
usr/initiator.c | 14 +++++++-------
usr/iscsid.c | 1 -
usr/iscsistart.c | 1 -
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/usr/actor.c b/usr/actor.c
index 7f93e76..a1373d6 100644
--- a/usr/actor.c
+++ b/usr/actor.c
@@ -51,13 +51,7 @@ actor_diff_time(actor_t *thread, uint64_t current_time)
((int64_t)(b) - (int64_t)(a) < 0)
void
-actor_init(void)
-{
- poll_in_progress = 0;
-}
-
-void
-actor_new(actor_t *thread, void (*callback)(void *), void *data)
+actor_init(actor_t *thread, void (*callback)(void *), void *data)
{
INIT_LIST_HEAD(&thread->list);
thread->state = ACTOR_NOTSCHEDULED;
diff --git a/usr/actor.h b/usr/actor.h
index 4c1ae60..697f13c 100644
--- a/usr/actor.h
+++ b/usr/actor.h
@@ -41,7 +41,7 @@ typedef struct actor {
uint64_t ttschedule;
} actor_t;
-extern void actor_new(actor_t *thread, void (*callback)(void *), void * data);
+extern void actor_init(actor_t *thread, void (*callback)(void *), void * data);
extern void actor_delete(actor_t *thread);
extern void actor_schedule_head(actor_t *thread);
extern void actor_schedule(actor_t *thread);
diff --git a/usr/initiator.c b/usr/initiator.c
index b4b8957..1e55f3a 100644
--- a/usr/initiator.c
+++ b/usr/initiator.c
@@ -1797,14 +1797,14 @@ static int iscsi_sched_ev_context(struct
iscsi_ev_context *ev_context,
ev_context->conn = conn;
switch (event) {
case EV_CONN_RECV_PDU:
- actor_new(&ev_context->actor, session_conn_recv_pdu,
+ actor_init(&ev_context->actor, session_conn_recv_pdu,
ev_context);
actor_schedule(&ev_context->actor);
break;
case EV_CONN_ERROR:
error = *(enum iscsi_err *)ev_context->data;
- actor_new(&ev_context->actor, session_conn_error,
+ actor_init(&ev_context->actor, session_conn_error,
ev_context);
/*
* We handle invalid host, by killing the session.
@@ -1817,26 +1817,26 @@ static int iscsi_sched_ev_context(struct
iscsi_ev_context *ev_context,
actor_schedule(&ev_context->actor);
break;
case EV_CONN_LOGIN:
- actor_new(&ev_context->actor, session_conn_process_login,
+ actor_init(&ev_context->actor, session_conn_process_login,
ev_context);
actor_schedule(&ev_context->actor);
break;
case EV_CONN_POLL:
- actor_new(&ev_context->actor, session_conn_poll,
+ actor_init(&ev_context->actor, session_conn_poll,
ev_context);
actor_schedule(&ev_context->actor);
break;
case EV_UIO_POLL:
- actor_new(&ev_context->actor, session_conn_uio_poll,
+ actor_init(&ev_context->actor, session_conn_uio_poll,
ev_context);
actor_schedule(&ev_context->actor);
break;
case EV_CONN_LOGOUT_TIMER:
- actor_timer(&ev_context->actor, tmo * 1000,
+ actor_timer(&ev_context->actor, tmo,
iscsi_logout_timedout, ev_context);
break;
case EV_CONN_STOP:
- actor_new(&ev_context->actor, iscsi_stop,
+ actor_init(&ev_context->actor, iscsi_stop,
ev_context);
actor_schedule(&ev_context->actor);
break;
diff --git a/usr/iscsid.c b/usr/iscsid.c
index d1756ef..547b45e 100644
--- a/usr/iscsid.c
+++ b/usr/iscsid.c
@@ -533,7 +533,6 @@ int main(int argc, char *argv[])
exit(ISCSI_ERR);
}
- actor_init();
event_loop(ipc, control_fd, mgmt_ipc_fd);
idbm_terminate();
diff --git a/usr/iscsistart.c b/usr/iscsistart.c
index 6924d49..2ddbc1a 100644
--- a/usr/iscsistart.c
+++ b/usr/iscsistart.c
@@ -509,7 +509,6 @@ int main(int argc, char *argv[])
* Start Main Event Loop
*/
iscsi_initiator_init();
- actor_init();
event_loop(ipc, control_fd, mgmt_ipc_fd);
ipc->ctldev_close();
mgmt_ipc_close(mgmt_ipc_fd);
--
1.9.3
--
You received this message because you are subscribed to the Google Groups
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.
