diff options
| author | Masami Hiramatsu <mhiramat@redhat.com> | 2008-11-13 16:50:47 -0500 |
|---|---|---|
| committer | Masami Hiramatsu <mhiramat@redhat.com> | 2008-11-13 16:50:47 -0500 |
| commit | 6a65b05e526435de8f4a42d7f727fd9a6fad09bc (patch) | |
| tree | e52b74c58f8ec16054d6cec543b069a769c9496a | |
| parent | 214b2c3b6c3da42c6b84f6f8e8be4a2782674210 (diff) | |
| download | systemtap-steved-6a65b05e526435de8f4a42d7f727fd9a6fad09bc.tar.gz systemtap-steved-6a65b05e526435de8f4a42d7f727fd9a6fad09bc.tar.xz systemtap-steved-6a65b05e526435de8f4a42d7f727fd9a6fad09bc.zip | |
Use KERN_WARNING and show buffer size.
| -rw-r--r-- | runtime/transport/ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/transport/utt.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog index 99b6e704..796fa573 100644 --- a/runtime/transport/ChangeLog +++ b/runtime/transport/ChangeLog @@ -1,5 +1,9 @@ 2008-11-13 Masami Hiramatsu <mhiramat@redhat.com> + * utt.c (utt_trace_setup): Use KERN_WARNING and show buffer size. + +2008-11-13 Masami Hiramatsu <mhiramat@redhat.com> + PR7016 * utt.c (utt_trace_setup): Check freeram and bufferram before allocating relay buffers for avoiding OOM. diff --git a/runtime/transport/utt.c b/runtime/transport/utt.c index 642fe240..8ed84473 100644 --- a/runtime/transport/utt.c +++ b/runtime/transport/utt.c @@ -323,14 +323,16 @@ struct utt_trace *utt_trace_setup(struct utt_trace_setup *utts) si_meminfo(&si); #define MB(i) (unsigned long)((i) >> (20 - PAGE_SHIFT)) if (npages > (si.freeram + si.bufferram)) { - errk("Not enough free+buffered memory(%luMB) for log buffer\n", - MB(si.freeram + si.bufferram)); + errk("Not enough free+buffered memory(%luMB) for log buffer(%luMB)\n", + MB(si.freeram + si.bufferram), + MB(npages)); ret = -ENOMEM; goto err; } else if (npages > si.freeram) { - printk("Warning: log buffer size exceeds free memory(%luMB)\n", - MB(si.freeram)); /* exceeds freeram, but below freeram+bufferram */ + printk(KERN_WARNING + "log buffer size exceeds free memory(%luMB)\n", + MB(si.freeram)); } #if (RELAYFS_CHANNEL_VERSION >= 7) |