Closed
Bug 937201
Opened 11 years ago
Closed 11 years ago
Patch p2a for Bug 902587 broke compilation without MOZ_ENABLE_PROFILER_SPS on Windows/Mac
Categories
(Core :: General, defect)
Tracking
()
RESOLVED
FIXED
mozilla28
People
(Reporter: jonasfj, Assigned: jonasfj)
Details
Attachments
(1 file, 1 obsolete file)
4.97 KB,
patch
|
jonasfj
:
review+
RyanVM
:
checkin+
|
Details | Diff | Splinter Review |
So as summary says, builds without MOZ_ENABLE_PROFILER_SPS fails due to functions being defined twice. See Comment 75 on bug 902587. I have a work in progress patch for this. It is quite simple, I and would land it today, if it weren't for the fact that it need to be tested on 6 different build configurations.
Assignee | ||
Comment 1•11 years ago
|
||
This patch does the following things: * Removes extern 'C' inline definition of stubs for Mozilla(Un)?RegisterDebugF(D|ile) when compiling without MOZ_ENABLE_PROFILER_SPS or on Linux. * Add PoisonIOInterposerStub.cpp with defintions of Mozilla(Un)?RegisterDebugF(D|ile) for Linux and builds without MOZ_ENABLE_PROFILER_SPS. * Use MozillaRegisterDebugFILE and instead of MozillaRegisterDebugFD in Telemetry.cpp (shouldn't have any effect, just cleans up an obscurity in the code)
Attachment #8333837 -
Flags: review?(bgirard)
Comment 2•11 years ago
|
||
CC'ing gaston since he might of ran into this issue.
Updated•11 years ago
|
Attachment #8333837 -
Flags: review?(bgirard) → review+
Assignee | ||
Comment 3•11 years ago
|
||
Carrying forward with r+ from BenWa, a push to try is available here: https://tbpl.mozilla.org/?tree=Try&rev=29da20a0b6d0 Note, there were other pushes (both with and without MOZ_ENABLE_PROFILER_SPS), some of these showed up timeouts, but I don't think this patch caused those :)
Attachment #8333837 -
Attachment is obsolete: true
Attachment #8333890 -
Flags: review+
Attachment #8333890 -
Flags: checkin?
Assignee | ||
Updated•11 years ago
|
Keywords: checkin-needed
Comment 4•11 years ago
|
||
Comment on attachment 8333890 [details] [diff] [review] fix-no-sqs-profiler-macro-win-mac.patch You can just use checkin-needed in the future :) Also, please make sure you have Mercurial configured to add your name to the patches in the future. Makes life easier for those checking in on your behalf :) https://developer.mozilla.org/en-US/docs/Mercurial_FAQ#How_can_I_generate_a_patch_for_somebody_else_to_check-in_for_me.3F
Attachment #8333890 -
Flags: checkin? → checkin+
Comment 5•11 years ago
|
||
https://hg.mozilla.org/integration/mozilla-inbound/rev/37c75e242ae0
Keywords: checkin-needed
Assignee | ||
Comment 6•11 years ago
|
||
Hmm, sorry about missing attribution, I have "qnew = -Ue" so don't know why it's missing. I assume this bug is fixed, now, so I'm marking it FIXED... If p2a from Bug 902587 still causes issues for somebody without MOZ_ENABLE_PROFILER_SPS, please reopen this bug.
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Comment 7•11 years ago
|
||
Bugs aren't resolved until they hit mozilla-central.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
https://hg.mozilla.org/mozilla-central/rev/37c75e242ae0
Status: REOPENED → RESOLVED
Closed: 11 years ago → 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla28
You need to log in
before you can comment on or make changes to this bug.
Description
•