Qualifying suppression types with the skin name, like this:
memcheck:Addr4
Changed the `name' need of the memcheck skin from "valgrind" to "memcheck" for
this. But the name Valgrind will return when I print core and skin names in
the startup message.
One issue is that some skins share suppression types, eg. memcheck and
addrcheck. Might be useful to allow multi-skin suppressions, viz:
memcheck,addrcheck:Addr4
This won't be too hard to tack on, though.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1163 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/glibc-2.1.supp b/glibc-2.1.supp
index 111293e..86efc54 100644
--- a/glibc-2.1.supp
+++ b/glibc-2.1.supp
@@ -5,22 +5,30 @@
# Format of this file is:
# {
# name_of_suppression
-# kind: one of Param Value1 Value2 Value4 Value8
-# Free Addr1 Addr2 Addr4 Addr8
-# Cond (previously known as Value0)
-# (if Param: name of system call param, if Free: name of free-ing fn)
+# skin_name:supp_kind
+# (optional extra info for some suppression types)
# caller0 name, or /name/of/so/file.so
# caller1 name, or ditto
# (optionally: caller2 name)
# (optionally: caller3 name)
# }
+#
+# For memcheck, the supp_kinds are:
+#
+# Param Value1 Value2 Value4 Value8
+# Free Addr1 Addr2 Addr4 Addr8
+# Cond (previously known as Value0)
+#
+# and the optional extra info is:
+# if Param: name of system call param
+# if Free: name of free-ing fn)
#-------- Suppress errors appearing as a result of calling
#-------- __libc_freeres()
{
__libc_freeres/free_mem(Addr4)
- Addr4
+ memcheck:Addr4
fun:free_mem
fun:__libc_freeres
}
@@ -30,14 +38,14 @@
{
__pthread_mutex_unlock/__register_frame_info_bases
- PThread
+ core:PThread
fun:__pthread_mutex_unlock
fun:__register_frame_info_bases
}
{
socketcall.connect(serv_addr)/__libc_connect/*(Param)
- Param
+ memcheck:Param
socketcall.connect(serv_addr)
fun:__libc_connect
fun:*
@@ -45,7 +53,7 @@
{
strrchr/_dl_map_object_from_fd/_dl_map_object(Addr4)
- Addr4
+ memcheck:Addr4
fun:strrchr
fun:_dl_map_object_from_fd
fun:_dl_map_object
@@ -53,7 +61,7 @@
{
strrchr/_dl_map_object_from_fd/_dl_map_object(Value1)
- Value1
+ memcheck:Value1
fun:strrchr
fun:_dl_map_object_from_fd
fun:_dl_map_object
@@ -61,7 +69,7 @@
{
llseek(result)/__libc_lseek64/_IO_file_seek(Param)
- Param
+ memcheck:Param
llseek(result)
fun:__libc_lseek64
fun:_IO_file_seek
@@ -69,7 +77,7 @@
{
__rawmemchr/_nl_*/*locale(Addr4)
- Addr4
+ memcheck:Addr4
fun:__rawmemchr
fun:_nl_*
fun:*locale
@@ -78,20 +86,20 @@
# new ones for RH62 ls -l
{
__strchrnul/__nss_database_lookup(Cond)
- Cond
+ memcheck:Cond
fun:__strchrnul
fun:__nss_database_lookup
}
{
__strchrnul/__gethostbyname_r(Cond)
- Cond
+ memcheck:Cond
fun:__strchrnul
fun:__gethostbyname_r
}
{
strrchr/_dl_map*/_dl_map*(Cond)
- Cond
+ memcheck:Cond
fun:strrchr
fun:_dl_map*
fun:_dl_map*
@@ -99,7 +107,7 @@
{
strchr/dl_open_worker/_dl_catch_error(Cond)
- Cond
+ memcheck:Cond
fun:strchr
fun:dl_open_worker
fun:_dl_catch_error
@@ -107,7 +115,7 @@
{
__rawmemchr/???/__getgrgid_r(Cond)
- Cond
+ memcheck:Cond
fun:__rawmemchr
fun:*
fun:__getgrgid_r
@@ -115,7 +123,7 @@
{
__rawmemchr/_nl_*/*locale*(Cond)
- Cond
+ memcheck:Cond
fun:__rawmemchr
fun:_nl_*
fun:*locale*
@@ -123,7 +131,7 @@
{
_dl_relocate_object/dl_open_worker(Value0)
- Cond
+ memcheck:Cond
fun:_dl_relocate_object
fun:dl_open_worker
}
@@ -135,7 +143,7 @@
{
libc-2.1.3.so/libc-2.1.3.so/libc-2.1.3.so(Cond)
- Cond
+ memcheck:Cond
obj:*libc-2.1.3.so
obj:*libc-2.1.3.so
obj:*libc-2.1.3.so
@@ -143,21 +151,21 @@
{
strchr/libc-2.1.3.so(Cond)
- Cond
+ memcheck:Cond
fun:*strchr*
obj:*libc-2.1.3.so
}
{
libc-2.1.3.so/libXt.so(Cond)
- Cond
+ memcheck:Cond
obj:*libc-2.1.3.so
obj:*libXt.so*
}
{
socketcall.connect(serv_addr)/__libc_connect/*(Param)
- Param
+ memcheck:Param
socketcall.connect(serv_addr)
obj:*libc-2.1.3.so
obj:*libX11.so*