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

Jump to bottom

Add timeline markers for HTTP requests, JS evaluation, and HTML parsing. #11239

Merged
merged 1 commit into from May 18, 2016
Merged

Add timeline markers for HTTP requests, JS evaluation, and HTML parsing. #11239

merged 1 commit into from May 18, 2016

Conversation

jdm
Copy link
Member

@jdm jdm commented May 17, 2016 •
edited by rzambre

Thank you for contributing to Servo! Please replace each [ ] by [X] when the step is complete, and replace __ with appropriate data:

  • ./mach build -d does not report any errors (didn't try to compile past a rustc upgrade on airplane wifi)
  • ./mach test-tidy --faster does not report any errors
  • These changes fix Profiling Parsing #11218 (github issue number if applicable).

Either:

  • There are tests for these changes OR
  • These changes do not require tests because we don't have testing infrastructure for profiling.

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @fitzgen: components/profile/time.rs, components/profile_traits/time.rs, components/profile_traits/time.rs
  • @KiChjang: components/net/Cargo.toml, components/script/dom/bindings/global.rs, components/net/resource_thread.rs, components/net/lib.rs, components/net/http_loader.rs, components/script/dom/workerglobalscope.rs, components/script/script_thread.rs, components/script/dom/worker.rs, components/script/dom/servohtmlparser.rs, components/script/dom/window.rs

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify net and script code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 17, 2016
@jdm
Copy link
Member Author

jdm commented May 17, 2016

cc @rzambre

@jdm
Copy link
Member Author

jdm commented May 17, 2016

JS evaluation doesn't include JS callbacks right now (eg: event listeners), since it was more complicated than the rest of the bits in this PR.

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #11191) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label May 17, 2016
@jdm jdm removed the S-needs-rebase There are merge conflict errors. label May 18, 2016
@nox
Copy link
Contributor

nox commented May 18, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 3bfd042 has been approved by nox

@highfive highfive assigned nox and unassigned metajack May 18, 2016
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 18, 2016
@jdm
Copy link
Member Author

jdm commented May 18, 2016

@bors-servo: r-
Unit tests.

@highfive
Copy link

New code was committed to pull request.

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels May 18, 2016
@jdm
Copy link
Member Author

jdm commented May 18, 2016

@bors-servo: r=nox

@bors-servo
Copy link
Contributor

📌 Commit 9e8cf19 has been approved by nox

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 18, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 9e8cf19 with merge 96a86bd...

bors-servo pushed a commit that referenced this pull request May 18, 2016
Auto merge of #11239 - jdm:time-profile, r=nox
96a86bd 
Add timeline markers for HTTP requests, JS evaluation, and HTML parsing.

Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data:
- [ ] `./mach build -d` does not report any errors (didn't try to compile past a rustc upgrade on airplane wifi)
- [X] `./mach test-tidy --faster` does not report any errors
- [X] These changes fix #11218 (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because we don't have testing infrastructure for profiling.

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11239)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

@bors-servo bors-servo merged commit 9e8cf19 into servo:master May 18, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 18, 2016
@bors-servo bors-servo mentioned this pull request May 18, 2016
Merged
@rzambre
Copy link
Contributor

rzambre commented May 18, 2016

@jdm thanks a bunch!

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

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Profiling Parsing
6 participants
@jdm @highfive @bors-servo @nox @rzambre @metajack