4645 2005-08-24 23:40:33 -0700 collector.cpp win portability fixes 2005-09-04 01:42:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore 420+ PC Windows XP VERIFIED FIXED P2 Normal --- 1 kkowalczyk darin oldest_to_newest 17393 0 kkowalczyk 2005-08-24 23:40:33 -0700 win implementation of threading and fixes for GC 17394 1 3572 kkowalczyk 2005-08-24 23:40:49 -0700 Created attachment 3572 collector.cpp 18582 2 3572 darin 2005-09-03 17:37:36 -0700 Comment on attachment 3572 collector.cpp I'm not going to enable multiple threads on Windows unless we know a reason that feature is needed. That's a special requirement of JavaScriptCore on Mac OS X that I don't expect on other platforms. Although I could be convinced otherwise. 18600 3 darin 2005-09-03 18:16:15 -0700 These problems should all be fixed, but I haven't tried compiling on Windows. Krzysztof, please let me know if any of the changes don't work. 3572 2005-08-24 23:40:49 -0700 2005-09-03 17:37:36 -0700 collector.cpp collector_cpp_diff.txt text/plain 5006 kkowalczyk SW5kZXg6IGtqcy9jb2xsZWN0b3IuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2cy9yb290 L0phdmFTY3JpcHRDb3JlL2tqcy9jb2xsZWN0b3IuY3BwLHYNCnJldHJpZXZpbmcgcmV2aXNpb24g MS40Mw0KZGlmZiAtdSAtcjEuNDMgY29sbGVjdG9yLmNwcA0KLS0tIGtqcy9jb2xsZWN0b3IuY3Bw CTE1IEF1ZyAyMDA1IDE4OjQ3OjQ5IC0wMDAwCTEuNDMNCisrKyBranMvY29sbGVjdG9yLmNwcAky NSBBdWcgMjAwNSAwNjo0MDoxNyAtMDAwMA0KQEAgLTE5LDYgKzE5LDEwIEBADQogICoNCiAgKi8N CiANCisjaWYgV0lOMzINCisjaW5jbHVkZSA8d2luZG93cy5oPg0KKyNlbmRpZg0KKw0KICNpbmNs dWRlICJjb2xsZWN0b3IuaCINCiANCiAjaW5jbHVkZSAiZmFzdF9tYWxsb2MuaCINCkBAIC0xNzMs NiArMTc3LDE1IEBADQogICByZXR1cm4gbmV3Q2VsbDsNCiB9DQogDQorI2lmIFdJTjMyDQorY2xh c3MgQ29sbGVjdG9yOjpUaHJlYWQgew0KKyAgcHVibGljOg0KKyAgVGhyZWFkKERXT1JEIHRpZCwg SEFORExFIGhhbmRsZSkgOiB0aHJlYWRJZCh0aWQpLCB0aHJlYWRIYW5kbGUoaGFuZGxlKSB7fQ0K KyAgVGhyZWFkICpuZXh0Ow0KKyAgRFdPUkQgICB0aHJlYWRJZDsNCisgIEhBTkRMRSAgdGhyZWFk SGFuZGxlOw0KK307DQorI2Vsc2UNCiBzdHJ1Y3QgQ29sbGVjdG9yOjpUaHJlYWQgew0KICAgVGhy ZWFkKHB0aHJlYWRfdCBwdGhyZWFkLCBtYWNoX3BvcnRfdCBtdGhyZWFkKSA6IHBvc2l4VGhyZWFk KHB0aHJlYWQpLCBtYWNoVGhyZWFkKG10aHJlYWQpIHt9DQogICBUaHJlYWQgKm5leHQ7DQpAQCAt MTgyLDYgKzE5NSw3IEBADQogDQogcHRocmVhZF9rZXlfdCByZWdpc3RlcmVkVGhyZWFkS2V5Ow0K IHB0aHJlYWRfb25jZV90IHJlZ2lzdGVyZWRUaHJlYWRLZXlPbmNlID0gUFRIUkVBRF9PTkNFX0lO SVQ7DQorI2VuZGlmDQogQ29sbGVjdG9yOjpUaHJlYWQgKnJlZ2lzdGVyZWRUaHJlYWRzOw0KICAg DQogc3RhdGljIHZvaWQgZGVzdHJveVJlZ2lzdGVyZWRUaHJlYWQodm9pZCAqZGF0YSkgDQpAQCAt MjA0LDYgKzIxOCwyNyBAQA0KICAgZGVsZXRlIHRocmVhZDsNCiB9DQogDQorI2lmIFdJTjMyDQor dm9pZCBDb2xsZWN0b3I6OnJlZ2lzdGVyVGhyZWFkKCkNCit7DQorICAgIC8vIFRPRE86IHVzZSBU TFMgdG8gbWFyayB0aHJlYWQgYXMgcmVnaXN0ZXJlZCwgaXQnbGwgYmUgZmFzdGVyDQorICAgIERX T1JEIHRpZCA9IEdldEN1cnJlbnRUaHJlYWRJZCgpOw0KKyAgICBIQU5ETEUgaGFuZGxlID0gR2V0 Q3VycmVudFRocmVhZCgpOw0KKyAgICBDb2xsZWN0b3I6OlRocmVhZCAqbGFzdCA9IHJlZ2lzdGVy ZWRUaHJlYWRzOw0KKyAgICB3aGlsZSAoTlVMTCAhPSBsYXN0KQ0KKyAgICB7DQorICAgICAgaWYg KGxhc3QtPnRocmVhZElkID09IHRpZCkNCisgICAgICAgICAgcmV0dXJuOw0KKyAgICAgIGxhc3Qg PSBsYXN0LT5uZXh0Ow0KKyAgICB9DQorICAgICAgDQorICAgIENvbGxlY3Rvcjo6VGhyZWFkICp0 aHJlYWQgPSBuZXcgQ29sbGVjdG9yOjpUaHJlYWQodGlkLCBoYW5kbGUpOw0KKyAgICBpZiAoTlVM TCA9PSB0aHJlYWQpDQorICAgICAgICByZXR1cm47DQorICAgIHRocmVhZC0+bmV4dCA9IHJlZ2lz dGVyZWRUaHJlYWRzOw0KKyAgICByZWdpc3RlcmVkVGhyZWFkcyA9IHRocmVhZDsNCit9DQorI2Vs c2UNCiBzdGF0aWMgdm9pZCBpbml0aWFsaXplUmVnaXN0ZXJlZFRocmVhZEtleSgpDQogew0KICAg cHRocmVhZF9rZXlfY3JlYXRlKCZyZWdpc3RlcmVkVGhyZWFkS2V5LCBkZXN0cm95UmVnaXN0ZXJl ZFRocmVhZCk7DQpAQCAtMjIxLDYgKzI1Niw3IEBADQogICAgIHB0aHJlYWRfc2V0c3BlY2lmaWMo cmVnaXN0ZXJlZFRocmVhZEtleSwgdGhyZWFkKTsNCiAgIH0NCiB9DQorI2VuZGlmDQogDQogI2Rl ZmluZSBJU19QT0lOVEVSX0FMSUdORUQocCkgKCgoaW50KShwKSAmIChzaXplb2YoY2hhciAqKSAt IDEpKSA9PSAwKQ0KIA0KQEAgLTI3Miw2ICszMDgsMzEgQEANCiAgIH0NCiB9DQogDQorI2lmIFdJ TjMyDQorI2luY2x1ZGUgPHdpbmRvd3MuaD4NCisjaW5jbHVkZSA8c2V0am1wLmg+DQorDQorc3Rh dGljIHZvaWQqIEdldFN0YWNrQmFzZUN1cnJlbnRUaHJlYWQoKQ0KK3sNCisgICAgTlRfVElCKiBw VGliOw0KKyAgICBfX2FzbQ0KKyAgICB7DQorICAgICAgICBNT1YgRUFYICwgRlM6WzE4aF0NCisg ICAgICAgIE1PViBwVGliICwgRUFYDQorICAgIH0NCisgICAgcmV0dXJuICh2b2lkKilwVGliLT5T dGFja0Jhc2U7DQorfQ0KKw0KK3ZvaWQgQ29sbGVjdG9yOjptYXJrQ3VycmVudFRocmVhZENvbnNl cnZhdGl2ZWx5KCkNCit7DQorICBqbXBfYnVmIHJlZ2lzdGVyczsNCisgIHNldGptcChyZWdpc3Rl cnMpOw0KKyAgdm9pZCAqc3RhY2tCYXNlID0gR2V0U3RhY2tCYXNlQ3VycmVudFRocmVhZCgpOw0K KyAgaW50IGR1bW15Ow0KKyAgdm9pZCAqc3RhY2tQb2ludGVyID0gJmR1bW15Ow0KKyAgbWFya1N0 YWNrT2JqZWN0c0NvbnNlcnZhdGl2ZWx5KHN0YWNrUG9pbnRlciwgc3RhY2tCYXNlKTsNCit9DQor I2Vsc2UNCiB2b2lkIENvbGxlY3Rvcjo6bWFya0N1cnJlbnRUaHJlYWRDb25zZXJ2YXRpdmVseSgp DQogew0KICAgam1wX2J1ZiByZWdpc3RlcnM7DQpAQCAtMjgzLDExICszNDQsNTIgQEANCiAgIHZv aWQgKnN0YWNrUG9pbnRlciA9ICZkdW1teTsNCiAgIG1hcmtTdGFja09iamVjdHNDb25zZXJ2YXRp dmVseShzdGFja1BvaW50ZXIsIHN0YWNrQmFzZSk7DQogfQ0KKyNlbmRpZg0KIA0KIHR5cGVkZWYg dW5zaWduZWQgbG9uZyB1c3dvcmRfdDsgLy8gd29yZCBzaXplLCBhc3N1bWVkIHRvIGJlIGVpdGhl ciAzMiBvciA2NCBiaXQNCiANCisjaWYgV0lOMzINCitzdGF0aWMgdm9pZCBHZXRUaHJlYWRTdGFj a0luZm8oSEFORExFIGhUaHJlYWQsIHZvaWQgKipzdGFja0Jhc2UsIHZvaWQgKipjdXJQb3MpDQor ew0KKyAgICBDT05URVhUIGNvbnRleHQ7DQorICAgIExEVF9FTlRSWSBkZXNjOw0KKyAgICB2b2lk ICpiYXNlOw0KKyAgICBEV09SRCBzaXplLCByZWFkOw0KKyAgICBOVF9USUIgdGliOw0KKw0KKyAg ICBjb250ZXh0LkNvbnRleHRGbGFncyA9IENPTlRFWFRfRlVMTDsNCisgICAgR2V0VGhyZWFkQ29u dGV4dChoVGhyZWFkLCAmY29udGV4dCk7DQorICAgIEdldFRocmVhZFNlbGVjdG9yRW50cnkoaFRo cmVhZCwgY29udGV4dC5TZWdGcywgJmRlc2MpOw0KKw0KKyAgICBiYXNlID0gKHZvaWQqKSAoZGVz Yy5CYXNlTG93IHwNCisgICAgICAgIGRlc2MuSGlnaFdvcmQuQnl0ZXMuQmFzZU1pZCA8PCAxNiB8 DQorICAgICAgICBkZXNjLkhpZ2hXb3JkLkJ5dGVzLkJhc2VIaSA8PCAyNCk7DQorICAgIHNpemUg PSBkZXNjLkxpbWl0TG93IHwgZGVzYy5IaWdoV29yZC5CaXRzLkxpbWl0SGk7DQorICAgIGlmIChk ZXNjLkhpZ2hXb3JkLkJpdHMuR3JhbnVsYXJpdHkpDQorICAgICAgICBzaXplICo9IDQwOTY7DQor ICAgIGVsc2UNCisgICAgICAgIHNpemUrKzsNCisNCisgICAgUmVhZFByb2Nlc3NNZW1vcnkoR2V0 Q3VycmVudFByb2Nlc3MoKSwgYmFzZSwgJnRpYiwgbWluKHNpemUsIHNpemVvZih0aWIpKSwgJnJl YWQpOw0KKyAgICAqc3RhY2tCYXNlID0gKHZvaWQqKXRpYi5TdGFja0Jhc2U7DQorICAgICpjdXJQ b3MgPSAodm9pZCopY29udGV4dC5Fc3A7DQorfQ0KKyNlbmRpZg0KKw0KIHZvaWQgQ29sbGVjdG9y OjptYXJrT3RoZXJUaHJlYWRDb25zZXJ2YXRpdmVseShUaHJlYWQgKnRocmVhZCkNCiB7DQorI2lm IFdJTjMyDQorICB2b2lkICogc3RhY2tCYXNlOw0KKyAgdm9pZCAqIHN0YWNrQ3VyUG9zOw0KKyAg YXNzZXJ0KHRocmVhZC0+dGhyZWFkSWQgIT0gR2V0Q3VycmVudFRocmVhZElkKCkpOw0KKyAgYXNz ZXJ0KHRocmVhZC0+dGhyZWFkSGFuZGxlICE9IEdldEN1cnJlbnRUaHJlYWQoKSk7DQorICBTdXNw ZW5kVGhyZWFkKHRocmVhZC0+dGhyZWFkSGFuZGxlKTsNCisNCisgIEdldFRocmVhZFN0YWNrSW5m byh0aHJlYWQtPnRocmVhZEhhbmRsZSwgJnN0YWNrQmFzZSwgJnN0YWNrQ3VyUG9zKTsNCisgIG1h cmtTdGFja09iamVjdHNDb25zZXJ2YXRpdmVseShzdGFja0Jhc2UsIHN0YWNrQ3VyUG9zKTsNCisN CisgIFJlc3VtZVRocmVhZCh0aHJlYWQtPnRocmVhZEhhbmRsZSk7DQorI2Vsc2UNCiAgIHRocmVh ZF9zdXNwZW5kKHRocmVhZC0+bWFjaFRocmVhZCk7DQogDQogI2lmIGRlZmluZWQoX19pMzg2X18p DQpAQCAtMzIxLDE4ICs0MjMsMzEgQEANCiAjZW5kaWYNCiANCiAgIHRocmVhZF9yZXN1bWUodGhy ZWFkLT5tYWNoVGhyZWFkKTsNCisjZW5kaWYNCiB9DQogDQorI2lmIFdJTjMyDQordm9pZCBDb2xs ZWN0b3I6Om1hcmtTdGFja09iamVjdHNDb25zZXJ2YXRpdmVseSgpDQorew0KKyAgbWFya0N1cnJl bnRUaHJlYWRDb25zZXJ2YXRpdmVseSgpOw0KKyAgRFdPUkQgdGlkID0gR2V0Q3VycmVudFRocmVh ZElkKCk7DQorICBmb3IgKFRocmVhZCAqdGhyZWFkID0gcmVnaXN0ZXJlZFRocmVhZHM7IHRocmVh ZCAhPSBOVUxMOyB0aHJlYWQgPSB0aHJlYWQtPm5leHQpIHsNCisgICAgaWYgKHRocmVhZC0+dGhy ZWFkSWQgIT0gdGlkKSB7DQorICAgICAgbWFya090aGVyVGhyZWFkQ29uc2VydmF0aXZlbHkodGhy ZWFkKTsNCisgICAgfQ0KKyAgfQ0KK30NCisjZWxzZQ0KIHZvaWQgQ29sbGVjdG9yOjptYXJrU3Rh Y2tPYmplY3RzQ29uc2VydmF0aXZlbHkoKQ0KIHsNCiAgIG1hcmtDdXJyZW50VGhyZWFkQ29uc2Vy dmF0aXZlbHkoKTsNCi0NCiAgIGZvciAoVGhyZWFkICp0aHJlYWQgPSByZWdpc3RlcmVkVGhyZWFk czsgdGhyZWFkICE9IE5VTEw7IHRocmVhZCA9IHRocmVhZC0+bmV4dCkgew0KICAgICBpZiAodGhy ZWFkLT5wb3NpeFRocmVhZCAhPSBwdGhyZWFkX3NlbGYoKSkgew0KICAgICAgIG1hcmtPdGhlclRo cmVhZENvbnNlcnZhdGl2ZWx5KHRocmVhZCk7DQogICAgIH0NCiAgIH0NCiB9DQorI2VuZGlmDQog DQogdm9pZCBDb2xsZWN0b3I6Om1hcmtQcm90ZWN0ZWRPYmplY3RzKCkNCiB7DQo=