aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/runtime/panic.c
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-08-27 23:32:49 -0400
committerRuss Cox <rsc@golang.org>2014-08-27 23:32:49 -0400
commit8ecb9a765e02a8b19d8fad2afa65aee2a068b01a (patch)
tree66f7622c0f2b2c14943c0b0c5780d00987574e03 /src/pkg/runtime/panic.c
parent299117eca0f28b6e379c4d5b7e43e2f13cf0cd36 (diff)
downloadgo-8ecb9a765e02a8b19d8fad2afa65aee2a068b01a.tar.xz
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
Diffstat (limited to 'src/pkg/runtime/panic.c')
-rw-r--r--src/pkg/runtime/panic.c4
1 files changed, 2 insertions, 2 deletions
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);
}