Skip to content

Commit

Permalink
Merge pull request #37 from bytedance/34-getmethod-panic-with-go121
Browse files Browse the repository at this point in the history
feat: support go1.21
  • Loading branch information
Sychorius authored Sep 18, 2023
2 parents 15c9b82 + 17d2424 commit 7eec163
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 3 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,18 @@ jobs:
unit-benchmark-test:
strategy:
matrix:
go: ["1.13", "1.14", "1.15", "1.16", "1.17", "1.18", "1.19", "1.20"]
go:
[
"1.13",
"1.14",
"1.15",
"1.16",
"1.17",
"1.18",
"1.19",
"1.20",
"1.21",
]
os: [linux] # should be [ macOS, linux, windows ], but currently we don't have macOS and windows runners
arch: [X64, ARM64]
exclude:
Expand Down
35 changes: 35 additions & 0 deletions internal/monkey/common/runtime_above_1_21.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//go:build go1.21
// +build go1.21

/*
* Copyright 2022 ByteDance Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package common

import (
_ "unsafe"
)

func StopTheWorld() {
const stwForTestResetDebugLog = 16
stopTheWorld(stwForTestResetDebugLog)
}

//go:linkname stopTheWorld runtime.stopTheWorld
func stopTheWorld(reason uint8)

//go:linkname StartTheWorld runtime.startTheWorld
func StartTheWorld()
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//go:build !go1.21
// +build !go1.21

/*
* Copyright 2022 ByteDance Inc.
*
Expand All @@ -20,8 +23,12 @@ import (
_ "unsafe"
)

//go:linkname StopTheWorld runtime.stopTheWorld
func StopTheWorld()
func StopTheWorld() {
stopTheWorld("mockey")
}

//go:linkname stopTheWorld runtime.stopTheWorld
func stopTheWorld(reason string)

//go:linkname StartTheWorld runtime.startTheWorld
func StartTheWorld()

0 comments on commit 7eec163

Please sign in to comment.