Author: [EMAIL PROTECTED]
Date: Mon Sep 8 00:18:02 2008
New Revision: 192
Added:
changes/[EMAIL PROTECTED]/fix-broken-build/
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/
- copied from r184, /branches/bleeding_edge/
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/include/v8.h
- copied, changed from r189, /branches/bleeding_edge/include/v8.h
Modified:
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/src/debug.h
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/src/v8threads.cc
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/test/cctest/test-api.cc
Log:
Fix broken build. Sorry about that.
Copied:
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/include/v8.h
(from r189, /branches/bleeding_edge/include/v8.h)
==============================================================================
--- /branches/bleeding_edge/include/v8.h (original)
+++
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/include/v8.h
Mon Sep 8 00:18:02 2008
@@ -2123,11 +2123,11 @@
*/
static void StopPreemption();
-#ifdef DEBUG
- static void AssertIsLocked();
-#else
- static inline void AssertIsLocked() { }
-#endif
+ /**
+ * Returns whether or not the locker is locked by the current thread.
+ */
+ static bool IsLocked();
+
private:
bool has_lock_;
bool top_level_;
Modified:
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/src/debug.h
==============================================================================
--- /branches/bleeding_edge/src/debug.h (original)
+++ changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/src/debug.h
Mon Sep 8 00:18:02 2008
@@ -25,8 +25,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef V8_DEBUG_H_
-#define V8_DEBUG_H_
+#ifndef V8_V8_DEBUG_H_
+#define V8_V8_DEBUG_H_
#include "../include/v8-debug.h"
#include "assembler.h"
@@ -574,4 +574,4 @@
} } // namespace v8::internal
-#endif // V8_DEBUG_H_
+#endif // V8_V8_DEBUG_H_
Modified:
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/src/v8threads.cc
==============================================================================
--- /branches/bleeding_edge/src/v8threads.cc (original)
+++
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/src/v8threads.cc
Mon Sep 8 00:18:02 2008
@@ -54,11 +54,9 @@
}
-#ifdef DEBUG
-void Locker::AssertIsLocked() {
- ASSERT(internal::ThreadManager::IsLockedByCurrentThread());
+bool Locker::IsLocked() {
+ return internal::ThreadManager::IsLockedByCurrentThread();
}
-#endif
Locker::~Locker() {
@@ -282,7 +280,7 @@
void ContextSwitcher::StartPreemption(int every_n_ms) {
- Locker::AssertIsLocked();
+ ASSERT(Locker::IsLocked());
if (switcher == NULL) {
switcher = new ContextSwitcher(every_n_ms);
switcher->Start();
@@ -293,7 +291,7 @@
void ContextSwitcher::StopPreemption() {
- Locker::AssertIsLocked();
+ ASSERT(Locker::IsLocked());
if (switcher != NULL) {
switcher->Stop();
delete(switcher);
@@ -312,7 +310,7 @@
void ContextSwitcher::Stop() {
- Locker::AssertIsLocked();
+ ASSERT(Locker::IsLocked());
keep_going_ = false;
preemption_semaphore_->Signal();
Join();
@@ -325,7 +323,7 @@
void ContextSwitcher::PreemptionReceived() {
- Locker::AssertIsLocked();
+ ASSERT(Locker::IsLocked());
switcher->preemption_semaphore_->Signal();
}
Modified:
changes/[EMAIL PROTECTED]/fix-broken-build/bleeding_edge/test/cctest/test-api.cc
==============================================================================
--- /branches/bleeding_edge/test/cctest/test-api.cc (original)
+++
changes/[EMAIL
PROTECTED]/fix-broken-build/bleeding_edge/test/cctest/test-api.cc
Mon Sep 8 00:18:02 2008
@@ -4563,7 +4563,7 @@
static v8::Handle<Value> ThrowInJS(const v8::Arguments& args) {
- v8::Locker::AssertIsLocked();
+ CHECK(v8::Locker::IsLocked());
ApiTestFuzzer::Fuzz();
v8::Unlocker unlocker;
const char* code = "throw 7;";
@@ -4586,7 +4586,7 @@
static v8::Handle<Value> ThrowInJSNoCatch(const v8::Arguments& args) {
- v8::Locker::AssertIsLocked();
+ CHECK(v8::Locker::IsLocked());
ApiTestFuzzer::Fuzz();
v8::Unlocker unlocker;
const char* code = "throw 7;";
@@ -4604,7 +4604,7 @@
// as part of the locking aggregation tests.
TEST(NestedLockers) {
v8::Locker locker;
- v8::Locker::AssertIsLocked();
+ CHECK(v8::Locker::IsLocked());
v8::HandleScope scope;
LocalContext env;
Local<v8::FunctionTemplate> fun_templ =
v8::FunctionTemplate::New(ThrowInJS);
@@ -4648,7 +4648,7 @@
v8::Locker locker;
{
v8::Locker locker2;
- v8::Locker::AssertIsLocked();
+ CHECK(v8::Locker::IsLocked());
}
}
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
