From 39156922f68cd1254c86a62bbfbed6bc9d87da70 Mon Sep 17 00:00:00 2001 From: ache Date: Thu, 23 Oct 1997 20:11:01 +0000 Subject: Remove private sleep/usleep hacks --- usr.sbin/ppp/timer.c | 64 +--------------------------------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) (limited to 'usr.sbin/ppp/timer.c') diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c index 4790035..8454f69 100644 --- a/usr.sbin/ppp/timer.c +++ b/usr.sbin/ppp/timer.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: timer.c,v 1.17 1997/06/09 03:27:40 brian Exp $ + * $Id: timer.c,v 1.18 1997/08/25 00:29:30 brian Exp $ * * TODO: */ @@ -197,68 +197,6 @@ ShowTimers() } #ifdef SIGALRM -u_int -sleep(u_int sec) -{ - struct timeval to, st, et; - long sld, nwd, std; - - gettimeofday(&st, NULL); - to.tv_sec = sec; - to.tv_usec = 0; - std = st.tv_sec * 1000000 + st.tv_usec; - for (;;) { - if (select(0, NULL, NULL, NULL, &to) == 0 || - errno != EINTR) { - break; - } else { - gettimeofday(&et, NULL); - sld = to.tv_sec * 1000000 + to.tv_sec; - nwd = et.tv_sec * 1000000 + et.tv_usec - std; - if (sld > nwd) - sld -= nwd; - else - sld = 1; /* Avoid both tv_sec/usec is 0 */ - - /* Calculate timeout value for select */ - to.tv_sec = sld / 1000000; - to.tv_usec = sld % 1000000; - } - } - return (0L); -} - -void -usleep(u_int usec) -{ - struct timeval to, st, et; - long sld, nwd, std; - - gettimeofday(&st, NULL); - to.tv_sec = 0; - to.tv_usec = usec; - std = st.tv_sec * 1000000 + st.tv_usec; - for (;;) { - if (select(0, NULL, NULL, NULL, &to) == 0 || - errno != EINTR) { - break; - } else { - gettimeofday(&et, NULL); - sld = to.tv_sec * 1000000 + to.tv_sec; - nwd = et.tv_sec * 1000000 + et.tv_usec - std; - if (sld > nwd) - sld -= nwd; - else - sld = 1; /* Avoid both tv_sec/usec is 0 */ - - /* Calculate timeout value for select */ - to.tv_sec = sld / 1000000; - to.tv_usec = sld % 1000000; - - } - } -} - void InitTimerService(void) { -- cgit v1.1