diff options
| -rw-r--r-- | runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/io.c | 14 | ||||
| -rw-r--r-- | runtime/print.c | 4 |
3 files changed, 22 insertions, 1 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 93ba3a61..29d8be80 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,8 @@ +2005-08-03 Martin Hunt <hunt@redhat.com> + + * io.c (_stp_vlog): Revert previous change for now. + * print.c (_stp_print_flush): Ditto. + 2005-08-03 Tom Zanussi <trz@us.ibm.com> * io.c (_stp_vlog): Remove call to _stp_print_flush(). diff --git a/runtime/io.c b/runtime/io.c index c4e3cf2c..30e4687f 100644 --- a/runtime/io.c +++ b/runtime/io.c @@ -55,7 +55,19 @@ static void _stp_vlog (enum code type, char *func, int line, const char *fmt, va } buf[num + start] = '\0'; - _stp_ctrl_send(STP_REALTIME_DATA, buf, start + num + 1, _stp_pid); +#ifdef STP_NETLINK_ONLY + if (type != DBUG) + _stp_ctrl_send(STP_REALTIME_DATA, buf, start + num + 1, _stp_pid); + else { + _stp_string_cat_cstr(_stp_stdout,buf); + _stp_print_flush(); + } +#else + if (type != DBUG) + _stp_ctrl_send(STP_REALTIME_DATA, buf, start + num + 1, _stp_pid); + _stp_string_cat_cstr(_stp_stdout,buf); + _stp_print_flush(); +#endif } put_cpu(); } diff --git a/runtime/print.c b/runtime/print.c index d262c9ed..2e3d539c 100644 --- a/runtime/print.c +++ b/runtime/print.c @@ -47,8 +47,10 @@ void _stp_print_flush (void) ret =_stp_transport_write(buf, len + 1); if (unlikely(ret < 0)) { +#if 0 if (!atomic_read(&_stp_transport_failures)) _stp_warn("Transport failure - try using a larger buffer size\n"); +#endif atomic_inc (&_stp_transport_failures); } @@ -90,8 +92,10 @@ void _stp_print_flush (void) buf[TIMESTAMP_SIZE - 1] = ' '; ret = _stp_transport_write(buf, _stp_pbuf_len[cpu] + TIMESTAMP_SIZE + 1); if (unlikely(ret < 0)) { +#if 0 if (!atomic_read(&_stp_transport_failures)) _stp_warn("Transport failure - try using a larger buffer size\n"); +#endif atomic_inc (&_stp_transport_failures); } |