All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: kernel-janitors@lists.osdl.org, netdev@oss.sgi.com
Subject: [KJ] [PATCH] linux/ibmtr.h: add constants for appropriate delays
Date: Mon, 01 Nov 2004 18:38:00 +0000	[thread overview]
Message-ID: <20041101192210.GD1730@us.ibm.com> (raw)
In-Reply-To: <4184C66B.8040501@pobox.com>

[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]

On Sun, Oct 31, 2004 at 06:03:07AM -0500, Jeff Garzik wrote:
> janitor@sternwelten.at wrote:
> >Any comments would be appreciated.
> >
> >Description: Use msleep() / msleep_interruptible() [as appropriate]
> >instead of schedule_timeout() to guarantee the task delays as expected.
> >
> >Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> >Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
> >
> >---
> >
> > linux-2.6.10-rc1-max/drivers/net/tokenring/ibmtr.c |   11 +++++------
> > 1 files changed, 5 insertions(+), 6 deletions(-)

<snip>

> >-		schedule_timeout(TR_RST_TIME); /* wait 50ms */
> >+		msleep(jiffies_to_msecs(TR_RST_TIME)); /* wait 50ms */

<snip>

> >-	current->state=TASK_UNINTERRUPTIBLE;
> >-	schedule_timeout(TR_RST_TIME); /* wait 50ms */
> >+	msleep(jiffies_to_msecs(TR_RST_TIME));		/* wait 50ms */

<snip>

> >-		current->state=TASK_INTERRUPTIBLE;
> >-		i=schedule_timeout(TR_RETRY_INTERVAL); /* wait 30 seconds */
> >-		if(i!=0) break; /*prob. a signal, like the i>24*HZ case 
> >above */
> >+		if(msleep_interruptible(jiffies_to_msecs(TR_RETRY_INTERVAL)))
> >+			break; /*prob. a signal, like the i>24*HZ case above 

<snip>

> It makes more sense to convert the constants to msecs in the source 
> code, instead of converting them at runtime.

This required changing both the .h and .c files, the first of which is
attached below.

Description: Adds constant definitions for timeout variables in terms of
milliseconds to avoid run-time constant conversion.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

--- 2.6.10-rc1-vanilla/include/linux/ibmtr.h	2004-10-30 15:34:03.000000000 -0700
+++ 2.6.10-rc1/include/linux/ibmtr.h	2004-11-01 11:13:41.000000000 -0800
@@ -6,8 +6,10 @@
 
 /* ported to the Alpha architecture 02/20/96 (just used the HZ macro) */
 
-#define TR_RETRY_INTERVAL	(30*HZ)	/* 500 on PC = 5 s */
-#define TR_RST_TIME		(HZ/20) /* 5 on PC = 50 ms */
+#define TR_RETRY_INTERVAL	(30*HZ)	/* 500 on PC = 5 s (in jiffies) */
+#define TR_RETRY_INTERVAL	(30000) /* 500 on PC = 5 s */
+#define TR_RST_TIME		(HZ/20) /* 5 on PC = 50 ms (in jiffies) */
+#define TR_RST_TIME_MS		(50)    /* 5 on PC = 50 ms */
 #define TR_BUSY_INTERVAL	(HZ/5)	/* 5 on PC = 200 ms */
 #define TR_SPIN_INTERVAL	(3*HZ)	/* 3 seconds before init timeout */
 

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

WARNING: multiple messages have this Message-ID (diff)
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: kernel-janitors@lists.osdl.org, netdev@oss.sgi.com
Subject: [PATCH] linux/ibmtr.h: add constants for appropriate delays
Date: Mon, 1 Nov 2004 11:22:10 -0800	[thread overview]
Message-ID: <20041101192210.GD1730@us.ibm.com> (raw)
In-Reply-To: <4184C66B.8040501@pobox.com>

