Skip to content

Commit f81118a

Browse files
committed
fix: cpu info
1 parent 9899a8a commit f81118a

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Diff for: .github/workflows/bench.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,9 @@ jobs:
259259
pushd bench
260260
dotnet run -c Release --project tool -- --task checkcpu
261261
popd
262-
- uses: actions/download-artifact@v3
263-
with:
264-
name: build
265-
path: bench/build/
266262
- run: ./.github/acton.sh
263+
- run: ./.github/clang.sh
264+
- run: ./.github/crystal.sh
267265
- run: ./.github/dotnet.sh
268266
# - run: ./.github/graalvm.sh
269267
# - run: ./.github/graalvm-node.sh
@@ -276,7 +274,7 @@ jobs:
276274
- run: ./.github/lua.sh
277275
# - run: ./.github/racket.sh
278276
- run: ./.github/hashlink.sh
279-
- run: ./.github/hhvm.sh
277+
# - run: ./.github/hhvm.sh
280278
# - run: sudo ./.github/dart.sh
281279
- uses: shogo82148/actions-setup-perl@v1
282280
with:
@@ -295,6 +293,10 @@ jobs:
295293
with:
296294
ruby-version: 3 # Not needed with a .ruby-version file
297295
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
296+
- uses: actions/download-artifact@v3
297+
with:
298+
name: build
299+
path: bench/build/
298300
- name: Bench
299301
run: |
300302
source $PROFILE

Diff for: bench/include/kotlin-jvm/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ dependencies {
3131
// implementation("org.slf4j:slf4j-api:1.7.36")
3232
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3333
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
34-
val ktor_version = "2.1.3"
34+
implementation("org.jetbrains.kotlinx:atomicfu:0.18.5")
35+
val ktor_version = "2.2.0"
3536
implementation("io.ktor:ktor-server-core:$ktor_version")
3637
// implementation("io.ktor:ktor-server-netty:$ktor_version")
3738
implementation("io.ktor:ktor-server-cio:$ktor_version")

Diff for: bench/tool/CpuInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public override string ToString()
2323

2424
public static bool TryParse(string rawText, out CpuInfo cpuInfo)
2525
{
26-
Match match = Regex.Match(rawText, @"^Architecture:(?<arch>.+?)\s*$[^.$]*?^CPU\(s\):\s*(?<core>\d+)\s*$[^.$]*?^Model:\s*(?<model>\d+)\s*$\s*^Model name:\s*(?<name>.+?)$", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.IgnoreCase);
26+
Match match = Regex.Match(rawText, @"^Architecture:\s*(?<arch>.+?)\s*$[^.$]*?^CPU\(s\):\s*(?<core>\d+)\s*$[^.$]*?^Model name:\s*(?<name>.+?)$[^.$]*?^Model:\s*(?<model>\d+)\s*$", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.IgnoreCase);
2727
if (match.Success)
2828
{
2929
cpuInfo = new CpuInfo

0 commit comments

Comments
 (0)