From 8ecb9a765e02a8b19d8fad2afa65aee2a068b01a Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 27 Aug 2014 23:32:49 -0400 Subject: runtime: rename Lock to Mutex Mutex is consistent with package sync, and when in the unexported Go form it avoids having a conflcit between the type (now mutex) and the function (lock). LGTM=iant R=golang-codereviews, iant CC=dvyukov, golang-codereviews, r https://golang.org/cl/133140043 --- src/pkg/runtime/panic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pkg/runtime/panic.c') diff --git a/src/pkg/runtime/panic.c b/src/pkg/runtime/panic.c index dc3d2e93bf..00c780bf55 100644 --- a/src/pkg/runtime/panic.c +++ b/src/pkg/runtime/panic.c @@ -11,7 +11,7 @@ // Code related to defer, panic and recover. uint32 runtime·panicking; -static Lock paniclk; +static Mutex paniclk; // Each P holds pool for defers with arg sizes 8, 24, 40, 56 and 72 bytes. // Memory block is 40 (24 for 32 bits) bytes larger due to Defer header. @@ -448,7 +448,7 @@ runtime·dopanic(int32 unused) // Let it print what it needs to print. // Wait forever without chewing up cpu. // It will exit when it's done. - static Lock deadlock; + static Mutex deadlock; runtime·lock(&deadlock); runtime·lock(&deadlock); } -- cgit v1.3