new dir koala

lvan100 · Jan 4, 2021 · dc3ece2 · dc3ece2
1 parent 5cdbf44
commit dc3ece2
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 example/example
 example/example.test
 example/nohup.out
+example/recorder/recorder
 example/replayer/replayer
 example/replayer/replayer.test
 example/replayer/example.test

diff --git a/plugins/recorder.go b/plugins/recorder.go
@@ -3,7 +3,7 @@ package plugins
 import (
 	"context"
 
-	"github.com/didi/sharingan/recorder/recording"
+	"github.com/didi/sharingan/recorder/koala/recording"
 )
 
 var recorders []recording.Recorder

diff --git a/plugins/recorder_default.go b/plugins/recorder_default.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/didi/sharingan/recorder"
-	"github.com/didi/sharingan/recorder/recording"
+	"github.com/didi/sharingan/recorder/koala/recording"
 	"github.com/didi/sharingan/recorder/utils"
 
 	"github.com/v2pro/plz/countlog"

diff --git a/recorder/hook/hook.go → recorder/koala/hook/hook.go b/recorder/hook/hook.go → recorder/koala/hook/hook.go
@@ -4,8 +4,7 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/didi/sharingan/recorder/internal"
-	"github.com/didi/sharingan/recorder/sut"
+	"github.com/didi/sharingan/recorder/koala/sut"
 
 	"github.com/v2pro/plz/countlog"
 )
