| Index: src/d8.h
|
| diff --git a/src/d8.h b/src/d8.h
|
| index 840ca1e8fd4899c190342ffdb361d3bcd33a3de4..40cc83b055ea9a7e1e11d8e304d06b20ccb08735 100644
|
| --- a/src/d8.h
|
| +++ b/src/d8.h
|
| @@ -29,22 +29,22 @@
|
| #define V8_D8_H_
|
|
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| #include "v8.h"
|
| #include "allocation.h"
|
| #include "hashmap.h"
|
| #else
|
| #include "../include/v8.h"
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
|
|
| namespace v8 {
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| namespace i = v8::internal;
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
|
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| // A single counter in a counter collection.
|
| class Counter {
|
| public:
|
| @@ -117,17 +117,17 @@ class CounterMap {
|
| static bool Match(void* key1, void* key2);
|
| i::HashMap hash_map_;
|
| };
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
|
|
|
|
| class SourceGroup {
|
| public:
|
| SourceGroup() :
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| next_semaphore_(v8::internal::OS::CreateSemaphore(0)),
|
| done_semaphore_(v8::internal::OS::CreateSemaphore(0)),
|
| thread_(NULL),
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
| argv_(NULL),
|
| begin_offset_(0),
|
| end_offset_(0) { }
|
| @@ -141,7 +141,7 @@ class SourceGroup {
|
|
|
| void Execute();
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| void StartExecuteInThread();
|
| void WaitForThread();
|
|
|
| @@ -165,7 +165,7 @@ class SourceGroup {
|
| i::Semaphore* next_semaphore_;
|
| i::Semaphore* done_semaphore_;
|
| i::Thread* thread_;
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
|
|
| void ExitShell(int exit_code);
|
| Handle<String> ReadFile(const char* name);
|
| @@ -179,11 +179,11 @@ class SourceGroup {
|
| class ShellOptions {
|
| public:
|
| ShellOptions() :
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| use_preemption(true),
|
| preemption_interval(10),
|
| parallel_files(NULL),
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
| script_executed(false),
|
| last_run(true),
|
| stress_opt(false),
|
| @@ -193,11 +193,11 @@ class ShellOptions {
|
| num_isolates(1),
|
| isolate_sources(NULL) { }
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| bool use_preemption;
|
| int preemption_interval;
|
| i::List< i::Vector<const char> >* parallel_files;
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
| bool script_executed;
|
| bool last_run;
|
| bool stress_opt;
|
| @@ -208,11 +208,11 @@ class ShellOptions {
|
| SourceGroup* isolate_sources;
|
| };
|
|
|
| -#ifdef USING_V8_SHARED
|
| +#ifdef V8_SHARED
|
| class Shell {
|
| #else
|
| class Shell : public i::AllStatic {
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
| public:
|
| static bool ExecuteString(Handle<String> source,
|
| Handle<Value> name,
|
| @@ -225,7 +225,7 @@ class Shell : public i::AllStatic {
|
| static int RunMain(int argc, char* argv[]);
|
| static int Main(int argc, char* argv[]);
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| static Handle<Array> GetCompletions(Handle<String> text,
|
| Handle<String> full);
|
| static void OnExit();
|
| @@ -236,7 +236,7 @@ class Shell : public i::AllStatic {
|
| size_t buckets);
|
| static void AddHistogramSample(void* histogram, int sample);
|
| static void MapCounters(const char* name);
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
|
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| static Handle<Object> DebugMessageDetails(Handle<String> message);
|
| @@ -300,15 +300,15 @@ class Shell : public i::AllStatic {
|
| static Handle<Value> RemoveDirectory(const Arguments& args);
|
|
|
| static void AddOSMethods(Handle<ObjectTemplate> os_template);
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| static const char* kHistoryFileName;
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
| static const char* kPrompt;
|
| static ShellOptions options;
|
|
|
| private:
|
| static Persistent<Context> evaluation_context_;
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| static Persistent<Context> utility_context_;
|
| static CounterMap* counter_map_;
|
| // We statically allocate a set of local counters to be used if we
|
| @@ -320,7 +320,7 @@ class Shell : public i::AllStatic {
|
|
|
| static Counter* GetCounter(const char* name, bool is_histogram);
|
| static void InstallUtilityScript();
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
| static void Initialize();
|
| static void RunShell();
|
| static bool SetOptions(int argc, char* argv[]);
|
| @@ -332,7 +332,7 @@ class Shell : public i::AllStatic {
|
| };
|
|
|
|
|
| -#ifndef USING_V8_SHARED
|
| +#ifndef V8_SHARED
|
| class LineEditor {
|
| public:
|
| enum Type { DUMB = 0, READLINE = 1 };
|
| @@ -352,7 +352,7 @@ class LineEditor {
|
| LineEditor* next_;
|
| static LineEditor* first_;
|
| };
|
| -#endif // USING_V8_SHARED
|
| +#endif // V8_SHARED
|
|
|
|
|
| } // namespace v8
|
|
|