Skip to content

Update jemalloc to 4.5.0#41861

Merged
bors merged 1 commit into
rust-lang:masterfrom
arthurprs:update-jemalloc
May 13, 2017
Merged

Update jemalloc to 4.5.0#41861
bors merged 1 commit into
rust-lang:masterfrom
arthurprs:update-jemalloc

Conversation

@arthurprs

@arthurprs arthurprs commented May 9, 2017

Copy link
Copy Markdown
Contributor
  • pointing jemalloc submodule to the 4.5.0 HEAD + generated configure script
  • removed the now unnecessary extra config for windows. jemalloc is now much better at configuring itself overall.

Let's see what the CI think.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@arthurprs

Copy link
Copy Markdown
Contributor Author

@alexcrichton

Copy link
Copy Markdown
Member

Thanks! Do you have a pointer to the commit for the disable-lazy-lock business? Or a pointer to the source which disables it on Windows today?

(just curious)

@arthurprs

Copy link
Copy Markdown
Contributor Author

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

Sounds great!

@bors

bors commented May 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8f420b4 has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 10, 2017
…ichton

Update jemalloc to 4.5.0

* pointing jemalloc submodule to the 4.5.0 HEAD + generated configure script
* removed the now unnecessary extra config for windows. jemalloc is now much better at configuring itself overall.

Let's see what the CI think.
@TimNN

TimNN commented May 10, 2017

Copy link
Copy Markdown
Contributor

I believe that this has caused the failure of #41872 (maybe an interaction with #41863?):

