diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-07-09 22:44:13 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-07-09 22:44:13 -0400 |
| commit | a00cc8c70d20f2f3429590b629d272c8db65b40f (patch) | |
| tree | 6a90966d1a715c48db4ac35b891c46ef654f272f /stap-client | |
| parent | df00639dbe262b8919bdf625f30d80e5b9b96346 (diff) | |
| parent | 51a3785482396c9f653e3e7647945bfc24f7b160 (diff) | |
| download | systemtap-steved-a00cc8c70d20f2f3429590b629d272c8db65b40f.tar.gz systemtap-steved-a00cc8c70d20f2f3429590b629d272c8db65b40f.tar.xz systemtap-steved-a00cc8c70d20f2f3429590b629d272c8db65b40f.zip | |
Merge commit 'origin/master' into pr6429-comp-unwindsyms
* commit 'origin/master':
fix shutdown race condition for scripts that might exit during begin probes
Fix PR 6732: Add runtime/autoconf-real-parent.c check for task_struct field.
clarify dejagnu test case name for empty-struct changes
add changelog entries for last two changes
Add test suite for declaration resolution
Fix semantic error: empty struct
Add hack to support git 1.6 in git_version.sh
Sync latest fix for git_version.sh from RadeonHD's tree
Slightly cleanup code of translate.cxx
PR2111: add general blurbage to stapprobes.5 on syscalls tapset
Use `uname -rvm` for checking system compatibility. Generate
Add section to stapex manual page on how installed examples are documented.
Install examples, demos and samples.
Install tutorial and langref manuals.
Diffstat (limited to 'stap-client')
| -rwxr-xr-x | stap-client | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/stap-client b/stap-client index 515cab92..8c3607ae 100755 --- a/stap-client +++ b/stap-client @@ -315,7 +315,7 @@ function create_request { function client_sysinfo { if test "X$sysinfo_client" = "X"; then # Add some info from uname - sysinfo_client="`uname -r`" + sysinfo_client="`uname -rvm`" fi echo $sysinfo_client } @@ -348,7 +348,6 @@ function package_request { # the tar file will expand to. function send_request { echo "request:" >&3 - # Get the server's response. read <&3 local line=$REPLY @@ -368,7 +367,19 @@ function send_request { # function: receive_response # # Wait for a response from the server indicating the results of our request. +# protocol is: +# server -> "done:" +# server -> $tar_server function receive_response { + # Get the server's response. + read <&3 + local line=$REPLY + check_server_error $line + + # Check for the proper response. + test "$line" = "done:" || \ + fatal "ERROR: server response, '$line', is incorrect" + # Make a place to receive the response file. tar_server=`mktemp -t $tmpdir_prefix_client.server.tgz.XXXXXX` || \ fatal "ERROR: cannot create temporary file " $tar_server @@ -522,6 +533,7 @@ function match_server { # It is a stap server, but is it compatible? if test "$sysinfo_server" != "`client_sysinfo`"; then + server_ip= continue fi |