* [patch 14/26] net/slip: replace schedule_timeout() with msleep()
@ 2005-03-06 10:33 domen
2005-03-22 23:59 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: domen @ 2005-03-06 10:33 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, domen, nacc
Use msleep() instead of schedule_timeout() to guarantee
the task delays as expected. While the original code does use
TASK_INTERRUPTIBLE, it does not check for signals, so I believe msleep() is more
appropriate.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/drivers/net/slip.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff -puN drivers/net/slip.c~msleep-drivers_net_slip drivers/net/slip.c
--- kj/drivers/net/slip.c~msleep-drivers_net_slip 2005-03-05 16:10:49.000000000 +0100
+++ kj-domen/drivers/net/slip.c 2005-03-05 16:10:49.000000000 +0100
@@ -75,6 +75,7 @@
#include <linux/if_arp.h>
#include <linux/if_slip.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include "slip.h"
#ifdef CONFIG_INET
#include <linux/ip.h>
@@ -1395,10 +1396,8 @@ static void __exit slip_exit(void)
/* First of all: check for active disciplines and hangup them.
*/
do {
- if (busy) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
- }
+ if (busy)
+ msleep(100);
busy = 0;
for (i = 0; i < slip_maxdev; i++) {
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 14/26] net/slip: replace schedule_timeout() with msleep()
2005-03-06 10:33 [patch 14/26] net/slip: replace schedule_timeout() with msleep() domen
@ 2005-03-22 23:59 ` Jeff Garzik
2005-03-23 17:28 ` Nishanth Aravamudan
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2005-03-22 23:59 UTC (permalink / raw)
To: domen; +Cc: netdev, nacc
domen@coderock.org wrote:
> Use msleep() instead of schedule_timeout() to guarantee
> the task delays as expected. While the original code does use
> TASK_INTERRUPTIBLE, it does not check for signals, so I believe msleep() is more
> appropriate.
>
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> Signed-off-by: Domen Puncer <domen@coderock.org>
> ---
>
>
> kj-domen/drivers/net/slip.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff -puN drivers/net/slip.c~msleep-drivers_net_slip drivers/net/slip.c
> --- kj/drivers/net/slip.c~msleep-drivers_net_slip 2005-03-05 16:10:49.000000000 +0100
> +++ kj-domen/drivers/net/slip.c 2005-03-05 16:10:49.000000000 +0100
> @@ -75,6 +75,7 @@
> #include <linux/if_arp.h>
> #include <linux/if_slip.h>
> #include <linux/init.h>
> +#include <linux/delay.h>
> #include "slip.h"
> #ifdef CONFIG_INET
> #include <linux/ip.h>
> @@ -1395,10 +1396,8 @@ static void __exit slip_exit(void)
> /* First of all: check for active disciplines and hangup them.
> */
> do {
> - if (busy) {
> - set_current_state(TASK_INTERRUPTIBLE);
> - schedule_timeout(HZ / 10);
> - }
> + if (busy)
> + msleep(100);
msleep_interruptible
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 14/26] net/slip: replace schedule_timeout() with msleep()
2005-03-22 23:59 ` Jeff Garzik
@ 2005-03-23 17:28 ` Nishanth Aravamudan
0 siblings, 0 replies; 3+ messages in thread
From: Nishanth Aravamudan @ 2005-03-23 17:28 UTC (permalink / raw)
To: Jeff Garzik; +Cc: domen, netdev
On Tue, Mar 22, 2005 at 06:59:14PM -0500, Jeff Garzik wrote:
> domen@coderock.org wrote:
> >Use msleep() instead of schedule_timeout() to guarantee
> >the task delays as expected. While the original code does use
> >TASK_INTERRUPTIBLE, it does not check for signals, so I believe msleep()
> >is more
> >appropriate.
> >
> >Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> >Signed-off-by: Domen Puncer <domen@coderock.org>
> >---
> >
> >
> > kj-domen/drivers/net/slip.c | 7 +++----
> > 1 files changed, 3 insertions(+), 4 deletions(-)
> >
> >diff -puN drivers/net/slip.c~msleep-drivers_net_slip drivers/net/slip.c
> >--- kj/drivers/net/slip.c~msleep-drivers_net_slip 2005-03-05
> >16:10:49.000000000 +0100
> >+++ kj-domen/drivers/net/slip.c 2005-03-05 16:10:49.000000000 +0100
> >@@ -75,6 +75,7 @@
> > #include <linux/if_arp.h>
> > #include <linux/if_slip.h>
> > #include <linux/init.h>
> >+#include <linux/delay.h>
> > #include "slip.h"
> > #ifdef CONFIG_INET
> > #include <linux/ip.h>
> >@@ -1395,10 +1396,8 @@ static void __exit slip_exit(void)
> > /* First of all: check for active disciplines and hangup them.
> > */
> > do {
> >- if (busy) {
> >- set_current_state(TASK_INTERRUPTIBLE);
> >- schedule_timeout(HZ / 10);
> >- }
> >+ if (busy)
> >+ msleep(100);
>
> msleep_interruptible
I'm fine with changing this; what should the code do if a signal causes
an early return? I switched to msleep() in my patch because the current
code did nothing and that seemed buggy to me.
Thanks for the feedback,
Nish
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-03-23 17:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-06 10:33 [patch 14/26] net/slip: replace schedule_timeout() with msleep() domen
2005-03-22 23:59 ` Jeff Garzik
2005-03-23 17:28 ` Nishanth Aravamudan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).