diff options
| author | hunt <hunt> | 2007-06-21 04:09:45 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2007-06-21 04:09:45 +0000 |
| commit | 3f569620a1dc0c65cfe440dc4f58597567f94cdb (patch) | |
| tree | 803a13218fb1310f30eb8c476c08445d1872593f /runtime/staprun | |
| parent | 1f34befaa0d320c832ba3dfdff32056bab15c1ad (diff) | |
| download | systemtap-steved-3f569620a1dc0c65cfe440dc4f58597567f94cdb.tar.gz systemtap-steved-3f569620a1dc0c65cfe440dc4f58597567f94cdb.tar.xz systemtap-steved-3f569620a1dc0c65cfe440dc4f58597567f94cdb.zip | |
2007-06-21 Martin Hunt <hunt@redhat.com>
* relay.c (init_relayfs): Send message to check for bulkmode.
Diffstat (limited to 'runtime/staprun')
| -rw-r--r-- | runtime/staprun/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/staprun/relay.c | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog index bbcb57ae..af2c647e 100644 --- a/runtime/staprun/ChangeLog +++ b/runtime/staprun/ChangeLog @@ -1,3 +1,7 @@ +2007-06-21 Martin Hunt <hunt@redhat.com> + + * relay.c (init_relayfs): Send message to check for bulkmode. + 2007-06-20 Martin Hunt <hunt@redhat.com> * stap_merge.c (main): Add verbose option. Will realloc diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c index 23de96c3..449dbcf5 100644 --- a/runtime/staprun/relay.c +++ b/runtime/staprun/relay.c @@ -136,6 +136,8 @@ int init_relayfs(void) return -1; } + if (send_request(STP_BULK, buf, sizeof(buf)) < 0) + bulkmode = 1; for (i = 0; i < NR_CPUS; i++) { sprintf(buf, "%s/trace%d", relay_filebase, i); @@ -145,14 +147,17 @@ int init_relayfs(void) break; } ncpus = i; - dbug(2, "ncpus=%d\n", ncpus); + dbug(2, "ncpus=%d, bulkmode = %d\n", ncpus, bulkmode); if (ncpus == 0) { err("couldn't open %s.\n", buf); return -1; } - if (ncpus > 1) - bulkmode = 1; + if (ncpus > 1 && bulkmode == 0) { + err("ncpus=%d, bulkmode = %d\n", ncpus, bulkmode); + err("This is inconsistent! Please file a bug report. Exiting now.\n"); + return -1; + } if (bulkmode) { for (i = 0; i < ncpus; i++) { |