Revision: 22555
Author: [email protected]
Date: Wed Jul 23 11:31:33 2014 UTC
Log: Version 3.27.34.7 (merged r22223)
Remove a bunch of Isolate::UncheckedCurrent calls
[email protected]
BUG=
Review URL: https://codereview.chromium.org/412513003
http://code.google.com/p/v8/source/detail?r=22555
Modified:
/branches/3.27/include/v8.h
/branches/3.27/src/api.cc
/branches/3.27/src/counters.cc
/branches/3.27/src/counters.h
/branches/3.27/src/d8.cc
/branches/3.27/src/d8.h
/branches/3.27/src/version.cc
/branches/3.27/test/cctest/test-api.cc
=======================================
--- /branches/3.27/include/v8.h Wed Jun 18 14:15:57 2014 UTC
+++ /branches/3.27/include/v8.h Wed Jul 23 11:31:33 2014 UTC
@@ -4391,6 +4391,21 @@
*/
bool WillAutorunMicrotasks() const;
+ /**
+ * Enables the host application to provide a mechanism for recording
+ * statistics counters.
+ */
+ void SetCounterFunction(CounterLookupCallback);
+
+ /**
+ * Enables the host application to provide a mechanism for recording
+ * histograms. The CreateHistogram function returns a
+ * histogram which will later be passed to the AddHistogramSample
+ * function.
+ */
+ void SetCreateHistogramFunction(CreateHistogramCallback);
+ void SetAddHistogramSampleFunction(AddHistogramSampleCallback);
+
private:
template<class K, class V, class Traits> friend class PersistentValueMap;
@@ -4687,6 +4702,8 @@
/**
* Enables the host application to provide a mechanism for recording
* statistics counters.
+ *
+ * Deprecated, use Isolate::SetCounterFunction instead.
*/
static void SetCounterFunction(CounterLookupCallback);
@@ -4695,8 +4712,13 @@
* histograms. The CreateHistogram function returns a
* histogram which will later be passed to the AddHistogramSample
* function.
+ *
+ * Deprecated, use Isolate::SetCreateHistogramFunction instead.
+ * Isolate::SetAddHistogramSampleFunction instead.
*/
static void SetCreateHistogramFunction(CreateHistogramCallback);
+
+ /** Deprecated, use Isolate::SetAddHistogramSampleFunction instead. */
static void SetAddHistogramSampleFunction(AddHistogramSampleCallback);
/** Callback function for reporting failed access checks.*/
=======================================
--- /branches/3.27/src/api.cc Mon Jun 16 11:20:10 2014 UTC
+++ /branches/3.27/src/api.cc Wed Jul 23 11:31:33 2014 UTC
@@ -6705,6 +6705,30 @@
bool Isolate::WillAutorunMicrotasks() const {
return reinterpret_cast<const i::Isolate*>(this)->autorun_microtasks();
}
+
+
+void Isolate::SetCounterFunction(CounterLookupCallback callback) {
+ i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
+ isolate->stats_table()->SetCounterFunction(callback);
+ isolate->InitializeLoggingAndCounters();
+ isolate->counters()->ResetCounters();
+}
+
+
+void Isolate::SetCreateHistogramFunction(CreateHistogramCallback callback)
{
+ i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
+ isolate->stats_table()->SetCreateHistogramFunction(callback);
+ isolate->InitializeLoggingAndCounters();
+ isolate->counters()->ResetHistograms();
+}
+
+
+void Isolate::SetAddHistogramSampleFunction(
+ AddHistogramSampleCallback callback) {
+ reinterpret_cast<i::Isolate*>(this)
+ ->stats_table()
+ ->SetAddHistogramSampleFunction(callback);
+}
String::Utf8Value::Utf8Value(v8::Handle<v8::Value> obj)
=======================================
--- /branches/3.27/src/counters.cc Wed Jun 4 00:06:13 2014 UTC
+++ /branches/3.27/src/counters.cc Wed Jul 23 11:31:33 2014 UTC
@@ -107,6 +107,38 @@
CODE_AGE_LIST_COMPLETE(SC)
#undef SC
}
+
+
+void Counters::ResetCounters() {
+#define SC(name, caption) name##_.Reset();
+ STATS_COUNTER_LIST_1(SC)
+ STATS_COUNTER_LIST_2(SC)
+#undef SC
+
+#define SC(name) \
+ count_of_##name##_.Reset(); \
+ size_of_##name##_.Reset();
+ INSTANCE_TYPE_LIST(SC)
+#undef SC
+
+#define SC(name) \
+ count_of_CODE_TYPE_##name##_.Reset(); \
+ size_of_CODE_TYPE_##name##_.Reset();
+ CODE_KIND_LIST(SC)
+#undef SC
+
+#define SC(name) \
+ count_of_FIXED_ARRAY_##name##_.Reset(); \
+ size_of_FIXED_ARRAY_##name##_.Reset();
+ FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(SC)
+#undef SC
+
+#define SC(name) \
+ count_of_CODE_AGE_##name##_.Reset(); \
+ size_of_CODE_AGE_##name##_.Reset();
+ CODE_AGE_LIST_COMPLETE(SC)
+#undef SC
+}
void Counters::ResetHistograms() {
=======================================
--- /branches/3.27/src/counters.h Wed Jun 4 00:06:13 2014 UTC
+++ /branches/3.27/src/counters.h Wed Jul 23 11:31:33 2014 UTC
@@ -142,6 +142,9 @@
ASSERT(loc != NULL);
return loc;
}
+
+ // Reset the cached internal pointer.
+ void Reset() { lookup_done_ = false; }
protected:
// Returns the cached address of this counter location.
@@ -629,6 +632,7 @@
stats_counter_count
};
+ void ResetCounters();
void ResetHistograms();
private:
=======================================
--- /branches/3.27/src/d8.cc Tue Jun 10 10:57:45 2014 UTC
+++ /branches/3.27/src/d8.cc Wed Jul 23 11:31:33 2014 UTC
@@ -665,7 +665,7 @@
}
-void Shell::MapCounters(const char* name) {
+void Shell::MapCounters(v8::Isolate* isolate, const char* name) {
counters_file_ = i::OS::MemoryMappedFile::create(
name, sizeof(CounterCollection), &local_counters_);
void* memory = (counters_file_ == NULL) ?
@@ -675,9 +675,9 @@
Exit(1);
}
counters_ = static_cast<CounterCollection*>(memory);
- V8::SetCounterFunction(LookupCounter);
- V8::SetCreateHistogramFunction(CreateHistogram);
- V8::SetAddHistogramSampleFunction(AddHistogramSample);
+ isolate->SetCounterFunction(LookupCounter);
+ isolate->SetCreateHistogramFunction(CreateHistogram);
+ isolate->SetAddHistogramSampleFunction(AddHistogramSample);
}
@@ -887,7 +887,7 @@
Shell::counter_map_ = new CounterMap();
// Set up counters
if (i::StrLength(i::FLAG_map_counters) != 0)
- MapCounters(i::FLAG_map_counters);
+ MapCounters(isolate, i::FLAG_map_counters);
if (i::FLAG_dump_counters || i::FLAG_track_gc_object_stats) {
V8::SetCounterFunction(LookupCounter);
V8::SetCreateHistogramFunction(CreateHistogram);
=======================================
--- /branches/3.27/src/d8.h Tue Jun 10 10:57:45 2014 UTC
+++ /branches/3.27/src/d8.h Wed Jul 23 11:31:33 2014 UTC
@@ -265,7 +265,7 @@
int max,
size_t buckets);
static void AddHistogramSample(void* histogram, int sample);
- static void MapCounters(const char* name);
+ static void MapCounters(v8::Isolate* isolate, const char* name);
static Local<Object> DebugMessageDetails(Isolate* isolate,
Handle<String> message);
=======================================
--- /branches/3.27/src/version.cc Mon Jul 14 13:13:41 2014 UTC
+++ /branches/3.27/src/version.cc Wed Jul 23 11:31:33 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 27
#define BUILD_NUMBER 34
-#define PATCH_LEVEL 6
+#define PATCH_LEVEL 7
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.27/test/cctest/test-api.cc Mon Jun 16 11:20:10 2014 UTC
+++ /branches/3.27/test/cctest/test-api.cc Wed Jul 23 11:31:33 2014 UTC
@@ -19545,15 +19545,15 @@
break;
case SetCounterFunction:
- v8::V8::SetCounterFunction(NULL);
+ CcTest::isolate()->SetCounterFunction(NULL);
break;
case SetCreateHistogramFunction:
- v8::V8::SetCreateHistogramFunction(NULL);
+ CcTest::isolate()->SetCreateHistogramFunction(NULL);
break;
case SetAddHistogramSampleFunction:
- v8::V8::SetAddHistogramSampleFunction(NULL);
+ CcTest::isolate()->SetAddHistogramSampleFunction(NULL);
break;
}
isolate->Exit();
@@ -20904,6 +20904,7 @@
}
+#ifdef DEBUG
static int probes_counter = 0;
static int misses_counter = 0;
static int updates_counter = 0;
@@ -20933,11 +20934,10 @@
" fooify(a);"
" fooify(b);"
"}";
+#endif
static void StubCacheHelper(bool primary) {
- V8::SetCounterFunction(LookupCounter);
- USE(kMegamorphicTestProgram);
#ifdef DEBUG
i::FLAG_native_code_counters = true;
if (primary) {
@@ -20947,6 +20947,7 @@
}
i::FLAG_crankshaft = false;
LocalContext env;
+ env->GetIsolate()->SetCounterFunction(LookupCounter);
v8::HandleScope scope(env->GetIsolate());
int initial_probes = probes_counter;
int initial_misses = misses_counter;
@@ -20976,6 +20977,7 @@
}
+#ifdef DEBUG
static int cow_arrays_created_runtime = 0;
@@ -20985,13 +20987,14 @@
}
return NULL;
}
+#endif
TEST(CheckCOWArraysCreatedRuntimeCounter) {
- V8::SetCounterFunction(LookupCounterCOWArrays);
#ifdef DEBUG
i::FLAG_native_code_counters = true;
LocalContext env;
+ env->GetIsolate()->SetCounterFunction(LookupCounterCOWArrays);
v8::HandleScope scope(env->GetIsolate());
int initial_cow_arrays = cow_arrays_created_runtime;
CompileRun("var o = [1, 2, 3];");
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
