diff options
author | Dave Brolley <brolley@redhat.com> | 2009-04-03 11:56:32 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-04-03 11:56:32 -0400 |
commit | 8d3854b9f124aa818552d462bd8cbd2577be298e (patch) | |
tree | cef962dbca12c088c6acc3edf621d4502b0012e1 /runtime/staprun/relay_old.c | |
parent | 2f53f831393d2f0db3d54260c2a7882eff17905c (diff) | |
parent | 08dc41a50c508544bc18d384a65a137056a98195 (diff) | |
download | systemtap-steved-8d3854b9f124aa818552d462bd8cbd2577be298e.tar.gz systemtap-steved-8d3854b9f124aa818552d462bd8cbd2577be298e.tar.xz systemtap-steved-8d3854b9f124aa818552d462bd8cbd2577be298e.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
configure
runtime/staprun/staprun_funcs.c
Diffstat (limited to 'runtime/staprun/relay_old.c')
-rw-r--r-- | runtime/staprun/relay_old.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/staprun/relay_old.c b/runtime/staprun/relay_old.c index ef8fd0da..469a5831 100644 --- a/runtime/staprun/relay_old.c +++ b/runtime/staprun/relay_old.c @@ -241,7 +241,7 @@ static int process_subbufs(struct _stp_buf_info *info, perr("Couldn't open file for cpu %d, exiting.", cpu); exit(1); } - scb->wsize = 0; + scb->wsize = len; } if (len) { if (fwrite_unlocked (subbuf_ptr, len, 1, percpu_tmpfile[cpu]) != 1) { @@ -320,7 +320,7 @@ int write_realtime_data(void *data, ssize_t nb) perr("Couldn't open file, exiting."); return -1; } - global_scb.wsize = 0; + global_scb.wsize = nb; } bw = write(out_fd[0], data, nb); if (bw >= 0 && bw != nb) { |