Skip to contentSkip to conversation

perf: bug fix and cleanups for perf lock

PATCH New Stephane Eranian 1 participant 1 message Jun 7, 2011 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf: bug fix and cleanups for perf lock

This patch fixes the event names used by perf lock. The :r suffix is not supported anymore, it seems.

The patch also cleans up the help and man page to reflect actual options. The perf lock trace option does not exist anymore, AFAICT. When you use it, you get an error but you have no idea why.

---

tools/perf/Documentation/perf-lock.txt +2 -2
index 4a26a2f..64c7a5a 100644
@@ -8,7 +8,7 @@ perf-lock - Analyze lock events
 SYNOPSIS
 --------
 [verse]
-'perf lock' {record|report|trace}
+'perf lock' {record|report|script}
 
 DESCRIPTION
 -----------
@@ -20,7 +20,7 @@ and statistics with this 'perf lock' command.
   produces the file "perf.data" which contains tracing
   results of lock events.
 
-  'perf lock trace' shows raw lock events.
+  'perf lock script' shows raw lock events.
 
   'perf lock report' reports statistical data.
 
tools/perf/builtin-lock.c +5 -5
index 9ac05aa..c24b820 100644
@@ -925,7 +925,7 @@ static const struct option info_options[] = {
 };
 
 static const char * const lock_usage[] = {
-	"perf lock [<options>] {record|trace|report}",
+	"perf lock [<options>] {record|script|report|info}",
 	NULL
 };
 
@@ -942,10 +942,10 @@ static const char *record_args[] = {
 	"-f",
 	"-m", "1024",
 	"-c", "1",
-	"-e", "lock:lock_acquire:r",
-	"-e", "lock:lock_acquired:r",
-	"-e", "lock:lock_contended:r",
-	"-e", "lock:lock_release:r",
+	"-e", "lock:lock_acquire",
+	"-e", "lock:lock_acquired",
+	"-e", "lock:lock_contended",
+	"-e", "lock:lock_release",
 };
 
 static int __cmd_record(int argc, const char **argv)