[Moonlight-list] merge plan for beta9

Rolf Bjarne Kvinge rolflists at ya.com
Tue Dec 1 11:32:58 EST 2009



> -----Original Message-----
> From: moonlight-list-bounces at lists.ximian.com [mailto:moonlight-list-
> bounces at lists.ximian.com] On Behalf Of Chris Toshok
> Sent: martes, 01 de diciembre de 2009 15:58
> To: moonlight-list at lists.ximian.com
> Subject: [Moonlight-list] merge plan for beta9
> 
> machine locked up last night at around 1am and I figured it was time
> for
> bed so I didn't get this done last night, but here's the plan at the
> moment.
> 
> The revisions I have ???'s by are ones that look like they should go
> in,
> but I'm not sure about.
> 
> for mono/mcs/mono-basic
>      - merge in 146453
>      - update everything from 146363:147178
> 
> 146267            bd00a43e1cc0a9da09e55f31d2386eb896525b81
> 146285            2c4999143fde3fbbbb59429246de40e341759849
> 146286            2c0078cbe0dc32dce2add01746d96934449e5fb1
> 146288            e782ddca8cc1994f1a09e30290741d7fa438bbe5
> 146396            119ea9e5741dd3df1a450adc0789e69299c3efce
> 146411            9a7e80c59a34b60fe2a31a665d7f2d99d36ea350
> 146412            0eb06b3b9400133a54e73a2a6418ca68071d2dff
> 146413            9958b34f725b33e13f72d2b8a8ac24976de3b86a
> 146432            8f43c7d48a48850ecbc5426ba0db047f948d405a
> 146433            c6b827e49c15e9ac44ca6d43eda09b11b26c848f
> 146435            ea49948c083198bf4ee9fc882db45b9ca5166d3c
> 146447            af93df3b8ea5e38a521f5e9a2c2c30ac04e2b9e5
> 146450            3b97a276e8f677d6f9b801c42a907ed988046cc5
> 146456            58fef967b91b1f36a8fbcb60ed5dee84d4d289ee
> 146457            c2ab18578010280ecb5ae9e85440a3efa377305a
> 146516            b4e9a68ecb1ba407aa40e0519eec431432ed7a30
> ??? 146519 rolf        88e555a01708f112b1e519e66fa1c6c4ab6fb350
Yes, even though that code path is rarely hidden (it'd deadlock pretty
quickly).

> 146520               d0960da162655880193b2413bed0e12903f4ee4b
> 146521            370a8b47b07d8c73c19b4dd29ad2741e0f94f1f4
> ??? 146522 rolf        2d835d76c0926ec0d4c5974cd13c22f319b16889
No need.

> 146523               611fa76b52c5a6b634bcc14ace665995557bde7f
> 146524            ebc9b98cb31bea15bc35a0c6c7cfa93e8252e7cd
> 146532            61a7e914d95b2910c7b530107ac5a8c39ceaaa78
> 146534            a0b6979148cc4352e2c6f4f9959ae3118b136f65
> 146549            529ed01047c75cddf61f99f1e4ed67ec994fc550
> 146559            c7947d57d071a79ce126ab5b2eb94e2491d3d7dc
> 146564            e64ce5984fd871daaf998d45c42335a8f3110e4d
> 146567            bba1a9229aea7c10adf6cfb9098cc55deffb3cda
> 146569            ef6a2b5a951a8037108643f73fdaa9ead314514b
> 146583            f2f0c393c231e4ae2dde5cf318b195a98166d9a4
> 146584            e79e621f52126a470764325a9543da35fec935d4
> 146585            8c7f60335351ede38b95a5a6f490a2f5c5c3dbf6
> 146586            19582845525f014ec8c612d05b3c7d97025bcf7f
> 146588            6cd222ef680c5dd86f87f0c61d8da8e75939cbd6
> 146589            84fc57d41a4d1c0d63f98d649d2f68f10dc561c1
> 146592            ffcd4bff4aec6daa79f3f3984f6db3bdc5f20be6
> 146617            942bcec7469580da78414821b9f2e76578432157
> 146618            0abb32e537a2dca4e17e13ef2278329be9adecce
> 146626            aa5989a559b5d0c3fb780d8c8407c270b38f6cd7
> ??? 146633 lewing    39658fc2531048b2a9d49859d1e297df9b8af009
> 146638               74de03a71519d5e7f94af82469f8967f6e7e7a12
> 146640            9a3b22108fb148b86cffa397dcd449721dcbf95e
> 146641               a94860e5d0e376e49652ca7b6366b723f8d680db
> 146642            6e6da45f0b01d4a6292276fab7635981c5055987
> 146643            4a21d4569de4e1c1d9f482c4d3e1158f402f7851
> 146650            1ca2b7d5cb50e5d2297ebf6d0fdf3399ea932fdb
> ??? 146660 lewing    c76b94ef17df47ada11632ab0e7455e31a7ed3fe
> ??? 146661 lewing    1a321b5187a95e24125c0ed03512dadf6a9179dd
> 146673               765bfda5fdae4097a08024df9ece4c4de07503cf
> 146674            2ccbc401008870a8866c2da2395e1c0a675e0c6f
> 146676            c6e0c73f8cfeeaed36127bc319d0b96f2c936606
> ??? 146679 lewing    8112734a5732ab034663deaeddd8b1aa10ad4922
> 146721               26fec683dd9a0c8f93e6d933f823493745fa9c96
> 146753            73a17a1d7e93b3afcbd44e653360c298b9de52cf
> 146757            6c79cca7f7ba55c0517bd2d5cb824b62dcc1d03c
> 146767            7213d7fa21f4ffb15253a95bd7976f7a330454e7
> 146771            f2e71efb0ccbdf1b74bb36cb880e14c501fa3765
> ??? 146820 rolf        88b8e5dbd3a3466d1d1c46d0e0def3b375f0a393
Yes.
> ??? 146826 rolf        42d9eab5078ce76fbf643dc852900f2d1fa31913
> ??? 146868 rolf        7a44038e121849b684b14a33efcd919bae5e2b0c
> ??? 146869 rolf        a781594fb3f637f9bd27c45422dcffd3cfc9f745
> ??? 146871 rolf        a1fb53ed2d3e5f40fa646fdc9d8d08eac17c194f
(...)
> ??? 146940 rolf        6fb7c68861f8f48a433a98381cc5c8f662047269
> ??? 146999 rolf        15e4b32eacc8b0c740e5239fd7f844462eb6b9ab
> ??? 147000 rolf        7722debc26871b1b2454b7b649a0cb90aff00b87

