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/linux22.supp b/linux22.supp
index 750aa2d..fd694d3 100644
--- a/linux22.supp
+++ b/linux22.supp
@@ -7,21 +7,29 @@
# 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)
##----------------------------------------------------------------------##
{
socketcall.connect(serv_addr)/__libc_connect/*(Param)
- Param
+ memcheck:Param
socketcall.connect(serv_addr)
fun:__libc_connect
fun:*
@@ -29,7 +37,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
@@ -37,7 +45,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
@@ -45,7 +53,7 @@
{
llseek(result)/__libc_lseek64/_IO_file_seek(Param)
- Param
+ memcheck:Param
llseek(result)
fun:__libc_lseek64
fun:_IO_file_seek
@@ -53,7 +61,7 @@
{
__rawmemchr/_nl_*/*locale(Addr4)
- Addr4
+ memcheck:Addr4
fun:__rawmemchr
fun:_nl_*
fun:*locale
@@ -62,20 +70,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*
@@ -83,7 +91,7 @@
{
strchr/dl_open_worker/_dl_catch_error(Cond)
- Cond
+ memcheck:Cond
fun:strchr
fun:dl_open_worker
fun:_dl_catch_error
@@ -91,7 +99,7 @@
{
__rawmemchr/???/__getgrgid_r(Cond)
- Cond
+ memcheck:Cond
fun:__rawmemchr
fun:*
fun:__getgrgid_r
@@ -99,7 +107,7 @@
{
__rawmemchr/_nl_*/*locale*(Cond)
- Cond
+ memcheck:Cond
fun:__rawmemchr
fun:_nl_*
fun:*locale*
@@ -107,7 +115,7 @@
{
_dl_relocate_object/dl_open_worker(Value0)
- Cond
+ memcheck:Cond
fun:_dl_relocate_object
fun:dl_open_worker
}
@@ -119,7 +127,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
@@ -127,21 +135,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*
@@ -152,14 +160,14 @@
{
X11-Cond-0
- Cond
+ memcheck:Cond
obj:*libXt.so.6.0
obj:*libXt.so.6.0
obj:*libXt.so.6.0
}
{
X11-Cond-1
- Cond
+ memcheck:Cond
fun:__rawmemchr
obj:*libXt.so.6.0
obj:*libXt.so.6.0
@@ -170,7 +178,7 @@
{
X11-Addr4-1
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libX11.so.6.1
obj:/usr/X11R6/lib/libX11.so.6.1
obj:/usr/X11R6/lib/libX11.so.6.1
@@ -178,7 +186,7 @@
{
X11-Addr4-2
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libX11.so.6.1
obj:/usr/X11R6/lib/libX11.so.6.1
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -186,7 +194,7 @@
{
X11-Addr4-3
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -194,7 +202,7 @@
{
X11-Addr4-4
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libX11.so.6.1
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -202,7 +210,7 @@
{
X11-Addr4-5
- Addr4
+ memcheck:Addr4
fun:__rawmemchr
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -210,7 +218,7 @@
{
X11-Addr4-6
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXmu.so.6.0
obj:/usr/X11R6/lib/libXmu.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -218,7 +226,7 @@
{
X11-Addr4-7
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXawXpm_posing_as_Xaw.so.6.1
@@ -226,7 +234,7 @@
{
X11-Param-1
- Param
+ memcheck:Param
write(buf)
fun:__libc_write
obj:/usr/X11R6/lib/libX11.so.6.1
@@ -235,7 +243,7 @@
{
X11-Addr4-8
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libX11.so.6.1
obj:/usr/X11R6/lib/libXpm.so.4.11
obj:/usr/X11R6/lib/libXpm.so.4.11
@@ -243,7 +251,7 @@
{
X11-Addr4-8
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXawXpm_posing_as_Xaw.so.6.1
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -251,7 +259,7 @@
{
X11-Addr4-9
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXaw.so.6.1
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -259,7 +267,7 @@
{
X11-Addr4-10
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXaw.so.6.1
obj:/usr/X11R6/lib/libXaw.so.6.1
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -267,7 +275,7 @@
{
X11-Addr4-11
- Addr4
+ memcheck:Addr4
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXaw.so.6.1