Skip to content

Commit ad456d1

Browse files
committed
windows test
1 parent 972ffb9 commit ad456d1

File tree

6 files changed

+33
-15
lines changed

6 files changed

+33
-15
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,19 +226,19 @@ jobs:
226226
echo "cargo=cargo" >> $GITHUB_OUTPUT
227227
;;
228228
*linux*)
229-
echo "features=use-tcmalloc" >> $GITHUB_OUTPUT
229+
echo "features=use-jemalloc" >> $GITHUB_OUTPUT
230230
echo "cargo=cargo" >> $GITHUB_OUTPUT
231231
;;
232232
*aarch64*windows*)
233-
echo "features=use-snmalloc" >> $GITHUB_OUTPUT
233+
echo "features=" >> $GITHUB_OUTPUT
234234
echo "cargo=cargo-xwin" >> $GITHUB_OUTPUT
235235
;;
236236
*windows*)
237-
echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
237+
echo "features=" >> $GITHUB_OUTPUT
238238
echo "cargo=cargo-xwin" >> $GITHUB_OUTPUT
239239
;;
240240
*)
241-
echo "features=use-jemalloc" >> $GITHUB_OUTPUT
241+
echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
242242
echo "cargo=cargo" >> $GITHUB_OUTPUT
243243
;;
244244
esac

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ members = [
88
resolver = "3"
99

1010
[workspace.package]
11-
version = "0.6.21"
11+
version = "0.6.22"
1212
authors = ["Masato TOYOSHIMA", "phoepsilonix <phoepsilonix@gmail.com>"]
1313
edition = "2024"
1414
rust-version = "1.90.0"

README.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,31 +116,45 @@ mimalloc-rustクレートの場合には、そのままビルドできるケー
116116
RUSTFLAGS="" cargo build --release
117117
```
118118
```sh
119-
RUSTFLAGS="" cargo build --release -F use-tcmalloc
119+
RUSTFLAGS="" cargo build --release -F use-jemalloc
120120
```
121121
```sh
122-
RUSTFLAGS="" cargo build --release -F use-jemalloc
122+
RUSTFLAGS="" cargo build --release -F use-tcmalloc
123123
```
124+
* 実行時にtcmalloc.soが必要。
125+
Ubuntu `libgoogle-perftools-dev` パッケージ
126+
Arch `gperftools` パッケージ
127+
124128
```sh
125129
RUSTFLAGS="" cargo build --release -F use-snmalloc
126130
```
131+
* ビルド時にcmakeが必要。
127132

128133
## リリース版の設定
134+
### v0.6.22
135+
| プラットフォーム | OS | メモリアロケータ |
136+
|----------------|----|----------------|
137+
| x86_64 | Linux | jemalloc |
138+
| aarch64 | Linux | jemalloc |
139+
| aarch64 | Windows | |
140+
| x86_64 | Windows | |
141+
| x86_64, aarch64 | Mac | jemalloc |
142+
129143
### v0.6.21
130144
| プラットフォーム | OS | メモリアロケータ |
131145
|----------------|----|----------------|
132146
| x86_64 | Linux | tcmalloc |
133147
| aarch64 | Linux | jemalloc |
134-
| aarch64 | Windows | snmalloc |
135-
| x86_64 | Windows | mimalloc-rs |
148+
| aarch64 | Windows | |
149+
| x86_64 | Windows | |
136150
| x86_64, aarch64 | Mac | jemalloc |
137151

138152
### v0.6.19
139153
| プラットフォーム | OS | メモリアロケータ |
140154
|----------------|----|----------------|
141155
| x86_64 | Linux | mimalloc-rs |
142156
| aarch64 | Linux | mimalloc-rs |
143-
| aarch64 | Windows | mimalloc-rs |
157+
| aarch64 | Windows | |
144158
| x86_64 | Windows | |
145159
| x86_64, aarch64 | Mac | mimalloc-rs |
146160

dist-workspace.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ members = ["cargo:."]
1616
[dist]
1717
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
1818
cargo-dist-version = "0.30.3"
19-
features = ["use-tcmalloc"]
19+
features = ["use-jemalloc"]
2020
# CI backends to support
2121
ci = "github"
2222
allow-dirty = ["ci"]
@@ -60,10 +60,12 @@ runner = "ubuntu-24.04"
6060
#container = "messense/cargo-xwin:0.18.4"
6161
#container = "messense/cargo-xwin:0.17.1"
6262
container = "messense/cargo-xwin:sha-ab6a270"
63+
#container = "messense/cargo-xwin:sha-ab6a270"
6364

6465
[dist.github-custom-runners.aarch64-pc-windows-msvc]
6566
runner = "ubuntu-24.04"
6667
#container = "messense/cargo-xwin:0.18.4"
6768
#container = "messense/cargo-xwin:0.17.1"
6869
container = "messense/cargo-xwin:sha-ab6a270"
70+
#container = "messense/cargo-xwin:sha-ab6a270"
6971

src/bin/dict-to-mozc.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
feature = "use-mimalloc",
33
any(
44
not(any(target_arch = "arm", target_arch = "aarch64")),
5+
// not(target_os = "windows")
56
all(target_arch = "aarch64", not(target_os = "windows"))
67
)
78
))]
89
#[global_allocator]
910
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
1011

11-
#[cfg(feature = "use-mimalloc-rs")]
1212
#[cfg(all(
1313
feature = "use-mimalloc-rs",
14-
not(target_os = "windows")
14+
// not(target_os = "windows")
1515
))]
1616
#[global_allocator]
1717
static GLOBAL_MIMALLOC: mimalloc_rust::GlobalMiMalloc = mimalloc_rust::GlobalMiMalloc;
@@ -20,6 +20,7 @@ static GLOBAL_MIMALLOC: mimalloc_rust::GlobalMiMalloc = mimalloc_rust::GlobalMiM
2020
feature = "use-snmalloc",
2121
any(
2222
not(any(target_arch = "arm", target_arch = "aarch64")),
23+
// not(target_os = "windows")
2324
all(target_arch = "aarch64", not(target_os = "windows"))
2425
)
2526
))]
@@ -31,6 +32,7 @@ static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
3132
any(
3233
not(any(target_arch = "arm", target_arch = "aarch64")),
3334
all(target_arch = "aarch64", not(target_os = "windows"))
35+
// not(target_os = "windows")
3436
)
3537
))]
3638
#[global_allocator]

0 commit comments

Comments
 (0)