diff options
| author | hunt <hunt> | 2006-03-20 16:09:23 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2006-03-20 16:09:23 +0000 |
| commit | 4850cf44cb5aba58c8806f09e47f097855b9314e (patch) | |
| tree | 48a553f1d1ec0f9a130aac4e32cfaa88e487084f | |
| parent | e1d96810d0c2c1da6ec36eb81c642bcc6cf420c8 (diff) | |
| download | systemtap-steved-4850cf44cb5aba58c8806f09e47f097855b9314e.tar.gz systemtap-steved-4850cf44cb5aba58c8806f09e47f097855b9314e.tar.xz systemtap-steved-4850cf44cb5aba58c8806f09e47f097855b9314e.zip | |
2006-03-20 Martin Hunt <hunt@redhat.com>
* procfs.c (_stp_write): Combine buffers only for REALTIME_DATA.
| -rw-r--r-- | runtime/transport/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/transport/procfs.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog index e6ab7fe2..89017126 100644 --- a/runtime/transport/ChangeLog +++ b/runtime/transport/ChangeLog @@ -1,3 +1,7 @@ +2006-03-20 Martin Hunt <hunt@redhat.com> + + * procfs.c (_stp_write): Combine buffers only for REALTIME_DATA. + 2006-03-16 Tom Zanussi <zanussi@us.ibm.com> * procfs.c (_stp_proc_read): Change ifdef for relayfs version. diff --git a/runtime/transport/procfs.c b/runtime/transport/procfs.c index cbcc5239..47c1711a 100644 --- a/runtime/transport/procfs.c +++ b/runtime/transport/procfs.c @@ -1,7 +1,7 @@ /* -*- linux-c -*- * * /proc transport and control - * Copyright (C) 2005, 2006 Red Hat Inc. + * Copyright (C) 2005 Red Hat Inc. * * This file is part of systemtap, and is free software. You can * redistribute it and/or modify it under the terms of the GNU General @@ -133,9 +133,7 @@ static int _stp_write (int type, void *data, int len) spin_lock(&_stp_ready_lock); if (!list_empty(&_stp_ready_q)) { bptr = (struct _stp_buffer *)_stp_ready_q.prev; - if (bptr->len + len <= STP_BUFFER_SIZE - && type == STP_REALTIME_DATA - && bptr->type == STP_REALTIME_DATA) { + if (bptr->len + len <= STP_BUFFER_SIZE && type == STP_REALTIME_DATA && bptr->type == type) { memcpy (bptr->buf + bptr->len - 1, data, len); bptr->len += len - 1; spin_unlock(&_stp_ready_lock); |