merged branch "master" into "ffi".

agentzh · agentzh · commit d577a63e8cab · 2013-11-05T13:16:24.000-08:00
diff --git a/valgrind.suppress b/valgrind.suppress
@@ -113,13 +113,9 @@ fun:main
    fun:ngx_start_cache_manager_processes
 }
 {
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_new
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   fun:lj_str_cmp
-   fun:lj_meta_comp
+    <insert_a_suppression_name_here>
+    Memcheck:Cond
+    fun:ngx_init_cycle
+    fun:ngx_master_process_cycle
+    fun:main
 }

Original file line number	Diff line number	Diff line change
`@@ -113,13 +113,9 @@ fun:main`
`113`	`113`	`fun:ngx_start_cache_manager_processes`
`114`	`114`	`}`
`115`	`115`	`{`
`116`		`- <insert_a_suppression_name_here>`
`117`		`- Memcheck:Addr4`
`118`		`- fun:lj_str_new`
`119`		`-}`
`120`		`-{`
`121`		`- <insert_a_suppression_name_here>`
`122`		`- Memcheck:Addr4`
`123`		`- fun:lj_str_cmp`
`124`		`- fun:lj_meta_comp`
	`116`	`+ <insert_a_suppression_name_here>`
	`117`	`+ Memcheck:Cond`
	`118`	`+ fun:ngx_init_cycle`
	`119`	`+ fun:ngx_master_process_cycle`
	`120`	`+ fun:main`
`125`	`121`	`}`