<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Sep 20, 2013 at 1:21 AM, Gopu Govindaswamy <span dir="ltr"><<a href="mailto:gopu@multicorewareinc.com" target="_blank">gopu@multicorewareinc.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Gopu Govindaswamy <<a href="mailto:gopu@multicorewareinc.com">gopu@multicorewareinc.com</a>><br>
# Date 1379658081 -19800<br>
# Node ID 8831d644fa9bb931ef52db7dd8c90e08786b36fe<br>
# Parent 99a33fc4356a7daf3b09cd5e99687fa00e23051d<br>
CHECKED_MALLOC : Added X265_log if Malloc failed Report the ERROR Log message<br></blockquote><div><br></div><div>better as:</div><div><br></div><div>common: add CHECKED_MALLOC macro that logs malloc failures and jumps to fail label</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 99a33fc4356a -r 8831d644fa9b source/common/common.cpp<br>
--- a/source/common/common.cpp Fri Sep 20 11:28:56 2013 +0530<br>
+++ b/source/common/common.cpp Fri Sep 20 11:51:21 2013 +0530<br>
@@ -86,7 +86,7 @@<br>
<br>
void x265_log(x265_param_t *param, int level, const char *fmt, ...)<br>
{<br>
- if (level > param->logLevel)<br>
+ if ( param && level > param->logLevel)<br></blockquote><div><br></div><div>extra white-space</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
return;<br>
const char *log_level;<br>
switch (level)<br>
diff -r 99a33fc4356a -r 8831d644fa9b source/common/common.h<br>
--- a/source/common/common.h Fri Sep 20 11:28:56 2013 +0530<br>
+++ b/source/common/common.h Fri Sep 20 11:51:21 2013 +0530<br>
@@ -99,8 +99,11 @@<br>
#define CHECKED_MALLOC(var, type, count )\<br>
{\<br>
var = (type *)X265_MALLOC(type, sizeof(type) * (count));\<br>
- if( !var )\<br>
+ if (!var)\<br>
+ {\<br>
+ x265_log(NULL, X265_LOG_ERROR, "malloc of size %d failed\n", sizeof(type) * (count));\<br>
goto fail;\<br>
+ }\<br>
}<br></blockquote><div><br></div><div>looks ok in general, but these two patches should be folded into one</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
#define ENABLE_CYCLE_COUNTERS 0<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>