From b20db09e9ea98f63604aa14048a7fb663fb3f804 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 6 Aug 2008 21:02:20 -0400
Subject: client-server: improve random port selection and mdns txt use

---
 stap-serverd | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'stap-serverd')

diff --git a/stap-serverd b/stap-serverd
index af4b2717..6170eb8f 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -26,6 +26,11 @@ function initialization {
     avahi_type=_stap._tcp
     port=$1
     test "X$port" = "X" && port=65000
+    port2=$(($port + 1))
+    if netstat -atn | awk '{print $4}' | cut -f2 -d: | egrep -q "^($port|$port2)\$"; then
+        # Whoops, the port is busy; try another one.
+        initialization $((1024+($port + $RANDOM)%64000))
+    fi
 }
 
 # function: advertise_presence
@@ -35,7 +40,7 @@ function advertise_presence {
     # Build up a string representing our server's properties.
     # TODO: this needs fleshing out.
     local sysinfo=`uname -rvm`
-    local txt="$sysinfo"
+    local txt="sysinfo=$sysinfo"
 
     # Call avahi-publish-service to advertise our presence.
     avahi-publish-service "Systemtap Compile Server on `uname -n`" \
@@ -65,6 +70,9 @@ function listen {
 	# received (i.e. SIGTERM) will be processed.
 	nc -l $port < $fifo_name | stap-server $((port + 1)) > $fifo_name 2>&1 &
 	wait %nc
+        if [ $? -ne 0 ]; then
+            fatal "ERROR: cannot listen on port $port"
+        fi
     done
 }
 
-- 
cgit 


From d5658775da9fa0ac792eb3f874df9f7c4d60de7e Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 8 Aug 2008 15:11:36 -0400
Subject: Start/stop the systemtap server from systemtap.exp and not in the top
 level Makefile.

---
 stap-serverd | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'stap-serverd')

diff --git a/stap-serverd b/stap-serverd
index af4b2717..e378f6e4 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -59,11 +59,17 @@ function listen {
 	fatal "ERROR: cannot create temporary fifo " $tmpdir/$fifo_name
 
     # Loop forever accepting requests
+    first=1
     while true
     do
 	# Run this in the background and wait for it. This way any signals
-	# received (i.e. SIGTERM) will be processed.
+	# received (i.e. SIGTERM) will be processed. Make sure we don't
+	# advertise our presence until we're actually listening.
 	nc -l $port < $fifo_name | stap-server $((port + 1)) > $fifo_name 2>&1 &
+	if test $first = 1; then
+	    advertise_presence
+	    first=0
+	fi
 	wait %nc
     done
 }
@@ -102,5 +108,4 @@ function terminate {
 # Beginning of main line execution.
 #-----------------------------------------------------------------------------
 initialization "$@"
-advertise_presence
 listen
-- 
cgit 


From 32a1dfe9c13094391dab645484e7563992f9ba53 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Mon, 11 Aug 2008 15:54:45 -0400
Subject: stap-serverd was incorectly determining that the server could not be
 started.

---
 stap-serverd | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'stap-serverd')

diff --git a/stap-serverd b/stap-serverd
index 221f353f..32888ecc 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -65,21 +65,31 @@ function listen {
 
     # Loop forever accepting requests
     first=1
+    set -o pipefail # We want the status of 'nc' not 'stap-server'.
     while true
     do
 	# Run this in the background and wait for it. This way any signals
 	# received (i.e. SIGTERM) will be processed. Make sure we don't
 	# advertise our presence until we're actually listening.
-	nc -l $port < $fifo_name | stap-server $((port + 1)) > $fifo_name 2>&1 &
-	if test $first = 1; then
-	    advertise_presence
-	    first=0
+	for ((attempt=0; $attempt < 5; ++attempt))
+	do
+	    nc -l $port < $fifo_name | stap-server $((port + 1)) > $fifo_name 2>&1 &
+	    if test $first = 1; then
+		advertise_presence
+		first=0
+	    fi
+	    wait %nc
+	    rc=$?
+            if test $rc = 127 -o $rc = 0; then
+		break; # success
+            fi
+	    sleep 1
+	done
+	if test $attempt = 10; then
+	    fatal "ERROR: cannot listen on port $port. rc==$rc"
 	fi
-	wait %nc
-        if [ $? -ne 0 ]; then
-            fatal "ERROR: cannot listen on port $port"
-        fi
     done
+    set +o pipefail # restore
 }
 
 # function: fatal [ MESSAGE ]
@@ -88,6 +98,7 @@ function listen {
 # Prints its arguments to stderr and exits
 function fatal {
     echo "$@" >&2
+    terminate
     exit 1
 }
 
-- 
cgit