Changeset 188887 in webkit

Timestamp:

Aug 24, 2015, 2:51:26 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Add support for setting JSC options from a file.
​https://bugs.webkit.org/show_bug.cgi?id=148394

Reviewed by Saam Barati.

This is needed for environments where the JSC executable does not have access to
environmental variables. This is only needed for debugging, and is currently
guarded under a #define USE_OPTIONS_FILE in Options.cpp, and is disabled by
default.

Also fixed Options::setOptions() to be allow for whitespace that is not a single
' '. This makes setOptions() much more flexible and friendlier to use for loading
options in general.

For example, this current use case of loading options from a file may have '\n's
in the character stream, and this feature is easier to implement if setOptions()
just support more than 1 whitespace char between options, and recognize whitespace
characters other than ' '.

• runtime/Options.cpp:

(JSC::parse):
(JSC::Options::initialize):
(JSC::Options::setOptions):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Options.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-24  Mark Lam  <mark.lam@apple.com>
+
+        Add support for setting JSC options from a file.
+        https://bugs.webkit.org/show_bug.cgi?id=148394
+
+        Reviewed by Saam Barati.
+
+        This is needed for environments where the JSC executable does not have access to
+        environmental variables.  This is only needed for debugging, and is currently
+        guarded under a #define USE_OPTIONS_FILE in Options.cpp, and is disabled by
+        default.
+
+        Also fixed Options::setOptions() to be allow for whitespace that is not a single
+        ' '.  This makes setOptions() much more flexible and friendlier to use for loading
+        options in general.
+
+        For example, this current use case of loading options from a file may have '\n's
+        in the character stream, and this feature is easier to implement if setOptions()
+        just support more than 1 whitespace char between options, and recognize whitespace
+        characters other than ' '.
+
+        * runtime/Options.cpp:
+        (JSC::parse):
+        (JSC::Options::initialize):
+        (JSC::Options::setOptions):
+
 2015-08-24  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -34 +34 @@
 #include <stdlib.h>
 #include <string.h>
+#include <wtf/ASCIICType.h>
 #include <wtf/DataLog.h>
 #include <wtf/NumberOfCores.h>
@@ -48 +49 @@
 #include "MacroAssemblerX86.h"
 #endif
+
+#define USE_OPTIONS_FILE 0
+#define OPTIONS_FILENAME "/tmp/jsc.options"
 
 namespace JSC {
@@ -362 +366 @@
     
             recomputeDependentOptions();
+
+#if USE(OPTIONS_FILE)
+            {
+                const char* filename = OPTIONS_FILENAME;
+                FILE* optionsFile = fopen(filename, "r");
+                if (!optionsFile) {
+                    dataLogF("Failed to open file %s. Did you add the file-read-data entitlement to WebProcess.sb?\n", filename);
+                    return;
+                }
+                
+                StringBuilder builder;
+                char* line;
+                char buffer[BUFSIZ];
+                while ((line = fgets(buffer, sizeof(buffer), optionsFile)))
+                    builder.append(buffer);
+                
+                const char* optionsStr = builder.toString().utf8().data();
+                dataLogF("Setting options: %s\n", optionsStr);
+                setOptions(optionsStr);
+                
+                int result = fclose(optionsFile);
+                if (result)
+                    dataLogF("Failed to close file %s: %s\n", filename, strerror(errno));
+            }
+#endif
 
             // Do range checks where needed and make corrections to the options:
@@ -411 +440 @@
 
     while (p < end) {
+        // Skip white space.
+        while (p < end && isASCIISpace(*p))
+            p++;
+        if (p == end)
+            break;
+
         char* optionStart = p;
         p = strstr(p, "=");
@@ -431 +466 @@
         }
 
-        p = strstr(p, " ");
+        // Find next white space.
+        while (p < end && !isASCIISpace(*p))
+            p++;
         if (!p)
             p = end; // No more " " separator. Hence, this is the last arg.