ncurses 5.6 - patch 20080412

[ncurses.git] / ncurses / tty / lib_twait.c

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index a907914accd71aaa72c0be764771771bf2a68b76..ec9daae80390e8d272711dc49bd1befffa959676 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -61,31 +62,34 @@
 # endif
 #endif
 
 # endif
 #endif
 

-MODULE_ID("$Id: lib_twait.c,v 1.46 2002/09/01 00:28:18 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.55 2008/03/01 22:08:31 tom Exp $")

 
 static long
 
 static long

-_nc_gettime(bool first)
+_nc_gettime(TimeType * t0, bool first)

 {
     long res;
 
 {
     long res;
 

-#if HAVE_GETTIMEOFDAY
-# define PRECISE_GETTIME 1
-    static struct timeval t0;
-    struct timeval t1;
+#if PRECISE_GETTIME
+    TimeType t1;

     gettimeofday(&t1, (struct timezone *) 0);
     if (first) {
     gettimeofday(&t1, (struct timezone *) 0);
     if (first) {

-       t0 = t1;
+       *t0 = t1;
+       res = 0;
+    } else {
+       /* .tv_sec and .tv_usec are unsigned, be careful when subtracting */
+       if (t0->tv_usec > t1.tv_usec) {
+           t1.tv_usec += 1000000;      /* Convert 1s in 1e6 microsecs */
+           t1.tv_sec--;
+       }
+       res = (t1.tv_sec - t0->tv_sec) * 1000
+           + (t1.tv_usec - t0->tv_usec) / 1000;

     }
     }

-    res = (t1.tv_sec - t0.tv_sec) * 1000
-       + (t1.tv_usec - t0.tv_usec) / 1000;

 #else
 #else

-# define PRECISE_GETTIME 0
-    static time_t t0;

     time_t t1 = time((time_t *) 0);
     if (first) {
     time_t t1 = time((time_t *) 0);
     if (first) {

-       t0 = t1;
+       *t0 = t1;

     }
     }

-    res = (t1 - t0) * 1000;
+    res = (t1 - *t0) * 1000;

 #endif
     TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res));
     return res;
 #endif
     TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res));
     return res;


