summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2007-08-15 14:44:21 +0000
committerhunt <hunt>2007-08-15 14:44:21 +0000
commitd272fb15855a3630d99bbd7a8a13adaba1a951fe (patch)
tree0bdf334d9edc2e4323ee5f5bcd3f2cedc569a681
parent6cad281fe986cdd3f89cba7c1959de10ca6f389d (diff)
downloadsystemtap-steved-d272fb15855a3630d99bbd7a8a13adaba1a951fe.tar.gz
systemtap-steved-d272fb15855a3630d99bbd7a8a13adaba1a951fe.tar.xz
systemtap-steved-d272fb15855a3630d99bbd7a8a13adaba1a951fe.zip
2007-08-15 Martin Hunt <hunt@redhat.com>
PR4736 * staprun.c (cleanup): Set priority back to normal before removing module.
-rw-r--r--runtime/staprun/ChangeLog5
-rw-r--r--runtime/staprun/stap_merge.c3
-rw-r--r--runtime/staprun/staprun.c3
3 files changed, 9 insertions, 2 deletions
diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog
index 002284bf..0ca8812d 100644
--- a/runtime/staprun/ChangeLog
+++ b/runtime/staprun/ChangeLog
@@ -1,5 +1,10 @@
2007-08-15 Martin Hunt <hunt@redhat.com>
+ PR4736
+ * staprun.c (cleanup): Set priority back to normal
+ before removing module.
+2007-08-15 Martin Hunt <hunt@redhat.com>
+
* stap_merge.tcl: New.
2007-08-14 David Smith <dsmith@redhat.com>
diff --git a/runtime/staprun/stap_merge.c b/runtime/staprun/stap_merge.c
index 051a344b..fb8a17c1 100644
--- a/runtime/staprun/stap_merge.c
+++ b/runtime/staprun/stap_merge.c
@@ -101,10 +101,9 @@ int main (int argc, char *argv[])
}
}
-
if (fread(&len, sizeof(int), 1, fp[j])) {
if (verbose)
- fprintf(stderr, "[CPU %d, seq=%ld, length=%d]\n", j, min, len);
+ fprintf(stdout, "[CPU:%d, seq=%ld, length=%d]\n", j, min, len);
if (len > bufsize) {
bufsize = len * 2;
if (verbose) fprintf(stderr, "reallocating %d bytes\n", bufsize);
diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c
index d9738cd7..fe55e36f 100644
--- a/runtime/staprun/staprun.c
+++ b/runtime/staprun/staprun.c
@@ -121,6 +121,9 @@ static void cleanup(int rc)
dbug(2, "rc=%d, inserted_module=%d\n", rc, inserted_module);
+ if (setpriority (PRIO_PROCESS, 0, 0) < 0)
+ _perr("setpriority");
+
/* rc == 2 means disconnected */
if (rc == 2)
return;