From: Namhyung Kim <namhyung@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung.kim@lge.com>,
LKML <linux-kernel@vger.kernel.org>, Jiri Olsa <jolsa@redhat.com>
Subject: [PATCH 4/5] tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init()
Date: Tue, 7 Jan 2014 12:00:11 +0900 [thread overview]
Message-ID: <1389063612-18173-5-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1389063612-18173-1-git-send-email-namhyung@kernel.org>
Use plain malloc() and check its return value.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/lib/traceevent/trace-seq.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/lib/traceevent/trace-seq.c b/tools/lib/traceevent/trace-seq.c
index b139d55a6bf9..e858bfd3b104 100644
--- a/tools/lib/traceevent/trace-seq.c
+++ b/tools/lib/traceevent/trace-seq.c
@@ -46,8 +46,11 @@ void trace_seq_init(struct trace_seq *s)
s->len = 0;
s->readpos = 0;
s->buffer_size = TRACE_SEQ_BUF_SIZE;
- s->buffer = malloc_or_die(s->buffer_size);
- s->state = TRACE_SEQ__GOOD;
+ s->buffer = malloc(s->buffer_size);
+ if (s->buffer != NULL)
+ s->state = TRACE_SEQ__GOOD;
+ else
+ s->state = TRACE_SEQ__MEM_ALLOC_FAILED;
}
/**
--
1.7.11.7
next prev parent reply other threads:[~2014-01-07 3:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 3:00 [PATCHSET 0/5] tools lib traceevent: Get rid of *die() calls finally!! (v2) Namhyung Kim
2014-01-07 3:00 ` [PATCH 1/5] tools lib traceevent: Add WARN and WARN_ONCE macros Namhyung Kim
2014-01-07 14:07 ` Arnaldo Carvalho de Melo
2014-01-08 7:38 ` Namhyung Kim
2014-01-07 3:00 ` [PATCH 2/5] tools lib traceevent: Add state member to struct trace_seq Namhyung Kim
2014-01-07 13:05 ` Jiri Olsa
2014-01-08 4:06 ` Namhyung Kim
2014-01-07 3:00 ` [PATCH 3/5] tools lib traceevent: Check return value of realloc() Namhyung Kim
2014-01-07 3:00 ` Namhyung Kim [this message]
2014-01-07 3:00 ` [PATCH 5/5] tools lib traceevent: Get rid of die() finally!! Namhyung Kim
2014-01-07 3:25 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389063612-18173-5-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®