@@ -95,19 +99,18 @@ _nc_gettime(bool first)
 NCURSES_EXPORT(int)
 _nc_eventlist_timeout(_nc_eventlist * evl)
 {
 NCURSES_EXPORT(int)
 _nc_eventlist_timeout(_nc_eventlist * evl)
 {

-    _nc_event **ev, **last;

     int event_delay = -1;
     int event_delay = -1;

+    int n;

 
     if (evl != 0) {
 
 
     if (evl != 0) {
 

-       ev = evl->events;
-       last = ev + evl->count;
+       for (n = 0; n < evl->count; ++n) {
+           _nc_event *ev = evl->events[n];

 
 

-       while (ev < last) {
-           if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC) {
-               event_delay = (*ev)->data.timeout_msec;
+           if (ev->type == _NC_EVENT_TIMEOUT_MSEC) {
+               event_delay = ev->data.timeout_msec;

                if (event_delay < 0)
                if (event_delay < 0)

-                   event_delay = LONG_MAX;     /* FIXME Is this defined? */
+                   event_delay = INT_MAX;      /* FIXME Is this defined? */

            }
        }
     }
            }
        }
     }


@@ -141,18 +144,21 @@ _nc_timed_wait(int mode,
 {
     int fd;
     int count;
 {
     int fd;
     int count;

-    int result;
+    int result = 0;
+    TimeType t0;

 
 #ifdef NCURSES_WGETCH_EVENTS
     int timeout_is_event = 0;
 
 #ifdef NCURSES_WGETCH_EVENTS
     int timeout_is_event = 0;

+    int n;

 #endif
 
 #if USE_FUNC_POLL
 #endif
 
 #if USE_FUNC_POLL

-    struct pollfd fd_list[2];
+#define MIN_FDS 2
+    struct pollfd fd_list[MIN_FDS];

     struct pollfd *fds = fd_list;
 #elif defined(__BEOS__)
 #elif HAVE_SELECT
     struct pollfd *fds = fd_list;
 #elif defined(__BEOS__)
 #elif HAVE_SELECT

-    static fd_set set;
+    fd_set set;

 #endif
 
     long starttime, returntime;
 #endif
 
     long starttime, returntime;


@@ -172,10 +178,10 @@ _nc_timed_wait(int mode,
     }
 #endif
 
     }
 #endif
 

-#if PRECISE_GETTIME
+#if PRECISE_GETTIME && HAVE_NANOSLEEP

   retry:
 #endif
   retry:
 #endif

-    starttime = _nc_gettime(TRUE);
+    starttime = _nc_gettime(&t0, TRUE);

 
     count = 0;
 
 
     count = 0;
 


@@ -189,7 +195,7 @@ _nc_timed_wait(int mode,
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl)
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl)

-       fds = typeMalloc(struct pollfd, 2 + evl->count);
+       fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);

 #endif
 
     if (mode & 1) {
 #endif
 
     if (mode & 1) {


@@ -205,13 +211,12 @@ _nc_timed_wait(int mode,
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {

-       _nc_event **ev = evl->events;
-       _nc_event **last = ev + evl->count;
+       for (n = 0; n < evl->count; ++n) {
+           _nc_event *ev = evl->events[n];

 
 

-       while (ev < last) {
-           if ((*ev)->type == _NC_EVENT_FILE
-               && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
-               fds[count].fd = (*ev)->data.fev.fd;
+           if (ev->type == _NC_EVENT_FILE
+               && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+               fds[count].fd = ev->data.fev.fd;

                fds[count].events = POLLIN;
                count++;
            }
                fds[count].events = POLLIN;
                count++;
            }


@@ -219,27 +224,28 @@ _nc_timed_wait(int mode,
     }
 #endif
 
     }
 #endif
 

-    result = poll(fds, count, milliseconds);
+    result = poll(fds, (unsigned) count, milliseconds);

 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {

-       _nc_event **ev = evl->events;
-       _nc_event **last = ev + evl->count;

        int c;
 
        if (!result)
            count = 0;
        int c;
 
        if (!result)
            count = 0;

-       while (ev < last) {
-           if ((*ev)->type == _NC_EVENT_FILE
-               && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
-               (*ev)->data.fev.result = 0;
+
+       for (n = 0; n < evl->count; ++n) {
+           _nc_event *ev = evl->events[n];
+
+           if (ev->type == _NC_EVENT_FILE
+               && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+               ev->data.fev.result = 0;

                for (c = 0; c < count; c++)
                for (c = 0; c < count; c++)

-                   if (fds[c].fd == (*ev)->data.fev.fd
+                   if (fds[c].fd == ev->data.fev.fd

                        && fds[c].revents & POLLIN) {
                        && fds[c].revents & POLLIN) {

-                       (*ev)->data.fev.result |= _NC_EVENT_FILE_READABLE;
+                       ev->data.fev.result |= _NC_EVENT_FILE_READABLE;

                        evl->result_flags |= _NC_EVENT_FILE_READABLE;
                    }
                        evl->result_flags |= _NC_EVENT_FILE_READABLE;
                    }

-           } else if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC
+           } else if (ev->type == _NC_EVENT_TIMEOUT_MSEC

                       && !result && timeout_is_event) {
                evl->result_flags |= _NC_EVENT_TIMEOUT_MSEC;
            }
                       && !result && timeout_is_event) {
                evl->result_flags |= _NC_EVENT_TIMEOUT_MSEC;
            }


@@ -311,14 +317,13 @@ _nc_timed_wait(int mode,
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {

-       _nc_event **ev = evl->events;
-       _nc_event **last = ev + evl->count;
-
-       while (ev < last) {
-           if ((*ev)->type == _NC_EVENT_FILE
-               && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
-               FD_SET((*ev)->data.fev.fd, &set);
-               count = max((*ev)->data.fev.fd + 1, count);
+       for (n = 0; n < evl->count; ++n) {
+           _nc_event *ev = evl->events[n];
+
+           if (ev->type == _NC_EVENT_FILE
+               && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+               FD_SET(ev->data.fev.fd, &set);
+               count = max(ev->data.fev.fd + 1, count);

            }
        }
     }
            }
        }
     }


@@ -335,19 +340,18 @@ _nc_timed_wait(int mode,
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {
 
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & 4) && evl) {

-       _nc_event **ev = evl->events;
-       _nc_event **last = ev + evl->count;
-

        evl->result_flags = 0;
        evl->result_flags = 0;

-       while (ev < last) {
-           if ((*ev)->type == _NC_EVENT_FILE
-               && ((*ev)->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
-               (*ev)->data.fev.result = 0;
-               if (FD_ISSET((*ev)->data.fev.fd, &set)) {
-                   (*ev)->data.fev.result |= _NC_EVENT_FILE_READABLE;
+       for (n = 0; n < evl->count; ++n) {
+           _nc_event *ev = evl->events[n];
+
+           if (ev->type == _NC_EVENT_FILE
+               && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
+               ev->data.fev.result = 0;
+               if (FD_ISSET(ev->data.fev.fd, &set)) {
+                   ev->data.fev.result |= _NC_EVENT_FILE_READABLE;

                    evl->result_flags |= _NC_EVENT_FILE_READABLE;
                }
                    evl->result_flags |= _NC_EVENT_FILE_READABLE;
                }

-           } else if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC
+           } else if (ev->type == _NC_EVENT_TIMEOUT_MSEC

                       && !result && timeout_is_event)
                evl->result_flags |= _NC_EVENT_TIMEOUT_MSEC;
        }
                       && !result && timeout_is_event)
                evl->result_flags |= _NC_EVENT_TIMEOUT_MSEC;
        }


@@ -356,31 +360,30 @@ _nc_timed_wait(int mode,
 
 #endif /* USE_FUNC_POLL, etc */
 
 
 #endif /* USE_FUNC_POLL, etc */
 

-    returntime = _nc_gettime(FALSE);
+    returntime = _nc_gettime(&t0, FALSE);

 
     if (milliseconds >= 0)
        milliseconds -= (returntime - starttime);
 
 #ifdef NCURSES_WGETCH_EVENTS
     if (evl) {
 
     if (milliseconds >= 0)
        milliseconds -= (returntime - starttime);
 
 #ifdef NCURSES_WGETCH_EVENTS
     if (evl) {

-       _nc_event **ev = evl->events;
-       _nc_event **last = ev + evl->count;
-

        evl->result_flags = 0;
        evl->result_flags = 0;

-       while (ev < last) {
-           if ((*ev)->type == _NC_EVENT_TIMEOUT_MSEC) {
+       for (n = 0; n < evl->count; ++n) {
+           _nc_event *ev = evl->events[n];
+
+           if (ev->type == _NC_EVENT_TIMEOUT_MSEC) {

                long diff = (returntime - starttime);
                long diff = (returntime - starttime);

-               if ((*ev)->data.timeout_msec <= diff)
-                   (*ev)->data.timeout_msec = 0;
+               if (ev->data.timeout_msec <= diff)
+                   ev->data.timeout_msec = 0;

                else
                else

-                   (*ev)->data.timeout_msec -= diff;
+                   ev->data.timeout_msec -= diff;

            }
 
        }
     }
 #endif
 
            }
 
        }
     }
 #endif
 

-#if PRECISE_GETTIME
+#if PRECISE_GETTIME && HAVE_NANOSLEEP

     /*
      * If the timeout hasn't expired, and we've gotten no data,
      * this is probably a system where 'select()' needs to be left
     /*
      * If the timeout hasn't expired, and we've gotten no data,
      * this is probably a system where 'select()' needs to be left


@@ -388,7 +391,7 @@ _nc_timed_wait(int mode,
      * then come back for more.
      */
     if (result == 0 && milliseconds > 100) {
      * then come back for more.
      */
     if (result == 0 && milliseconds > 100) {

-       napms(100);
+       napms(100);             /* FIXME: this won't be right if I recur! */

        milliseconds -= 100;
        goto retry;
     }
        milliseconds -= 100;
        goto retry;
     }


@@ -411,7 +414,7 @@ _nc_timed_wait(int mode,
        if (result > 0) {
            result = 0;
 #if USE_FUNC_POLL
        if (result > 0) {
            result = 0;
 #if USE_FUNC_POLL

-           for (count = 0; count < 2; count++) {
+           for (count = 0; count < MIN_FDS; count++) {

                if ((mode & (1 << count))
                    && (fds[count].revents & POLLIN)) {
                    result |= (1 << count);
                if ((mode & (1 << count))
                    && (fds[count].revents & POLLIN)) {
                    result |= (1 << count);