These seeking fixes are (as always when dealing with seeking ;-) risky -
there were a few regressions with the tests, but since nthey do fix a real
problem with a site reported on moonlight-list I'd say yes.
> ??? 146949 rolf        513d8d76e109be07df4d8a4509adbaa9b3ed1904
Yes.
> ??? 146982 rolf        c140ac815275cba5fd6cd6b361a295df46328a5b
Yes.
> ??? 146990 rolf        e98159e11005f5dabc23a1ef1574207d4c6c72f3
Yes.

> 147002               8d3b44954066b5549bef51635e4a05ff62836c22
> 147006            5caa39b5df9c17280586bdee01c1be2a20624ddc
> ??? 147026 rolf        9dc72efac2077d5f5c9d495721decf93b57cbb4c
Yes.
> ??? 147027 alan        0ae4ec05aaa5bf1ca9616ef131e5b09c8d36fb4c
> ??? 147030 rolf        43823cc050592f8816f386ed5d1d02013295ad01
Yes.
> ??? 147031 rolf        40e776882888a948e456e618b1085f7bf3b54087
Yes.

> ??? 147033 alan        abaf1e08c204b7273a85b0c36ae3597d0f76b9d7
> ??? 147036 alan        7d89398f69cf16a6c724581bf9f2221068bfc119
> ??? 147044 alan        4693512ff844c525f8c283d0bf399cf97524be28
> ??? 147046 alan        48798227644666b36a61d552822c4e33d8503f3d
> ??? 147096 alan        661e19c47049c5c4657271388af5c1174c0848d1
> ??? 147100 rolf        29f4dfa356caa8f2bdf1ac01e7f768e5a2a84f36
No (very limited testing).

> 147109               e2a000fad5a1d3f37eec903ae3d7b828bd297162
> 147121            f496dd0bb0e058d7d4e6a0e1746f1e4214f7139d
> 147122            02113030004c36f17f10211d7bc3d2800a4b27b0
> 147128            f71725404c30cb8d2930c2fafcc05628715451b5
> 147131            b00aa1b2c09e4663414b26da0d474ae0c85e7100
> 147161            bb52684c4f896287821f9f33136a50f1fbbcd8e8
> 147173            5e0e132257dc7b779524db132ab0bd81d38f6c92
> 147175            8cc7ddf47d148bc56127362aae07bdd902d66823
> 147177            74324a932db1cf204223eff2f70481c82190f27c
> 
> One question specifically for rolf:  should we backport all the
> EventObject::surface/EventObject::IsAttached reworking and
> SetParent(NULL) stuff?

The patch is slightly risky since it also fixes a leak (which is the reason
why a bunch of tests started crashing). I *think* I've found all the
crashers, but it hasn't been tested much besides the tests. Otoh the
crashers are still there without my changes, just that they don't happen to
show up since we leak just enough to not hit those code paths.

Rolf




More information about the Moonlight-list mailing list