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.

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

Backport memory reporting changes from bug 1181452 #49

Merged
merged 1 commit into from Jul 14, 2015

Conversation

@nnethercote
Copy link
Contributor

nnethercote commented Jul 8, 2015

The code is being backported from https://bugzilla.mozilla.org/show_bug.cgi?id=1181452. This change shouldn't land until the one in the Bugzilla bug has landed.

@michaelwu

This comment has been minimized.

Copy link

michaelwu commented on mozjs/js/public/MemoryMetrics.h in fe0ffa5 Jul 8, 2015

Our bindings generator can bind to most c++ classes as long as you're not using templates. (and if you use templates, you can use them if you only use them for types)

@metajack
Copy link
Contributor

metajack commented Jul 14, 2015

Travis wasn't turned off, but I have now fixed that. Bors will be able to integrate this patch when it's reviewed.

@jdm
Copy link
Member

jdm commented Jul 14, 2015

This is fine with me. Just waiting on the code to land on mozilla-central.

@nnethercote
Copy link
Contributor Author

nnethercote commented Jul 14, 2015

I just landed the SpiderMonkey patches to mozilla-inbound: https://bugzilla.mozilla.org/show_bug.cgi?id=1181452#c5

@jdm
Copy link
Member

jdm commented Jul 14, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jul 14, 2015

📌 Commit fe0ffa5 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 14, 2015

Testing commit fe0ffa5 with merge 065c9a4...

bors-servo pushed a commit that referenced this pull request Jul 14, 2015
Backport memory reporting changes from bug 1181452

The code is being backported from https://bugzilla.mozilla.org/show_bug.cgi?id=1181452. This change shouldn't land until the one in the Bugzilla bug has landed.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 14, 2015

☀️ Test successful - cargo-linux, cargo-mac

@bors-servo bors-servo merged commit fe0ffa5 into servo:master Jul 14, 2015
1 of 3 checks passed
1 of 3 checks passed
continuous-integration/appveyor AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
homu Test successful
Details
bors-servo pushed a commit to servo/rust-mozjs that referenced this pull request Jul 14, 2015
Add glue to use SpiderMonkey's memory reporting from Rust code.

This cannot land until servo/mozjs#49 has landed. And it must land before servo/servo#6572 can land.
@nnethercote nnethercote deleted the nnethercote:coarse-API branch Jul 14, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.