AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix broken build. Sorry about that.

Browse Source 
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@193 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
kasperl@chromium.org 2008-09-08 07:24:10 +00:00
parent 6d13d9864c
commit cd3bf78bca
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/v8.h
View File

@ -2123,11 +2123,11 @@ class EXPORT Locker {
*/
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_;

6
src/debug.h
View File

@ -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 @@ class Debug_Address {
} } // namespace v8::internal
#endif // V8_DEBUG_H_
#endif // V8_V8_DEBUG_H_

14
src/v8threads.cc
View File

@ -54,11 +54,9 @@ Locker::Locker() : has_lock_(false), top_level_(true) {
}
#ifdef DEBUG
void Locker::AssertIsLocked() {
ASSERT(internal::ThreadManager::IsLockedByCurrentThread());
bool Locker::IsLocked() {
return internal::ThreadManager::IsLockedByCurrentThread();
}
#endif
Locker::~Locker() {
@ -282,7 +280,7 @@ static v8::internal::ContextSwitcher* switcher;
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::StartPreemption(int every_n_ms) {
void ContextSwitcher::StopPreemption() {
Locker::AssertIsLocked();
ASSERT(Locker::IsLocked());
if (switcher != NULL) {
switcher->Stop();
delete(switcher);
@ -312,7 +310,7 @@ void ContextSwitcher::Run() {
void ContextSwitcher::Stop() {
Locker::AssertIsLocked();
ASSERT(Locker::IsLocked());
keep_going_ = false;
preemption_semaphore_->Signal();
Join();
@ -325,7 +323,7 @@ void ContextSwitcher::WaitForPreemption() {
void ContextSwitcher::PreemptionReceived() {
Locker::AssertIsLocked();
ASSERT(Locker::IsLocked());
switcher->preemption_semaphore_->Signal();
}

8
test/cctest/test-api.cc
View File

@ -4563,7 +4563,7 @@ void ApiTestFuzzer::CallTest() {
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> ThrowInJS(const v8::Arguments& args) {
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 @@ static v8::Handle<Value> ThrowInJSNoCatch(const v8::Arguments& args) {
// 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 @@ THREADED_TEST(RecursiveLocking) {
v8::Locker locker;
{
v8::Locker locker2;
v8::Locker::AssertIsLocked();
CHECK(v8::Locker::IsLocked());
}
}