Consistently use a reader/writer flag for lockstat probes in rwlock(9) and

sx(9), rather than using the probe function name to determine whether a
given lock is a read lock or a write lock. Update lockstat(1) accordingly.

1 files changed, 8 insertions, 8 deletions

diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
index 5c71160..b59bee7 100644
--- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
+++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
@@ -196,17 +196,17 @@ static ls_event_info_t g_event_info[LS_MAX_EVENTS] = {
 	    "lockstat:::spin-release", NULL,
 	    "lockstat:::spin-acquire" },
 	{ 'H',	"Lock",	"R/W writer hold",			"nsec",
-	    "lockstat::rw_wunlock:rw-release", NULL,
-	    "lockstat::rw_wlock:rw-acquire" },
+	    "lockstat:::rw-release", "arg1 == 0",
+	    "lockstat:::rw-acquire" },
 	{ 'H',	"Lock",	"R/W reader hold",			"nsec",
-	    "lockstat::rw_runlock:rw-release", NULL,
-	    "lockstat::rw_rlock:rw-acquire" },
+	    "lockstat:::rw-release", "arg1 == 1",
+	    "lockstat:::rw-acquire" },
 	{ 'H',	"Lock",	"SX shared hold",			"nsec",
-	    "lockstat::sx_sunlock:sx-release", NULL,
-	    "lockstat::sx_slock:sx-acquire" },
+	    "lockstat:::sx-release", "arg1 == 0",
+	    "lockstat:::sx-acquire" },
 	{ 'H',	"Lock",	"SX exclusive hold",			"nsec",
-	    "lockstat::sx_xunlock:sx-release", NULL,
-	    "lockstat::sx_xlock:sx-acquire" },
+	    "lockstat:::sx-release", "arg1 == 1",
+	    "lockstat:::sx-acquire" },
 	{ 'H',	"Lock",	"Unknown event (type 38)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 39)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 40)",		"units"	},