[gawk-diffs] [SCM] gawk branch, read_timeout, updated. 7ae469692932aae4a587f746dbff61c1d8b12eb9

[John Haque]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, read_timeout has been updated
       via  7ae469692932aae4a587f746dbff61c1d8b12eb9 (commit)
      from  b3dcc664da5e5234af8fbc1e2725788b614c747c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=7ae469692932aae4a587f746dbff61c1d8b12eb9

commit 7ae469692932aae4a587f746dbff61c1d8b12eb9
Author: john haque <address@hidden>
Date:   Fri Feb 3 09:20:53 2012 -0600

    Read timeout documentation and bug fix.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index eb9bbf4..2307bde 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,6 @@
+2021-02-03         John Haque     <address@hidden>
+       * gawk.texi, gawk.1: Add text on read timeout.
+
 2011-12-28         Arnold D. Robbins     <address@hidden>
 
        * awkcard.in, gawk.1: Minor edits after merge of executables.
diff --git a/doc/gawk.1 b/doc/gawk.1
index 662ace3..eab2046 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -1129,6 +1129,14 @@ corresponding values of the two elements being compared.
 It should return a number less than, equal to, or greater than 0,
 depending on how the elements of the array are to be ordered.
 .TP
+\fBPROCINFO["input", "READ_TIMEOUT"]\fP
+specifies the timeout in milliseconds for reading data from
+.I input
+, where
+.I input
+is a redirection string or a filename. A value of zero or
+less than zero means no timeout.
+.TP
 \fBPROCINFO["version"]\fP
 the version of
 .IR gawk .
@@ -3587,6 +3595,10 @@ and
 .B \-\^\-file
 options.
 .PP
+The GAWK_READ_TIMEOUT environment variable can be used to specify a timeout
+in milliseconds for reading input from a terminal, pipe
+or two-way communication including sockets.
+.PP
 For socket communication, two special environment variables can be used to 
control the number of retries
 .RB ( GAWK_SOCK_RETRIES ),
 and the interval between retries
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 1368185..885bf0e 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -393,6 +393,7 @@ particular records in a file and perform operations upon 
them.
 * Getline Notes::                  Important things to know about
                                    @code{getline}.
 * Getline Summary::                Summary of @code{getline} Variants.
+* Read Timeout::                   Reading input with timeout.
 * Command line directories::       What happens if you put a directory on the
                                    command line.
 * Print::                          The @code{print} statement.
@@ -3655,6 +3656,11 @@ Specifies the interval between connection retries,
 in milliseconds. On systems that do not support
 the @code{usleep()} system call,
 the value is rounded up to an integral number of seconds.
+
address@hidden GAWK_READ_TIMEOUT
+Specifies the time, in milliseconds, for @command{gawk} to
+wait for input before returning with error.
address@hidden Timeout}.
 @end table
 
 The environment variables in the following list are meant
@@ -5137,6 +5143,8 @@ used with it do not have to be named on the @command{awk} 
command line
 * Multiple Line::               Reading multi-line records.
 * Getline::                     Reading files under explicit program control
                                 using the @code{getline} function.
+* Read Timeout::                Reading input with timeout.
+
 * Command line directories::    What happens if you put a directory on the
                                 command line.
 @end menu
@@ -7215,6 +7223,110 @@ and whether the variant is standard or a @command{gawk} 
extension.
 @c ENDOFRANGE inex
 @c ENDOFRANGE infir
 
