summaryrefslogtreecommitdiffstats
path: root/lib/qpselect.c
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2011-07-21 19:53:02 +0100
committerChris Hall <chris.hall@highwayman.com>2011-07-21 19:53:02 +0100
commit56da2a1c9b6361e302b7a39fe2740561a9012d88 (patch)
tree6b6543532133a0c618d0f4ec70a87cf3f96caf30 /lib/qpselect.c
parente535bc959729262480a9702e71334002edee3f8c (diff)
downloadquagga-56da2a1c9b6361e302b7a39fe2740561a9012d88.tar.bz2
quagga-56da2a1c9b6361e302b7a39fe2740561a9012d88.tar.xz
Update pipework and improve memory reporting.
Improve error handling for all new pipework inputs and outputs. Change behaviour of ^C from VTY Terminal, so that will interrupt output and terminate all running pipes -- including running shell commands. In pipe commands, recognise "~/..." and "~user/..." home directory forms. Changed "~/" to mean the usual home for the current user. "~~/" now means the configuration file directory. Introduced "shdir DIR" command to show what is (currently) what. Changed "<|" so that if the command has a path, it is expanded using Quagga's rules (including "~~/" and "~./") and the "here" directory is set to that path. Fixed collection of stderr output from all pipes so that is separate from stdout output, and is always sent to the base output (eg VTY Terminal). Increase amount of information about the heap that "show mem" shows -- particularly if the "memory_tracker" is enabled. Tested and applied resulting fixes.
Diffstat (limited to 'lib/qpselect.c')
-rw-r--r--lib/qpselect.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/qpselect.c b/lib/qpselect.c
index 3fb80daf..3332db4f 100644
--- a/lib/qpselect.c
+++ b/lib/qpselect.c
@@ -1432,6 +1432,8 @@ qps_selection_validate(qps_selection qps)
* Miniature pselect -- for where want to wait for a small number of things.
*/
+uint qps_mini_timeout_debug = 0 ;
+
/*------------------------------------------------------------------------------
* Initialise a qps_mini and set one fd in the given mode.
*
@@ -1461,6 +1463,14 @@ qps_mini_set(qps_mini qm, int fd, qps_mnum_t mode, uint timeout)
extern qps_mini
qps_mini_add(qps_mini qm, int fd, qps_mnum_t mode)
{
+ if (qdebug && (qps_mini_timeout_debug > 0))
+ {
+ if (qps_mini_timeout_debug == 1)
+ fd = -1 ;
+
+ --qps_mini_timeout_debug ;
+ } ;
+
if (fd >= 0)
{
FD_SET(fd, &(qm->sets[mode].fdset)) ;