<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167953] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167953">167953</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-04-29 13:28:37 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>For DARWIN platforms, use system temporary directory for DataLog output
https://bugs.webkit.org/show_bug.cgi?id=132346
Reviewed by Geoffrey Garen.
Added code to call confstr() to access the process's temporary directory to use that
location instead of /tmp/. Put the code behind #ifdef DATA_LOG_TO_DARWIN_TEMP_DIR.
* wtf/DataLog.cpp:
(WTF::initializeLogFileOnce):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfDataLogcpp">trunk/Source/WTF/wtf/DataLog.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (167952 => 167953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-04-29 20:25:32 UTC (rev 167952)
+++ trunk/Source/WTF/ChangeLog 2014-04-29 20:28:37 UTC (rev 167953)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-29 Michael Saboff <msaboff@apple.com>
+
+ For DARWIN platforms, use system temporary directory for DataLog output
+ https://bugs.webkit.org/show_bug.cgi?id=132346
+
+ Reviewed by Geoffrey Garen.
+
+ Added code to call confstr() to access the process's temporary directory to use that
+ location instead of /tmp/. Put the code behind #ifdef DATA_LOG_TO_DARWIN_TEMP_DIR.
+
+ * wtf/DataLog.cpp:
+ (WTF::initializeLogFileOnce):
+
</ins><span class="cx"> 2014-04-25 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Figure out how many cores are available for realsies.
</span></span></pre></div>
<a id="trunkSourceWTFwtfDataLogcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DataLog.cpp (167952 => 167953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DataLog.cpp 2014-04-29 20:25:32 UTC (rev 167952)
+++ trunk/Source/WTF/wtf/DataLog.cpp 2014-04-29 20:28:37 UTC (rev 167953)
</span><span class="lines">@@ -26,11 +26,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DataLog.h"
</span><span class="cx"> #include <stdarg.h>
</span><ins>+#include <string.h>
</ins><span class="cx"> #include <wtf/FilePrintStream.h>
</span><span class="cx"> #include <wtf/WTFThreadData.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><del>-#if OS(UNIX)
</del><ins>+#if OS(UNIX) || OS(DARWIN)
</ins><span class="cx"> #include <unistd.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -42,9 +43,12 @@
</span><span class="cx">
</span><span class="cx"> #define DATA_LOG_TO_FILE 0
</span><span class="cx">
</span><del>-// Uncomment to force logging to the given file regardless of what the environment variable says. Note that
-// we will append ".<pid>.txt" where <pid> is the PID.
</del><ins>+// Set to 1 to use the temp directory from confstr instead of hardcoded directory.
+// The last component of DATA_LOG_FILENAME will still be used.
+#define DATA_LOG_TO_DARWIN_TEMP_DIR 0
</ins><span class="cx">
</span><ins>+// Uncomment to force logging to the given file regardless of what the environment variable says.
+// Note that we will append ".<pid>.txt" where <pid> is the PID.
</ins><span class="cx"> // This path won't work on Windows, make sure to change to something like C:\\Users\\<more path>\\log.txt.
</span><span class="cx"> #define DATA_LOG_FILENAME "/tmp/WTFLog"
</span><span class="cx">
</span><span class="lines">@@ -61,23 +65,55 @@
</span><span class="cx"> static void initializeLogFileOnce()
</span><span class="cx"> {
</span><span class="cx"> #if DATA_LOG_TO_FILE
</span><del>-#ifdef DATA_LOG_FILENAME
</del><ins>+ const long maxPathLength = 1024;
+
+ char filenameSuffix[maxPathLength + 1];
+
+#if PLATFORM(WIN)
+ _snprintf(filenameSuffix, sizeof(filenameSuffix), ".%d.txt", GetCurrentProcessId());
+#else
+ snprintf(filenameSuffix, sizeof(filenameSuffix), ".%d.txt", getpid());
+#endif
+
+#if DATA_LOG_TO_DARWIN_TEMP_DIR
+ char filenameBuffer[maxPathLength + 1];
+ unsigned suffixLength = strlen(filenameSuffix);
+
+#if defined(DATA_LOG_FILENAME)
+ char* logBasename = strrchr(DATA_LOG_FILENAME, '/');
+ if (!logBasename)
+ logBasename = (char*)DATA_LOG_FILENAME;
+#else
+ const char* logBasename = "WTFLog";
+#endif
+
+ const char* filename = 0;
+
+ size_t lastComponentLength = strlen(logBasename) + suffixLength;
+ size_t dirnameLength = confstr(_CS_DARWIN_USER_TEMP_DIR, filenameBuffer, 1024);
+ if ((dirnameLength + lastComponentLength + suffixLength) < maxPathLength) {
+ strncat(filenameBuffer, logBasename, maxPathLength - dirnameLength);
+ filename = filenameBuffer;
+ }
+#elif defined(DATA_LOG_FILENAME)
</ins><span class="cx"> const char* filename = DATA_LOG_FILENAME;
</span><span class="cx"> #else
</span><span class="cx"> const char* filename = getenv("WTF_DATA_LOG_FILENAME");
</span><span class="cx"> #endif
</span><del>- char actualFilename[1024];
</del><ins>+ char actualFilename[maxPathLength + 1];
</ins><span class="cx">
</span><ins>+ if (filename) {
</ins><span class="cx"> #if PLATFORM(WIN)
</span><del>- _snprintf(actualFilename, sizeof(actualFilename), "%s.%d.txt", filename, GetCurrentProcessId());
</del><ins>+ _snprintf(actualFilename, sizeof(actualFilename), "%s%s", filename, filenameSuffix);
</ins><span class="cx"> #else
</span><del>- snprintf(actualFilename, sizeof(actualFilename), "%s.%d.txt", filename, getpid());
</del><ins>+ snprintf(actualFilename, sizeof(actualFilename), "%s%s", filename, filenameSuffix);
</ins><span class="cx"> #endif
</span><del>-
- if (filename) {
</del><ins>+
</ins><span class="cx"> file = FilePrintStream::open(actualFilename, "w").release();
</span><del>- if (!file)
- fprintf(stderr, "Warning: Could not open log file %s for writing.\n", actualFilename);
</del><ins>+ if (file)
+ WTFLogAlways("*** DataLog output to \"%s\" ***\n", actualFilename);
+ else
+ WTFLogAlways("Warning: Could not open DataLog file %s for writing.\n", actualFilename);
</ins><span class="cx"> }
</span><span class="cx"> #endif // DATA_LOG_TO_FILE
</span><span class="cx"> if (!file) {
</span></span></pre>
</div>
</div>
</body>
</html>