address@hidden Read Timeout
address@hidden Reading Input with Timeout
address@hidden timeout, reading input
+
+You may specify a timeout in milliseconds for reading input from a terminal,
+pipe or two-way communication including TCP/IP sockets. This can be done
+on a per input, command or connection basis, by setting a special element
+in the @code{PROCINFO} array:
+
address@hidden
+PROCINFO["input_name", "READ_TIMEOUT"] = timeout in milliseconds
address@hidden example
+
+When set, this will cause @command{gawk} to time out and return failure
+if no data is available to read within the specified timeout period.
+For example, a TCP client can decide to give up on receiving
+any response from the server after a certain amount of time:
+
address@hidden
+Service = "/inet/tcp/0/localhost/daytime"
+PROCINFO[Service, "READ_TIMEOUT"] = 100
+if ((Service |& getline) > 0)
+    print $0
+else if (ERRNO != "")
+    print ERRNO
address@hidden example
+
+Here is how to read interactively from the terminal without waiting
+for more than 5 seconds:
+
address@hidden
+PROCINFO["/dev/stdin", "READ_TIMEOUT"] = 5000
+while ((getline < "/dev/stdin") > 0)
+    print $0
address@hidden example
+
address@hidden will terminate the read operation if input does not
+arrive after waiting for the timeout period, return failure
+and set the @code{ERRNO} variable to an appropriate string value.
+A negative or zero value for the timeout is the same as specifying
+no timeout at all.
+
+Timeout can also be set for reading from terminal in the implicit loop
+like so:
+
address@hidden
+$ @kbd{ gawk 'BEGIN @{ PROCINFO["-", "READ_TIMEOUT"] = 5000 @}}
+> @address@hidden print "You entered: " $0 @}'}
address@hidden
address@hidden You entered: gawk
address@hidden example
+
+In this case, failure to respond within 5 seconds will result in the following
+error message:
+
address@hidden
address@hidden gawk: cmd. line:2: (FILENAME=- FNR=1) fatal: error reading input 
file `-': Connection timed out
address@hidden example
+
+The timeout can be set or changed at any time, and will take effect on the
+next attempt to read from the input device. In the following example,
+we start with a timeout value of one second, and progressively
+reduce it by one-tenth of a second until we wait indefinitely
+for the input to arrive:
+
address@hidden
+PROCINFO[Service, "READ_TIMEOUT"] = 1000
+while ((Service |& getline) > 0) @{
+    print $0
+    PROCINFO[S, "READ_TIMEOUT"] -= 100
address@hidden
address@hidden example
+
address@hidden NOTE
+You should not assume that the read operation will block
+exactly after the 10th record has been printed. It is possible that
address@hidden will read and buffer more than one record
+worth of data the first time. Because of this, changing the value
+of timeout like in the above example has very little usefulness,
+if any at all.
address@hidden quotation
+
+If the @code{PROCINFO} element is not present and the environment
+variable @env{GAWK_READ_TIMEOUT} exists,
+gawk will use it to initialize the timeout value.
+The exclusive use of the environment variable to specify timeout
+has the disadvantage of not being able to control it
+on a per command or connection basis.
+
+Gawk considers a timeout event an error even though
+the attempt to read from the underlying device may
+succeed in a later attempt. This is a limitation, and it also
+means that you cannot use this to multiplex input from
+two or more sources.
+
+Assigning a timeout value prevents read operations from
+blocking indefinitely. But bear in mind that there are other ways
address@hidden can stall waiting for an input device to be ready.
+A network client can sometimes take a long time to establish
+a connection before it can start reading any data,
+or the attempt to open a FIFO special file for reading can block
+indefinitely until some other process opens it for writing.
+
+
 @node Command line directories
 @section Directories On The Command Line
 @cindex directories, command line
diff --git a/io.c b/io.c
index 46dba96..25f32e2 100644
--- a/io.c
+++ b/io.c
@@ -3377,9 +3377,12 @@ get_read_timeout(IOBUF *iop)
                 */
                if (full_idx == NULL || strcmp(name, last_name) != 0) {
                        val = in_PROCINFO(name, "READ_TIMEOUT", & full_idx);
-                       last_name = name;
+                       if (last_name != NULL)
+                               efree(last_name);
+                       last_name = estrdup(name, strlen(name));
                } else  /* use cached full index */
                        val = in_array(PROCINFO_node, full_idx);
+
                if (val != NULL)
                        tmout = (long) force_number(val);
        } else

-----------------------------------------------------------------------

Summary of changes:
 doc/ChangeLog |    3 ++
 doc/gawk.1    |   12 ++++++
 doc/gawk.texi |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 io.c          |    5 ++-
 4 files changed, 131 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
gawk