Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: update calls to runtime.fastrand to use cheaprand for compatibility with Go 1.22 #68

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Fix: update calls to runtime.fastrand to use cheaprand for compatibility with Go 1.22 #68

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20b4255
Fix: update calls to `runtime.fastrand` to use `cheaprand` for compat…
Aoang Mar 11, 2024
6e10735
Fix: transition to math/rand/v2 for Improved Performance
Aoang Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions internal/xruntime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build !go1.22

// Copyright (c) 2023 Alexey Mayshev. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,25 +17,9 @@
package xruntime

import (
"runtime"
_ "unsafe"
)

const (
// CacheLineSize is useful for preventing false sharing.
CacheLineSize = 64
)

// Parallelism returns the maximum possible number of concurrently running goroutines.
func Parallelism() uint32 {
maxProcs := uint32(runtime.GOMAXPROCS(0))
numCPU := uint32(runtime.NumCPU())
if maxProcs < numCPU {
return maxProcs
}
return numCPU
}

//go:noescape
//go:linkname Fastrand runtime.fastrand
func Fastrand() uint32
25 changes: 25 additions & 0 deletions internal/xruntime/runtime_1.22.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//go:build go1.22
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//go:build go1.22
//go:build go1.21


// Copyright (c) 2023 Alexey Mayshev. All rights reserved.
//
// 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 xruntime

import (
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import (
import (
"rand"
"time"
)
var (
r = rand.New(rand.NewSource(time.Now().Unix()))
)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why haven't considered using math/rand/v2?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it would probably be better this way, then the global variable is not needed.

_ "unsafe"
)

//go:noescape
//go:linkname Fastrand runtime.cheaprand
func Fastrand() uint32
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func Fastrand() uint32
func Fastrand() uint32 {
return r.Uint32()
}

34 changes: 34 additions & 0 deletions internal/xruntime/xruntime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) 2023 Alexey Mayshev. All rights reserved.
//
// 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 xruntime

import (
"runtime"
)

const (
// CacheLineSize is useful for preventing false sharing.
CacheLineSize = 64
)

// Parallelism returns the maximum possible number of concurrently running goroutines.
func Parallelism() uint32 {
maxProcs := uint32(runtime.GOMAXPROCS(0))
numCPU := uint32(runtime.NumCPU())
if maxProcs < numCPU {
return maxProcs
}
return numCPU
}
Loading