132346 2014-04-29 11:22:09 -0700 For DARWIN platforms, use system temporary directory for DataLog output 2014-04-29 13:29:18 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff benjamin cmarcelo commit-queue oldest_to_newest 1005034 0 msaboff 2014-04-29 11:22:09 -0700 Provide means to use the system defined temporary directory. 1005037 1 230393 msaboff 2014-04-29 11:23:08 -0700 Created attachment 230393 Work in Progress 1005043 2 230395 msaboff 2014-04-29 11:54:44 -0700 Created attachment 230395 Patch 1005066 3 230395 ggaren 2014-04-29 12:46:53 -0700 Comment on attachment 230395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230395&action=review > Source/WTF/ChangeLog:8 > + Added code to call confstr() to access the process' temporary directory to use that "process's" -- there's only one. > Source/WTF/wtf/DataLog.cpp:84 > + size_t lastComponentLength = strlen(logBasename) + 10; > + size_t dirnameLength = confstr(_CS_DARWIN_USER_TEMP_DIR, filenameBuffer, 1024); > + if ((dirnameLength + lastComponentLength + 10) < maxPathLength) { > + strncat(filenameBuffer, logBasename, maxPathLength - dirnameLength); > + filename = filenameBuffer; > + } Why + 10? > Source/WTF/wtf/DataLog.cpp:106 > if (!file) > - fprintf(stderr, "Warning: Could not open log file %s for writing.\n", actualFilename); > + WTFLogAlways("Warning: Could not open log file %s for writing.\n", actualFilename); > +#if DATA_LOG_TO_DARWIN_TEMP_DIR > + else > + WTFLogAlways("*** Logging to \"%s\" ***\n", actualFilename); > +#endif Better to say "if (file) / else" rather than "if (!file) / else". 1005074 4 230395 msaboff 2014-04-29 12:59:45 -0700 Comment on attachment 230395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230395&action=review >> Source/WTF/ChangeLog:8 >> + Added code to call confstr() to access the process' temporary directory to use that > > "process's" -- there's only one. "process'" is a valid possessive form of process. >> Source/WTF/wtf/DataLog.cpp:84 >> + } > > Why + 10? For the .<pid>.txt, with an up to 5 digit pid, added below. I'll recode without the constant. >> Source/WTF/wtf/DataLog.cpp:106 >> +#endif > > Better to say "if (file) / else" rather than "if (!file) / else". I'll make the change. 1005086 5 msaboff 2014-04-29 13:29:18 -0700 Committed r167953: <http://trac.webkit.org/changeset/167953> 230393 2014-04-29 11:23:08 -0700 2014-04-29 11:54:44 -0700 Work in Progress datalog-to-confstr-wip3.patch text/plain 2895 msaboff SW5kZXg6IFNvdXJjZS9XVEYvd3RmL0RhdGFMb2cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X VEYvd3RmL0RhdGFMb2cuY3BwCShyZXZpc2lvbiAxNjc5MzYpCisrKyBTb3VyY2UvV1RGL3d0Zi9E YXRhTG9nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMTEgKzI2LDEyIEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiRGF0YUxvZy5oIgogI2luY2x1ZGUgPHN0ZGFyZy5oPgorI2lu Y2x1ZGUgPHN0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi9GaWxlUHJpbnRTdHJlYW0uaD4KICNpbmNs dWRlIDx3dGYvV1RGVGhyZWFkRGF0YS5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KIAot I2lmIE9TKFVOSVgpCisjaWYgT1MoVU5JWCkgfHwgT1MoREFSV0lOKQogI2luY2x1ZGUgPHVuaXN0 ZC5oPgogI2VuZGlmCiAKQEAgLTQwLDExICs0MSwxNCBAQAogI2VuZGlmCiAjZW5kaWYKIAotI2Rl ZmluZSBEQVRBX0xPR19UT19GSUxFIDAKKyNkZWZpbmUgREFUQV9MT0dfVE9fRklMRSAxCiAKLS8v IFVuY29tbWVudCB0byBmb3JjZSBsb2dnaW5nIHRvIHRoZSBnaXZlbiBmaWxlIHJlZ2FyZGxlc3Mg b2Ygd2hhdCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGUgc2F5cy4gTm90ZSB0aGF0Ci0vLyB3ZSB3 aWxsIGFwcGVuZCAiLjxwaWQ+LnR4dCIgd2hlcmUgPHBpZD4gaXMgdGhlIFBJRC4KKy8vIFNldCB0 byAxIHRvIHVzZSB0aGUgdGVtcCBkaXJlY3RvcnkgZnJvbSBjb25mc3RyIGluc3RlYWQgb2YgaGFy ZGNvZGVkIGRpcmVjdG9yeS4KKy8vIFRoZSBsYXN0IGNvbXBvbmVudCBvZiBEQVRBX0xPR19GSUxF TkFNRSB3aWxsIHN0aWxsIGJlIHVzZWQuCisjZGVmaW5lIERBVEFfTE9HX1RPX0RBUldJTl9URU1Q X0RJUiAxCiAKKy8vIFVuY29tbWVudCB0byBmb3JjZSBsb2dnaW5nIHRvIHRoZSBnaXZlbiBmaWxl IHJlZ2FyZGxlc3Mgb2Ygd2hhdCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGUgc2F5cy4KKy8vIE5v dGUgdGhhdCB3ZSB3aWxsIGFwcGVuZCAiLjxwaWQ+LnR4dCIgd2hlcmUgPHBpZD4gaXMgdGhlIFBJ RC4KIC8vIFRoaXMgcGF0aCB3b24ndCB3b3JrIG9uIFdpbmRvd3MsIG1ha2Ugc3VyZSB0byBjaGFu Z2UgdG8gc29tZXRoaW5nIGxpa2UgQzpcXFVzZXJzXFw8bW9yZSBwYXRoPlxcbG9nLnR4dC4KICNk ZWZpbmUgREFUQV9MT0dfRklMRU5BTUUgIi90bXAvV1RGTG9nIgogCkBAIC02MSwxMiArNjUsMzAg QEAgc3RhdGljIHVpbnQ2NF90IGZpbGVEYXRhWyhzaXplb2YoRmlsZVByaQogc3RhdGljIHZvaWQg aW5pdGlhbGl6ZUxvZ0ZpbGVPbmNlKCkKIHsKICNpZiBEQVRBX0xPR19UT19GSUxFCi0jaWZkZWYg REFUQV9MT0dfRklMRU5BTUUKKyAgICBjb25zdCBsb25nIG1heFBhdGhMZW5ndGggPSAxMDI0Owor CisjaWYgREFUQV9MT0dfVE9fREFSV0lOX1RFTVBfRElSCisgICAgY2hhciBmaWxlbmFtZUJ1ZmZl clttYXhQYXRoTGVuZ3RoICsgMV07CisKKyAgICBjaGFyKiBsb2dCYXNlbmFtZSA9IHN0cnJjaHIo REFUQV9MT0dfRklMRU5BTUUsICcvJyk7CisgICAgaWYgKCFsb2dCYXNlbmFtZSkKKyAgICAgICAg bG9nQmFzZW5hbWUgPSAoY2hhciopREFUQV9MT0dfRklMRU5BTUU7CisKKyAgICBjb25zdCBjaGFy KiBmaWxlbmFtZSA9IDA7CisKKyAgICBzaXplX3QgbGFzdENvbXBvbmVudExlbmd0aCA9IHN0cmxl bihsb2dCYXNlbmFtZSkgKyAxMDsKKyAgICBzaXplX3QgZGlybmFtZUxlbmd0aCA9IGNvbmZzdHIo X0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCBmaWxlbmFtZUJ1ZmZlciwgMTAyNCk7CisgICAgaWYg KChkaXJuYW1lTGVuZ3RoICsgbGFzdENvbXBvbmVudExlbmd0aCArIDEwKSA8IG1heFBhdGhMZW5n dGgpIHsKKyAgICAgICAgc3RybmNhdChmaWxlbmFtZUJ1ZmZlciwgbG9nQmFzZW5hbWUsIG1heFBh dGhMZW5ndGggLSBkaXJuYW1lTGVuZ3RoKTsKKyAgICAgICAgZmlsZW5hbWUgPSBmaWxlbmFtZUJ1 ZmZlcjsKKyAgICB9CisKKyNlbGlmIERBVEFfTE9HX0ZJTEVOQU1FCiAgICAgY29uc3QgY2hhciog ZmlsZW5hbWUgPSBEQVRBX0xPR19GSUxFTkFNRTsKICNlbHNlCiAgICAgY29uc3QgY2hhciogZmls ZW5hbWUgPSBnZXRlbnYoIldURl9EQVRBX0xPR19GSUxFTkFNRSIpOwogI2VuZGlmCi0gICAgY2hh ciBhY3R1YWxGaWxlbmFtZVsxMDI0XTsKKyAgICBjaGFyIGFjdHVhbEZpbGVuYW1lW21heFBhdGhM ZW5ndGggKyAxXTsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBfc25wcmludGYoYWN0dWFsRmls ZW5hbWUsIHNpemVvZihhY3R1YWxGaWxlbmFtZSksICIlcy4lZC50eHQiLCBmaWxlbmFtZSwgR2V0 Q3VycmVudFByb2Nlc3NJZCgpKTsKQEAgLTc3LDcgKzk5LDExIEBAIHN0YXRpYyB2b2lkIGluaXRp YWxpemVMb2dGaWxlT25jZSgpCiAgICAgaWYgKGZpbGVuYW1lKSB7CiAgICAgICAgIGZpbGUgPSBG aWxlUHJpbnRTdHJlYW06Om9wZW4oYWN0dWFsRmlsZW5hbWUsICJ3IikucmVsZWFzZSgpOwogICAg ICAgICBpZiAoIWZpbGUpCi0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIldhcm5pbmc6IENv dWxkIG5vdCBvcGVuIGxvZyBmaWxlICVzIGZvciB3cml0aW5nLlxuIiwgYWN0dWFsRmlsZW5hbWUp OworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJXYXJuaW5nOiBDb3VsZCBub3Qgb3BlbiBsb2cg ZmlsZSAlcyBmb3Igd3JpdGluZy5cbiIsIGFjdHVhbEZpbGVuYW1lKTsKKyNpZiBEQVRBX0xPR19U T19EQVJXSU5fVEVNUF9ESVIKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgV1RGTG9nQWx3YXlz KCJMb2dnaW5nIHRvIFwiJXNcIlxuIiwgYWN0dWFsRmlsZW5hbWUpOworI2VuZGlmCiAgICAgfQog I2VuZGlmIC8vIERBVEFfTE9HX1RPX0ZJTEUKICAgICBpZiAoIWZpbGUpIHsK 230395 2014-04-29 11:54:44 -0700 2014-04-29 12:59:45 -0700 Patch 132346.patch text/plain 3650 msaboff SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNjc5NDgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTI5ICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIEZvciBEQVJXSU4gcGxhdGZvcm1zLCB1c2Ugc3lz dGVtIHRlbXBvcmFyeSBkaXJlY3RvcnkgZm9yIERhdGFMb2cgb3V0cHV0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzIzNDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBjb2RlIHRvIGNhbGwgY29u ZnN0cigpIHRvIGFjY2VzcyB0aGUgcHJvY2VzcycgdGVtcG9yYXJ5IGRpcmVjdG9yeSB0byB1c2Ug dGhhdAorICAgICAgICBsb2NhdGlvbiBpbnN0ZWFkIG9mIC90bXAvLiAgUHV0IHRoZSBjb2RlIGJl aGluZCAjaWZkZWYgREFUQV9MT0dfVE9fREFSV0lOX1RFTVBfRElSLgorCisgICAgICAgICogd3Rm L0RhdGFMb2cuY3BwOgorICAgICAgICAoV1RGOjppbml0aWFsaXplTG9nRmlsZU9uY2UpOgorCiAy MDE0LTA0LTI1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgRmln dXJlIG91dCBob3cgbWFueSBjb3JlcyBhcmUgYXZhaWxhYmxlIGZvciByZWFsc2llcy4KSW5kZXg6 IFNvdXJjZS9XVEYvd3RmL0RhdGFMb2cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3Rm L0RhdGFMb2cuY3BwCShyZXZpc2lvbiAxNjc5MzYpCisrKyBTb3VyY2UvV1RGL3d0Zi9EYXRhTG9n LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMTEgKzI2LDEyIEBACiAjaW5jbHVkZSAiY29uZmln LmgiCiAjaW5jbHVkZSAiRGF0YUxvZy5oIgogI2luY2x1ZGUgPHN0ZGFyZy5oPgorI2luY2x1ZGUg PHN0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi9GaWxlUHJpbnRTdHJlYW0uaD4KICNpbmNsdWRlIDx3 dGYvV1RGVGhyZWFkRGF0YS5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KIAotI2lmIE9T KFVOSVgpCisjaWYgT1MoVU5JWCkgfHwgT1MoREFSV0lOKQogI2luY2x1ZGUgPHVuaXN0ZC5oPgog I2VuZGlmCiAKQEAgLTQyLDkgKzQzLDEyIEBACiAKICNkZWZpbmUgREFUQV9MT0dfVE9fRklMRSAw CiAKLS8vIFVuY29tbWVudCB0byBmb3JjZSBsb2dnaW5nIHRvIHRoZSBnaXZlbiBmaWxlIHJlZ2Fy ZGxlc3Mgb2Ygd2hhdCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGUgc2F5cy4gTm90ZSB0aGF0Ci0v LyB3ZSB3aWxsIGFwcGVuZCAiLjxwaWQ+LnR4dCIgd2hlcmUgPHBpZD4gaXMgdGhlIFBJRC4KKy8v IFNldCB0byAxIHRvIHVzZSB0aGUgdGVtcCBkaXJlY3RvcnkgZnJvbSBjb25mc3RyIGluc3RlYWQg b2YgaGFyZGNvZGVkIGRpcmVjdG9yeS4KKy8vIFRoZSBsYXN0IGNvbXBvbmVudCBvZiBEQVRBX0xP R19GSUxFTkFNRSB3aWxsIHN0aWxsIGJlIHVzZWQuCisjZGVmaW5lIERBVEFfTE9HX1RPX0RBUldJ Tl9URU1QX0RJUiAwCiAKKy8vIFVuY29tbWVudCB0byBmb3JjZSBsb2dnaW5nIHRvIHRoZSBnaXZl biBmaWxlIHJlZ2FyZGxlc3Mgb2Ygd2hhdCB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGUgc2F5cy4K Ky8vIE5vdGUgdGhhdCB3ZSB3aWxsIGFwcGVuZCAiLjxwaWQ+LnR4dCIgd2hlcmUgPHBpZD4gaXMg dGhlIFBJRC4KIC8vIFRoaXMgcGF0aCB3b24ndCB3b3JrIG9uIFdpbmRvd3MsIG1ha2Ugc3VyZSB0 byBjaGFuZ2UgdG8gc29tZXRoaW5nIGxpa2UgQzpcXFVzZXJzXFw8bW9yZSBwYXRoPlxcbG9nLnR4 dC4KICNkZWZpbmUgREFUQV9MT0dfRklMRU5BTUUgIi90bXAvV1RGTG9nIgogCkBAIC02MSwxMiAr NjUsMzAgQEAgc3RhdGljIHVpbnQ2NF90IGZpbGVEYXRhWyhzaXplb2YoRmlsZVByaQogc3RhdGlj IHZvaWQgaW5pdGlhbGl6ZUxvZ0ZpbGVPbmNlKCkKIHsKICNpZiBEQVRBX0xPR19UT19GSUxFCi0j aWZkZWYgREFUQV9MT0dfRklMRU5BTUUKKyAgICBjb25zdCBsb25nIG1heFBhdGhMZW5ndGggPSAx MDI0OworCisjaWYgREFUQV9MT0dfVE9fREFSV0lOX1RFTVBfRElSCisgICAgY2hhciBmaWxlbmFt ZUJ1ZmZlclttYXhQYXRoTGVuZ3RoICsgMV07CisKKyAgICBjaGFyKiBsb2dCYXNlbmFtZSA9IHN0 cnJjaHIoREFUQV9MT0dfRklMRU5BTUUsICcvJyk7CisgICAgaWYgKCFsb2dCYXNlbmFtZSkKKyAg ICAgICAgbG9nQmFzZW5hbWUgPSAoY2hhciopREFUQV9MT0dfRklMRU5BTUU7CisKKyAgICBjb25z dCBjaGFyKiBmaWxlbmFtZSA9IDA7CisKKyAgICBzaXplX3QgbGFzdENvbXBvbmVudExlbmd0aCA9 IHN0cmxlbihsb2dCYXNlbmFtZSkgKyAxMDsKKyAgICBzaXplX3QgZGlybmFtZUxlbmd0aCA9IGNv bmZzdHIoX0NTX0RBUldJTl9VU0VSX1RFTVBfRElSLCBmaWxlbmFtZUJ1ZmZlciwgMTAyNCk7Cisg ICAgaWYgKChkaXJuYW1lTGVuZ3RoICsgbGFzdENvbXBvbmVudExlbmd0aCArIDEwKSA8IG1heFBh dGhMZW5ndGgpIHsKKyAgICAgICAgc3RybmNhdChmaWxlbmFtZUJ1ZmZlciwgbG9nQmFzZW5hbWUs IG1heFBhdGhMZW5ndGggLSBkaXJuYW1lTGVuZ3RoKTsKKyAgICAgICAgZmlsZW5hbWUgPSBmaWxl bmFtZUJ1ZmZlcjsKKyAgICB9CisKKyNlbGlmIERBVEFfTE9HX0ZJTEVOQU1FCiAgICAgY29uc3Qg Y2hhciogZmlsZW5hbWUgPSBEQVRBX0xPR19GSUxFTkFNRTsKICNlbHNlCiAgICAgY29uc3QgY2hh ciogZmlsZW5hbWUgPSBnZXRlbnYoIldURl9EQVRBX0xPR19GSUxFTkFNRSIpOwogI2VuZGlmCi0g ICAgY2hhciBhY3R1YWxGaWxlbmFtZVsxMDI0XTsKKyAgICBjaGFyIGFjdHVhbEZpbGVuYW1lW21h eFBhdGhMZW5ndGggKyAxXTsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBfc25wcmludGYoYWN0 dWFsRmlsZW5hbWUsIHNpemVvZihhY3R1YWxGaWxlbmFtZSksICIlcy4lZC50eHQiLCBmaWxlbmFt ZSwgR2V0Q3VycmVudFByb2Nlc3NJZCgpKTsKQEAgLTc3LDcgKzk5LDExIEBAIHN0YXRpYyB2b2lk IGluaXRpYWxpemVMb2dGaWxlT25jZSgpCiAgICAgaWYgKGZpbGVuYW1lKSB7CiAgICAgICAgIGZp bGUgPSBGaWxlUHJpbnRTdHJlYW06Om9wZW4oYWN0dWFsRmlsZW5hbWUsICJ3IikucmVsZWFzZSgp OwogICAgICAgICBpZiAoIWZpbGUpCi0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIldhcm5p bmc6IENvdWxkIG5vdCBvcGVuIGxvZyBmaWxlICVzIGZvciB3cml0aW5nLlxuIiwgYWN0dWFsRmls ZW5hbWUpOworICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJXYXJuaW5nOiBDb3VsZCBub3Qgb3Bl biBsb2cgZmlsZSAlcyBmb3Igd3JpdGluZy5cbiIsIGFjdHVhbEZpbGVuYW1lKTsKKyNpZiBEQVRB X0xPR19UT19EQVJXSU5fVEVNUF9ESVIKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgV1RGTG9n QWx3YXlzKCIqKiogTG9nZ2luZyB0byBcIiVzXCIgKioqXG4iLCBhY3R1YWxGaWxlbmFtZSk7Cisj ZW5kaWYKICAgICB9CiAjZW5kaWYgLy8gREFUQV9MT0dfVE9fRklMRQogICAgIGlmICghZmlsZSkg ewo=