584048 - Clean up cycle collection code

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[Peter Van der Beken [:peterv]]

We should merge BeginCollection and FinishCollection into a Collect function, since nothing needs to call them separately anymore. Also, currently the participants have three hooks: RootAndUnlinkJSObjects, Unlink and Unroot. Since we don't intertwine GC and CC anymore we should make that Root, Unlink and Unroot and just unlink the JS objects from Unlink too.

Comment 1

[Peter Van der Beken [:peterv]]

BeginCollection and FinishCollection need to be separate again since we moved stuff to a different thread, but there is still a bunch of cleanup we can do.

Comment 2

[Peter Van der Beken [:peterv]]

Attachment: Move unlinking of JS members from root into unlink

We needed to do unlinking of JS members from Root because we needed to forget those references before marking black objects and GC sweeping, which happened between Root and Unlink. Since we don't run the GC during the CC anymore we don't need to do that anymore, we can just unlink all members from Unlink.

Comment 3

[Peter Van der Beken [:peterv]]

Attachment: Rename RootAndUnlinkJSObjects to Root

Given that we don't unlink from Root anymore.

Comment 4

[Peter Van der Beken [:peterv]]

Attachment: Remove NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS/NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS

We made NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS/NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS identical to NS_IMPL_CYCLE_COLLECTING_ADDREF/NS_IMPL_CYCLE_COLLECTING_RELEASE a long time ago (they don't use the _basetype argument anymore). We might as well remove them.

Comment 5

[Peter Van der Beken [:peterv]]

Attachment: Merge RootWhite and CollectWhite

Again made possible because we don't run GC during CC anymore.

Comment 6

[Peter Van der Beken [:peterv]]

Attachment: Add some edge names

Not really cleanup but whatever :-).

Comment 7

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 517157 [details] [diff] [review]
Move unlinking of JS members from root into unlink

This all looks good.

Comment 8

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 517161 [details] [diff] [review]
Add some edge names

>+                NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "tearoffs mNative");

Nit: "tearoff's mNative" or "tearoff->mNative"

Comment 9

[Peter Van der Beken [:peterv]]

http://hg.mozilla.org/mozilla-central/rev/92c7b48558d5
http://hg.mozilla.org/mozilla-central/rev/8ad9f3559f43
http://hg.mozilla.org/mozilla-central/rev/9158c75748f8
http://hg.mozilla.org/mozilla-central/rev/b13ba30a4810
http://hg.mozilla.org/mozilla-central/rev/ed2f1691ff2f