[00:55:02] ===============================================================================
[00:55:02] running: "make" "build_lib_static" "-j" "4"
[00:55:02] /android/ndk/arm64-21/bin/aarch64-linux-android-gcc -std=gnu11 -Wall -Werror=declaration-after-statement -Wsign-compare -pipe -g3 -fvisibility=hidden -O3 -funroll-loops -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -c -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -D_GNU_SOURCE -D_REENTRANT -I/checkout/src/liballoc_jemalloc/../jemalloc/include -Iinclude -o src/jemalloc.o /checkout/src/liballoc_jemalloc/../jemalloc/src/jemalloc.c
[00:55:02] /android/ndk/arm64-21/bin/aarch64-linux-android-gcc -std=gnu11 -Wall -Werror=declaration-after-statement -Wsign-compare -pipe -g3 -fvisibility=hidden -O3 -funroll-loops -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -c -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -D_GNU_SOURCE -D_REENTRANT -I/checkout/src/liballoc_jemalloc/../jemalloc/include -Iinclude -o src/arena.o /checkout/src/liballoc_jemalloc/../jemalloc/src/arena.c
[00:55:02] /android/ndk/arm64-21/bin/aarch64-linux-android-gcc -std=gnu11 -Wall -Werror=declaration-after-statement -Wsign-compare -pipe -g3 -fvisibility=hidden -O3 -funroll-loops -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -c -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -D_GNU_SOURCE -D_REENTRANT -I/checkout/src/liballoc_jemalloc/../jemalloc/include -Iinclude -o src/base.o /checkout/src/liballoc_jemalloc/../jemalloc/src/base.c
[00:55:02] /android/ndk/arm64-21/bin/aarch64-linux-android-gcc -std=gnu11 -Wall -Werror=declaration-after-statement -Wsign-compare -pipe -g3 -fvisibility=hidden -O3 -funroll-loops -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -c -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -D_GNU_SOURCE -D_REENTRANT -I/checkout/src/liballoc_jemalloc/../jemalloc/include -Iinclude -o src/atomic.o /checkout/src/liballoc_jemalloc/../jemalloc/src/atomic.c
[00:55:02] Makefile:293: recipe for target 'src/arena.o' failed
[00:55:02] /android/ndk/arm64-21/bin/aarch64-linux-android-gcc -std=gnu11 -Wall -Werror=declaration-after-statement -Wsign-compare -pipe -g3 -fvisibility=hidden -O3 -funroll-loops -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -c -O2 -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -D_GNU_SOURCE -D_REENTRANT -I/checkout/src/liballoc_jemalloc/../jemalloc/include -Iinclude -o src/bitmap.o /checkout/src/liballoc_jemalloc/../jemalloc/src/bitmap.c
[00:55:02] 
[00:55:02] 
[00:55:02] command did not execute successfully: "make" "build_lib_static" "-j" "4"
[00:55:02] expected success, got: exit code: 2
[00:55:02] 
[00:55:02] 
[00:55:02] 
[00:55:02] --- stderr
[00:55:02] In file included from /android/ndk/arm64-21/sysroot/usr/include/sys/syscall.h:36:0,
[00:55:02]                  from /checkout/src/liballoc_jemalloc/../jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h:13,
[00:55:02]                  from include/jemalloc/internal/jemalloc_internal.h:5,
[00:55:02]                  from /checkout/src/liballoc_jemalloc/../jemalloc/src/arena.c:2:
[00:55:02] /checkout/src/liballoc_jemalloc/../jemalloc/src/arena.c: In function 'init_thp_initially_huge':
[00:55:02] /checkout/src/liballoc_jemalloc/../jemalloc/src/arena.c:3812:20: error: '__NR_open' undeclared (first use in this function)
[00:55:02]   fd = (int)syscall(SYS_open,
[00:55:02]                     ^
[00:55:02] /checkout/src/liballoc_jemalloc/../jemalloc/src/arena.c:3812:20: note: each undeclared identifier is reported only once for each function it appears in
[00:55:02] make: *** [src/arena.o] Error 1
[00:55:02] make: *** Waiting for unfinished jobs....
[00:55:02] 
[00:55:16] error: build failed
[00:55:16] 
[00:55:16] 
[00:55:16] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "-j" "4" "--target" "aarch64-linux-android" "--release" "--locked" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml"

@arthurprs

Copy link
Copy Markdown
Contributor Author

I'm looking into it.

@arthurprs

Copy link
Copy Markdown
Contributor Author

Once we merge rust-lang/jemalloc#18 I'll update the submodule reference here.

@frewsxcv

Copy link
Copy Markdown
Contributor

@bors r-

@arthurprs

Copy link
Copy Markdown
Contributor Author

Submodule updated. Shall we give it another shot?

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r=alexcrichton

@bors

bors commented May 10, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 65d0be3 has been approved by alexcrichton

@bors

bors commented May 10, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 65d0be3 with merge 583c025...

@TimNN TimNN added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 10, 2017
@bors

bors commented May 10, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Looks like 32-bit segfaults?

[01:20:39] error: process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/i686-unknown-linux-musl/release/deps/std-116dfe5a1b0286e7` (signal: 11, SIGSEGV: invalid memory reference)

@arthurprs

arthurprs commented May 11, 2017

Copy link
Copy Markdown
Contributor Author

😞

How can I simulate this build locally? I tried to follow the CI setup but I got lost real quick.

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@alexcrichton Could you help out here? We should provide some instructions on how to use Rust's CI containers locally on the forge...

@frewsxcv

Copy link
Copy Markdown
Contributor

I'm on my phone, but you should be able toodify one of the CI scripts to whitelist the machines you want to test on in a script somewhere and then push to this branch

@arthurprs

arthurprs commented May 11, 2017

Copy link
Copy Markdown
Contributor Author

After posting that I tried running the container with src/ci/docker/run.sh dist-i586-gnu-i686-musl but I can't get it to compile the compiler_builtins crate.

Here's the output with -v flag active

Building stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
running: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "-j" "4" "--target" "x86_64-unknown-linux-gnu" "-v" "--release" "--locked" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml"
       Fresh libc v0.2.21
       Fresh core v0.0.0 (file:///checkout/src/libcore)
       Fresh filetime v0.1.10
       Fresh gcc v0.3.45
       Fresh rand v0.0.0 (file:///checkout/src/librand)
       Fresh alloc v0.0.0 (file:///checkout/src/liballoc)
       Fresh cmake v0.1.22
       Fresh libc v0.0.0 (file:///checkout/src/rustc/libc_shim)
       Fresh build_helper v0.1.0 (file:///checkout/src/build_helper)
       Fresh std_unicode v0.0.0 (file:///checkout/src/libstd_unicode)
       Fresh collections v0.0.0 (file:///checkout/src/libcollections)
       Fresh panic_abort v0.0.0 (file:///checkout/src/libpanic_abort)
       Fresh unwind v0.0.0 (file:///checkout/src/libunwind)
   Compiling compiler_builtins v0.0.0 (file:///checkout/src/libcompiler_builtins)
       Fresh panic_unwind v0.0.0 (file:///checkout/src/libpanic_unwind)
     Running `/checkout/obj/build/bootstrap/debug/rustc --crate-name compiler_builtins /checkout/src/libcompiler_builtins/lib.rs --crate-type lib --emit=dep-info,link -C opt-level=2 -C metadata=863b57a66ba6c3e1 -C extra-filename=-863b57a66ba6c3e1 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/release/deps --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps/libcore-bfaa82017ca17cb2.rlib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/native/compiler-rt/. -l static=compiler-rt`
       Fresh alloc_system v0.0.0 (file:///checkout/src/liballoc_system)
       Fresh rustc_tsan v0.0.0 (file:///checkout/src/librustc_tsan)
       Fresh rustc_msan v0.0.0 (file:///checkout/src/librustc_msan)
       Fresh alloc_jemalloc v0.0.0 (file:///checkout/src/liballoc_jemalloc)
       Fresh rustc_lsan v0.0.0 (file:///checkout/src/librustc_lsan)
       Fresh rustc_asan v0.0.0 (file:///checkout/src/librustc_asan)
error: could not find native static library `compiler-rt`, perhaps an -L flag is missing?

error: Could not compile `compiler_builtins`.

Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name compiler_builtins /checkout/src/libcompiler_builtins/lib.rs --crate-type lib --emit=dep-info,link -C opt-level=2 -C metadata=863b57a66ba6c3e1 -C extra-filename=-863b57a66ba6c3e1 --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/release/deps --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps/libcore-bfaa82017ca17cb2.rlib -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/native/compiler-rt/. -l static=compiler-rt` (exit code: 101)


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "-j" "4" "--target" "x86_64-unknown-linux-gnu" "-v" "--release" "--locked" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml"
expected success, got: exit code: 101

@alexcrichton

Copy link
Copy Markdown
Member

Ah yeah the README has some more info but looks like you found it. That's odd though that it failed to build, can you try blowing away local state, updating submodules, and trying again?

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

@arthurprs

Copy link
Copy Markdown
Contributor Author

Bors is on a strike?

@Mark-Simulacrum

Copy link
Copy Markdown
Member

Well, we had one PR take like 6 hours to test since I think a builder didn't start or was really slow (no clue why) and then the rollup I created failed, so... we're waiting :). See https://buildbot2.rust-lang.org/homu/queue/rust if you want to follow progress.

@arthurprs

Copy link
Copy Markdown
Contributor Author

I wasn't aware of that queue page, thanks!

@bors

bors commented May 13, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 65d0be3 with merge 453cad6...

bors added a commit that referenced this pull request May 13, 2017
Update jemalloc to 4.5.0

* pointing jemalloc submodule to the 4.5.0 HEAD + generated configure script
* removed the now unnecessary extra config for windows. jemalloc is now much better at configuring itself overall.

Let's see what the CI think.
@bors

bors commented May 13, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 453cad6 to master...

@bors bors merged commit 65d0be3 into rust-lang:master May 13, 2017
@arthurprs

Copy link
Copy Markdown
Contributor Author

🎉

@alexcrichton

Copy link
Copy Markdown
Member

Unfortunately I think this causes a regression on OSX 10.12.

@arthurprs would you be up for submitting a PR to revert?

@arthurprs

Copy link
Copy Markdown
Contributor Author

Will do.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants