Attachment 313656 Details for Bug 458213 – patch

[patch] patch

iscsi-initiator-utils-iscsid-fewer-wakeups.patch (text/plain), 2.19 KB, created by Adam Jackson on 2008-08-07 01:11:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2008-08-07 01:11:50 UTC

Size: 2.19 KB

patch

obsolete

>diff -up open-iscsi-2.0-868-test1/usr/actor.c.jx open-iscsi-2.0-868-test1/usr/actor.c
>--- open-iscsi-2.0-868-test1/usr/actor.c.jx	2008-01-03 14:23:36.000000000 -0500
>+++ open-iscsi-2.0-868-test1/usr/actor.c	2008-08-06 20:36:41.000000000 -0400
>@@ -28,6 +28,7 @@ static volatile uint64_t previous_time;
> static volatile uint32_t scheduler_loops;
> static volatile int poll_in_progress;
> static volatile uint64_t actor_jiffies = 0;
>+static int num_actors;
> 
> #define actor_diff(_time1, _time2) ({ \
>         uint64_t __ret; \
>@@ -65,6 +66,7 @@ actor_init(void)
> void
> actor_new(actor_t *thread, void (*callback)(void *), void *data)
> {
>+	num_actors++;
> 	INIT_LIST_HEAD(&thread->list);
> 	thread->state = ACTOR_NOTSCHEDULED;
> 	thread->callback = callback;
>@@ -87,6 +89,13 @@ actor_delete(actor_t *thread)
> 		break;
> 	}
> 	thread->state = ACTOR_NOTSCHEDULED;
>+	num_actors--;
>+}
>+
>+int
>+actor_count(void)
>+{
>+	return num_actors;
> }
> 
> static void
>@@ -278,4 +287,6 @@ actor_poll(void)
> 	}
> 
> 	ACTOR_TICKS++;
>+
>+	return num_actors;
> }
>diff -up open-iscsi-2.0-868-test1/usr/actor.h.jx open-iscsi-2.0-868-test1/usr/actor.h
>--- open-iscsi-2.0-868-test1/usr/actor.h.jx	2008-01-03 14:23:36.000000000 -0500
>+++ open-iscsi-2.0-868-test1/usr/actor.h	2008-08-06 20:36:39.000000000 -0400
>@@ -44,6 +44,7 @@ typedef struct actor {
> 
> extern void actor_new(actor_t *thread, void (*callback)(void *), void * data);
> extern void actor_delete(actor_t *thread);
>+extern int actor_count(void);
> extern void actor_schedule(actor_t *thread);
> extern void actor_timer(actor_t *thread, uint32_t timeout,
> 			void (*callback)(void *), void *data);
>diff -up open-iscsi-2.0-868-test1/usr/mgmt_ipc.c.jx open-iscsi-2.0-868-test1/usr/mgmt_ipc.c
>--- open-iscsi-2.0-868-test1/usr/mgmt_ipc.c.jx	2008-01-03 14:23:36.000000000 -0500
>+++ open-iscsi-2.0-868-test1/usr/mgmt_ipc.c	2008-08-06 20:42:20.000000000 -0400
>@@ -652,7 +652,8 @@ void event_loop(struct iscsi_ipc *ipc, i
> 
> 	leave_event_loop = 0;
> 	while (!leave_event_loop) {
>-		res = poll(poll_array, POLL_MAX, ACTOR_RESOLUTION);
>+		int timeout = actor_count() ? ACTOR_RESOLUTION : -1;
>+		res = poll(poll_array, POLL_MAX, timeout);
> 		if (res > 0) {
> 			log_debug(6, "poll result %d", res);
> 			if (poll_array[POLL_CTRL].revents)

Actions: View | Diff

Attachments on bug 458213: 313656 | 441292