update for Go 1.4

bg5sbk · bg5sbk · commit 5b23de27c1c2 · 2014-12-25T10:22:32.000+08:00
diff --git a/README.md b/README.md
@@ -1,11 +1,5 @@
-This project is dead since Go 1.4 (can't get goroutine id)
-=================================
-
 [English](http://github.com/funny/sync/blob/master/README_EN.md)
 ---------
 
-自从Go 1.4发布之后，这个项目已经跪了 (无法获得goroutine id了)
-================================
-
 [中文说明](http://github.com/funny/sync/blob/master/README_CN.md)
 ---------
diff --git a/README_CN.md b/README_CN.md
@@ -3,6 +3,16 @@
 
 这个包用来在开发调试期，帮助排查程序中的死锁情况。
 
+*** 请先运行运行时Hack脚本：[`hack.sh`](https://github.com/funny/sync/blob/master/)。 ***
+
+*** 从Go 1.4开始，我们无法在`runtime`包之外使用`goc`机制。 ***
+
+*** 所以现在我们需要把`GetGoId()`函数加入到`runtime`包。 ***
+
+*** 这个项目提供了一个Shell脚本用来修改和重新编译`runtime`包。***
+
+*** 所以你需要一个包含代码的Go环境和Linux或Mac操作系统。 ***
+
 用法
 ====
 
diff --git a/README_EN.md b/README_EN.md
@@ -3,6 +3,16 @@ Introduction
 
 This package is used to detect deadlock in Go program.
 
+*** Please run the hack script [`hack.sh`](https://github.com/funny/sync/blob/master/) before use. ***
+
+*** Since Go 1.4 we can't use `goc` file outside `runtime` package. ***
+
+*** So now we need to add the `GetGoId()` function into `runtime` package. ***
+
+*** This project provide a shell script to hack the `runtime` package and re-compile it. ***
+
+*** So you need a source-based Go environment and Linux/Mac system. ***
+
 Usage
 =====
 
diff --git a/deadlock.go b/deadlock.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"container/list"
 	"github.com/funny/debug"
-	"github.com/funny/goid"
+	"runtime"
 	"strconv"
 	"sync"
 )
@@ -81,7 +81,7 @@ func (m *monitor) wait(mode byte) *lockUsage {
 	globalMutex.Lock()
 	defer globalMutex.Unlock()
 
-	waitInfo := &lockUsage{m, mode, goid.Get(), debug.StackTrace(3, 0)}
+	waitInfo := &lockUsage{m, mode, runtime.GetGoId(), debug.StackTrace(3, 0)}
 	waitingList[waitInfo.goid] = waitInfo
 
 	if m.holders == nil {
@@ -118,7 +118,7 @@ func (m *monitor) using(waitInfo *lockUsage) {
 }
 
 func (m *monitor) release(mode byte) {
-	id := goid.Get()
+	id := runtime.GetGoId()
 	for i := m.holders.Back(); i != nil; i = i.Prev() {
 		if info := i.Value.(*lockUsage); info.goid == id && info.mode == mode {
 			m.holders.Remove(i)
diff --git a/hack.sh b/hack.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+echo "# Hack runtime"
+
+cat >> $GOROOT/src/runtime/runtime.c << EOF
+
+void
+runtime·GetGoId(int32 ret)
+{
+	ret = g->goid;
+	USED(&ret);
+}
+
+EOF
+
+cat >> $GOROOT/src/runtime/extern.go << EOF
+
+func GetGoId() int32
+
+EOF
+
+cd $GOROOT/src
+./make.bash
+
+cat > $$$$.go << EOF
+package main
+
+import (
+	"fmt"
+	"runtime"
+)
+
+func main() {
+	runtime.GetGoId()
+	fmt.Print("done")
+}
+EOF
+x=`go run $$$$.go`
+rm $$$$.go
+
+echo ""
+echo ""
+echo "---"
+
+if [ $x = "done" ]; then
+	echo "Done"
+else
+	echo "Failed"
+fi
