Darwin massif: more ingore functions in regtest, x86 new uses unsigned long

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 94eca658ea39d40052668d91970dafe70c63df96..5ce8ee029f5dc3b8e1fd3358af2123f391f10609 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -321,13 +321,13 @@ static void init_alloc_fns(void)
    //
    DO("malloc"                                              );
    DO("__builtin_new"                                       );
-# if VG_WORDSIZE == 4
+# if VG_WORDSIZE == 4 && !defined(VGO_darwin)
    DO("operator new(unsigned)"                              );
 #else
    DO("operator new(unsigned long)"                         );
 #endif
    DO("__builtin_vec_new"                                   );
-# if VG_WORDSIZE == 4
+# if VG_WORDSIZE == 4 && !defined(VGO_darwin)
    DO("operator new[](unsigned)"                            );
 #else
    DO("operator new[](unsigned long)"                       );
@@ -338,7 +338,7 @@ static void init_alloc_fns(void)
    DO("memalign"                                            );
    DO("posix_memalign"                                      );
    DO("valloc"                                              );
-# if VG_WORDSIZE == 4
+# if VG_WORDSIZE == 4 && !defined(VGO_darwin)
    DO("operator new(unsigned, std::nothrow_t const&)"       );
    DO("operator new[](unsigned, std::nothrow_t const&)"     );
    DO("operator new(unsigned, std::align_val_t)"            );

diff --git a/massif/tests/bug469146.vgtest b/massif/tests/bug469146.vgtest
index 83a4f8779f7053a41b151761e42d7f10ea3c8a91..60847a185d8e31f57af7e93c21943fa9e819c4e0 100644 (file)
--- a/massif/tests/bug469146.vgtest
+++ b/massif/tests/bug469146.vgtest
@@ -4,5 +4,7 @@ vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-f
 vgopts: --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0
 vgopts: --ignore-fn=call_init --ignore-fn=pool
 vgopts: --ignore-fn=filter_function1 --ignore-fn="filter_function2(int)" --ignore-fn=filter_function3
+# macOS allocations
+vgopts: --ignore-fn="allocBuckets(void*, unsigned int)" --ignore-fn=map_images_nolock --ignore-fn="realizeClass(objc_class*)" --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInser --ignore-fn=add_class_to_loadable_list --ignore-fn=NXHashInsert --ignore-fn=class_createInstance --ignore-fn=_xpc_malloc --ignore-fn=strdup --ignore-fn=_xpc_calloc
 post: perl ../../massif/ms_print massif.out | sed 's/gcc[0-9]*/gcc/' | ../../tests/filter_addresses | ./filter_ignore_fn
 cleanup: rm massif.out

diff --git a/massif/tests/inlinfomalloc.vgtest b/massif/tests/inlinfomalloc.vgtest
index a064110ce5ab2fb5b42a17088bb6b02602764dbe..4b410b6ad8171607138fbf1c79f6c21fbcc00fc6 100644 (file)
--- a/massif/tests/inlinfomalloc.vgtest
+++ b/massif/tests/inlinfomalloc.vgtest
@@ -1,6 +1,8 @@
 prog: inlinfomalloc
 vgopts: --stacks=no --heap-admin=0 --time-unit=B --threshold=0 --detailed-freq=6 --massif-out-file=massif.out
 vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element
+# macOS allocations
+vgopts: --ignore-fn="allocBuckets(void*, unsigned int)" --ignore-fn="realizeClass(objc_class*)" --ignore-fn=map_images_nolock --ignore-fn=NXCreateHashTableFromZone --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=_xpc_malloc --ignore-fn=strdup --ignore-fn=_xpc_calloc
 stderr_filter: filter_verbose
 post: perl ../../massif/ms_print --threshold=0 massif.out | ../../tests/filter_addresses | ./filter_ignore_fn
 cleanup: rm massif.out

diff --git a/massif/tests/overloaded-new.vgtest b/massif/tests/overloaded-new.vgtest
index dc51475a7f6b5e3073bcd6df0118c11d930546c5..292b6cc73f9d388e8ef968e8d9c9b43c7dc9dc9d 100644 (file)
--- a/massif/tests/overloaded-new.vgtest
+++ b/massif/tests/overloaded-new.vgtest
@@ -4,5 +4,7 @@ vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook
 vgopts: --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0
 vgopts: --ignore-fn=call_init --ignore-fn=pool
+# macOS allocations
+vgopts: --ignore-fn="allocBuckets(void*, unsigned int)" --ignore-fn=map_images_nolock --ignore-fn="realizeClass(objc_class*)" --ignore-fn=_NXHashRehashToCapacity --ignore-fn=NXCreateHashTableFromZone --ignore-fn=NXCreateMapTableFromZone --ignore-fn=NXHashInsert --ignore-fn=add_class_to_loadable_list --ignore-fn=class_createInstance --ignore-fn=_xpc_malloc
 post: perl ../../massif/ms_print massif.out | sed 's/gcc[0-9]*/gcc/' | ./filter_new_aligned | ./filter_ignore_fn
 cleanup: rm massif.out