@@ -23,8 +22,8 @@ func Start() {
 }
 
 func setupAcceptHook() {
-	internal.RegisterOnAccept(func(serverSocketFD int, clientSocketFD int, sa syscall.Sockaddr) {
-		gid := sut.ThreadID(internal.GetCurrentGoRoutineID())
+	RegisterOnAccept(func(serverSocketFD int, clientSocketFD int, sa syscall.Sockaddr) {
+		gid := sut.ThreadID(GetCurrentGoRoutineID())
 
 		origAddr := sockaddrToTCP(sa)
 
@@ -43,8 +42,8 @@ func setupAcceptHook() {
 }
 
 func setupConnectHook() {
-	internal.RegisterOnConnect(func(fd int, sa syscall.Sockaddr) {
-		gid := sut.ThreadID(internal.GetCurrentGoRoutineID())
+	RegisterOnConnect(func(fd int, sa syscall.Sockaddr) {
+		gid := sut.ThreadID(GetCurrentGoRoutineID())
 
 		ipv4Addr, _ := sa.(*syscall.SockaddrInet4)
 		if ipv4Addr == nil {
@@ -73,8 +72,8 @@ func setupConnectHook() {
 }
 
 func setupSendHook() {
-	internal.RegisterOnSend(func(fd int, network string, raddr net.Addr, span []byte) {
-		gid := sut.ThreadID(internal.GetCurrentGoRoutineID())
+	RegisterOnSend(func(fd int, network string, raddr net.Addr, span []byte) {
+		gid := sut.ThreadID(GetCurrentGoRoutineID())
 		if gid == ignoreThreadID {
 			return
 		}
@@ -94,8 +93,8 @@ func setupSendHook() {
 }
 
 func setupRecvHook() {
-	internal.RegisterOnRecv(func(fd int, network string, raddr net.Addr, span []byte) {
-		gid := sut.ThreadID(internal.GetCurrentGoRoutineID())
+	RegisterOnRecv(func(fd int, network string, raddr net.Addr, span []byte) {
+		gid := sut.ThreadID(GetCurrentGoRoutineID())
 		if gid == ignoreThreadID {
 			return
 		}
@@ -111,15 +110,15 @@ func setupRecvHook() {
 }
 
 func setupCloseHook() {
-	internal.RegisterOnClose(func(fd int) {
+	RegisterOnClose(func(fd int) {
 		countlog.Debug("event!sut.close", "socketFD", fd)
 		sut.RemoveGlobalSock(sut.SocketFD(fd))
 	})
 }
 
 func setupGoRoutineExitHook() {
 	// true goroutineID
-	internal.RegisterOnGoRoutineExit(func(gid int64) {
+	RegisterOnGoRoutineExit(func(gid int64) {
 		countlog.Debug("event!sut.goroutine_exit", "threadID", gid)
 		sut.OperateThreadOnRecordingSession(sut.ThreadID(gid), func(thread *sut.Thread) {
 			thread.OnShutdown()

diff --git a/recorder/hook/hook_test.go → recorder/koala/hook/hook_test.go b/recorder/hook/hook_test.go → recorder/koala/hook/hook_test.go
diff --git a/recorder/internal/tag_with_recorder.go → recorder/koala/hook/tag_with_recorder.go b/recorder/internal/tag_with_recorder.go → recorder/koala/hook/tag_with_recorder.go
@@ -1,6 +1,6 @@
 // +build recorder
 
-package internal
+package hook
 
 import (
 	"net"

diff --git a/recorder/internal/tag_without_recorder.go → recorder/koala/hook/tag_without_recorder.go b/recorder/internal/tag_without_recorder.go → recorder/koala/hook/tag_without_recorder.go
@@ -1,6 +1,6 @@
 // +build !recorder
 
-package internal
+package hook
 
 import (
 	"net"

diff --git a/recorder/logger/logger.go → recorder/koala/logger/logger.go b/recorder/logger/logger.go → recorder/koala/logger/logger.go
diff --git a/recorder/recording/action.go → recorder/koala/recording/action.go b/recorder/recording/action.go → recorder/koala/recording/action.go
diff --git a/recorder/recording/action_test.go → recorder/koala/recording/action_test.go b/recorder/recording/action_test.go → recorder/koala/recording/action_test.go
diff --git a/recorder/recording/async.go → recorder/koala/recording/async.go b/recorder/recording/async.go → recorder/koala/recording/async.go
diff --git a/recorder/recording/recorder.go → recorder/koala/recording/recorder.go b/recorder/recording/recorder.go → recorder/koala/recording/recorder.go
diff --git a/recorder/recording/session.go → recorder/koala/recording/session.go b/recorder/recording/session.go → recorder/koala/recording/session.go
diff --git a/recorder/recording/session_test.go → recorder/koala/recording/session_test.go b/recorder/recording/session_test.go → recorder/koala/recording/session_test.go
diff --git a/recorder/sut/gc.go → recorder/koala/sut/gc.go b/recorder/sut/gc.go → recorder/koala/sut/gc.go
diff --git a/recorder/sut/socket.go → recorder/koala/sut/socket.go b/recorder/sut/socket.go → recorder/koala/sut/socket.go
diff --git a/recorder/sut/thread.go → recorder/koala/sut/thread.go b/recorder/sut/thread.go → recorder/koala/sut/thread.go
@@ -8,7 +8,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/didi/sharingan/recorder/recording"
+	"github.com/didi/sharingan/recorder/koala/recording"
 
 	"github.com/v2pro/plz/countlog"
 )

diff --git a/recorder/sut/thread_test.go → recorder/koala/sut/thread_test.go b/recorder/sut/thread_test.go → recorder/koala/sut/thread_test.go
diff --git a/recorder/recorder.go b/recorder/recorder.go
@@ -1,15 +1,15 @@
 package recorder
 
 import (
-	"github.com/didi/sharingan/recorder/internal"
+	"github.com/didi/sharingan/recorder/koala/hook"
 )
 
 // GetCurrentGoRoutineID get current goRoutineID incase with delegatedID
 func GetCurrentGoRoutineID() int64 {
-	return internal.GetCurrentGoRoutineID()
+	return hook.GetCurrentGoRoutineID()
 }
 
 // SetDelegatedFromGoRoutineID set goRoutine delegatedID
 func SetDelegatedFromGoRoutineID(gID int64) {
-	internal.SetDelegatedFromGoRoutineID(gID)
+	hook.SetDelegatedFromGoRoutineID(gID)
 }
diff --git a/tag_with_recorder.go b/tag_with_recorder.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/didi/sharingan/plugins"
 	"github.com/didi/sharingan/recorder"
-	"github.com/didi/sharingan/recorder/hook"
-	"github.com/didi/sharingan/recorder/logger"
-	"github.com/didi/sharingan/recorder/sut"
+	"github.com/didi/sharingan/recorder/koala/hook"
+	"github.com/didi/sharingan/recorder/koala/logger"
+	"github.com/didi/sharingan/recorder/koala/sut"
 )
 
 // GetCurrentGoRoutineID get current goroutineID incase SetDelegatedFromGoRoutineID