On Sun, Oct 31, 2004 at 06:03:07AM -0500, Jeff Garzik wrote:
> janitor@sternwelten.at wrote:
> >Any comments would be appreciated.
> >
> >Description: Use msleep() / msleep_interruptible() [as appropriate]
> >instead of schedule_timeout() to guarantee the task delays as expected.
> >
> >Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> >Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
> >
> >---
> >
> > linux-2.6.10-rc1-max/drivers/net/tokenring/ibmtr.c |   11 +++++------
> > 1 files changed, 5 insertions(+), 6 deletions(-)

<snip>

> >-		schedule_timeout(TR_RST_TIME); /* wait 50ms */
> >+		msleep(jiffies_to_msecs(TR_RST_TIME)); /* wait 50ms */

<snip>

> >-	current->state=TASK_UNINTERRUPTIBLE;
> >-	schedule_timeout(TR_RST_TIME); /* wait 50ms */
> >+	msleep(jiffies_to_msecs(TR_RST_TIME));		/* wait 50ms */

<snip>

> >-		current->state=TASK_INTERRUPTIBLE;
> >-		i=schedule_timeout(TR_RETRY_INTERVAL); /* wait 30 seconds */
> >-		if(i!=0) break; /*prob. a signal, like the i>24*HZ case 
> >above */
> >+		if(msleep_interruptible(jiffies_to_msecs(TR_RETRY_INTERVAL)))
> >+			break; /*prob. a signal, like the i>24*HZ case above 

<snip>

> It makes more sense to convert the constants to msecs in the source 
> code, instead of converting them at runtime.

This required changing both the .h and .c files, the first of which is
attached below.

Description: Adds constant definitions for timeout variables in terms of
milliseconds to avoid run-time constant conversion.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

--- 2.6.10-rc1-vanilla/include/linux/ibmtr.h	2004-10-30 15:34:03.000000000 -0700
+++ 2.6.10-rc1/include/linux/ibmtr.h	2004-11-01 11:13:41.000000000 -0800
@@ -6,8 +6,10 @@
 
 /* ported to the Alpha architecture 02/20/96 (just used the HZ macro) */
 
-#define TR_RETRY_INTERVAL	(30*HZ)	/* 500 on PC = 5 s */
-#define TR_RST_TIME		(HZ/20) /* 5 on PC = 50 ms */
+#define TR_RETRY_INTERVAL	(30*HZ)	/* 500 on PC = 5 s (in jiffies) */
+#define TR_RETRY_INTERVAL	(30000) /* 500 on PC = 5 s */
+#define TR_RST_TIME		(HZ/20) /* 5 on PC = 50 ms (in jiffies) */
+#define TR_RST_TIME_MS		(50)    /* 5 on PC = 50 ms */
 #define TR_BUSY_INTERVAL	(HZ/5)	/* 5 on PC = 200 ms */
 #define TR_SPIN_INTERVAL	(3*HZ)	/* 3 seconds before init timeout */
 

  parent reply	other threads:[~2004-11-01 18:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-10-30 22:43 [patch 15/18] net/ibmtr: replace schedule_timeout() with msleep()/msleep_interruptible() janitor
2004-10-31 11:03 ` Jeff Garzik
2004-11-01 18:32   ` [KJ] [PATCH] net/ibmtr: replace schedule_timeout() with Nishanth Aravamudan
2004-11-01 19:27     ` [PATCH] net/ibmtr: replace schedule_timeout() with msleep()/msleep_interruptible() Nishanth Aravamudan
2004-11-01 18:38   ` Nishanth Aravamudan [this message]
2004-11-01 19:22     ` [PATCH] linux/ibmtr.h: add constants for appropriate delays Nishanth Aravamudan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041101192210.GD1730@us.ibm.com \
    --to=nacc@us.ibm.com \
    --cc=jgarzik@pobox.com \
    --cc=kernel-janitors@lists.osdl.org \
    --cc=netdev@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.