Closed Bug 736838 Opened 12 years ago Closed 12 years ago

Merge ekr's fixes from ekr_sandbox on alder

Categories

(Core :: WebRTC: Signaling, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED

People

(Reporter: jesup, Unassigned)

References

Details

(Whiteboard: [qa-])

Attachments

(3 files)

Merge ekr's work from ekr_sandbox to alder trunk - mostly sipcc stuff
Blocks: 731421
The patch by Randell caused the following build errors:

> ../../../../../media/webrtc/signaling/src/callcontrol/nsWebrtcContext.cpp:
> In member function ‘virtual nsresult
> nsWebrtcContext::QueryInterface(const nsIID&, void**)’:
> ../../../../../media/webrtc/signaling/src/callcontrol/nsWebrtcContext.cpp:94:321:
> error: ‘do_GetService’ was not declared in this scope 

This is fixed by including nsServiceManagerUtils.h.

> ../../../../../media/webrtc/signaling/src/callcontrol/nsWebrtcContext.cpp:
> At global scope:
> ../../../../../media/webrtc/signaling/src/callcontrol/nsWebrtcContext.cpp:98:11:
> error: expected constructor, destructor, or type conversion before ‘(’
> token

This is due to bug 659722, even if you include nsDOMClassInfoID.h, DOMCI_DATA will not be defined. Adding the _IMPL_NS_LAYOUT definition to the gyp file leads to a link error:

> hidden symbol NS_IsCycleCollectorThread isn't defined in libxul.so

and a few other "undefined reference to NS_DebugBreak" errors, presumably because this is a debug build.
This is a patchset built on top of Randell's export (so you'll need to hg import both in order) that fixes compile errors and moves nsWebrtcContext to content/media/.

As a result of the move, there is a link error:

> ../../content/media/nsWebrtcContext.o: In function
> `nsWebrtcContext::ProcessMessage(nsAString_internal const&)':
> /home/anant/Code/alder/content/media/nsWebrtcContext.cpp:149: undefined reference to `cprFindSocketIP4'
> /usr/bin/ld.bfd.real: libxul.so: hidden symbol `cprFindSocketIP4' isn't defined
> /usr/bin/ld.bfd.real: final link failed: Bad value

cprFindSocketIP4 is built into sipcc, but not exported to libxul.
Note: substitutes cpr_dummy_socket for cpr_linux_socket; I'm assuming this is ok.  Adds all needed -Werror/etc fixes to cpr_dummy_socket.  Applies on top of paris_demo branch
lgtm
Comment on attachment 607109 [details] [diff] [review]
fix cpr issues on Linux, remove duplicate gyp->Makefile run

committed to paris_demo branch as https://hg.mozilla.org/projects/alder/rev/0595759c3bab
Attachment #607109 - Flags: feedback+
The patch makes the build on Linux succeed, but crashes on startup:

###!!! ASSERTION: Class info data out of sync, you forgot to update nsDOMClassInfo.h and nsDOMClassInfo.cpp! Fix this, mozilla will not work without this fixed!: 'Error', file /home/anant/Code/alder/dom/base/nsDOMClassInfo.cpp, line 4422
WARNING: NS_ENSURE_SUCCESS(rv, 0L) failed with result 0xC1F30001: file /home/anant/Code/alder/dom/base/nsDOMClassInfo.cpp, line 5027
###!!! ASSERTION: Class info data out of sync, you forgot to update nsDOMClassInfo.h and nsDOMClassInfo.cpp! Fix this, mozilla will not work without this fixed!: 'Error', file /home/anant/Code/alder/dom/base/nsDOMClassInfo.cpp, line 4422
WARNING: NS_ENSURE_SUCCESS(rv, 0L) failed with result 0xC1F30001: file /home/anant/Code/alder/dom/base/nsDOMClassInfo.cpp, line 5027

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff345db3e in ConstructSlimWrapper (ccx=..., aHelper=..., xpcScope=0x7fffdf19a950, rval=0x7fffffff58d8)
    at /home/anant/Code/alder/js/xpconnect/src/XPCWrappedNative.cpp:3744
3744	    nsresult rv = classInfoHelper->GetScriptableFlags(&flagsInt);
This issue occurs on Mac as well, it might be caused some change between ekr_sandbox & paris_demo w.r.t nsDOMClassInfo.
The DOMCI_CLASS macros were in the wrong order in nsDOMClassInfoClasses.h, which matters because this is an array. Fixed & pushed to paris_demo!
QA Contact: jsmith
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Whiteboard: [qa-]
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: