From 8b56f14aeba18bc3cea7e8f12708c7b155b374fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Fri, 12 Mar 2010 11:07:23 +0000
Subject: [PATCH] Fixed debug build.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35820 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/MultiLocker.cpp           | 4 ++--
 src/servers/app/MultiLocker.h             | 4 ++--
 src/servers/app/ServerApp.cpp             | 6 +++---
 src/servers/app/drawing/DrawingEngine.cpp | 9 +++++++++
 src/servers/app/drawing/DrawingEngine.h   | 4 +++-
 src/servers/app/drawing/HWInterface.h     | 2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/servers/app/MultiLocker.cpp b/src/servers/app/MultiLocker.cpp
index 32b59f2503..f6b20a6384 100644
--- a/src/servers/app/MultiLocker.cpp
+++ b/src/servers/app/MultiLocker.cpp
@@ -149,7 +149,7 @@ MultiLocker::InitCheck()
 	contained.
 */
 bool
-MultiLocker::IsWriteLocked(uint32* _stackBase, thread_id* _thread)
+MultiLocker::IsWriteLocked(uint32* _stackBase, thread_id* _thread) const
 {
 #if TIMING
 	bigtime_t start = system_time();
@@ -518,7 +518,7 @@ MultiLocker::WriteUnlock()
 
 
 bool
-MultiLocker::IsReadLocked()
+MultiLocker::IsReadLocked() const
 {
 	if (fInit == B_NO_INIT)
 		return false;
diff --git a/src/servers/app/MultiLocker.h b/src/servers/app/MultiLocker.h
index 11f2377f0b..30446e57a2 100644
--- a/src/servers/app/MultiLocker.h
+++ b/src/servers/app/MultiLocker.h
@@ -57,12 +57,12 @@ public:
 
 			// does the current thread hold a write lock ?
 			bool				IsWriteLocked(uint32 *stackBase = NULL,
-									thread_id *thread = NULL);
+									thread_id *thread = NULL) const;
 
 #if MULTI_LOCKER_DEBUG
 			// in DEBUG mode returns whether the lock is held
 			// in non-debug mode returns true
-			bool				IsReadLocked();
+			bool				IsReadLocked() const;
 #endif
 
 private:
diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp
index 68475214c3..1df4034a25 100644
--- a/src/servers/app/ServerApp.cpp
+++ b/src/servers/app/ServerApp.cpp
@@ -3188,7 +3188,7 @@ ServerApp::_AddBitmap(ServerBitmap* bitmap)
 void
 ServerApp::_DeleteBitmap(ServerBitmap* bitmap)
 {
-	ASSERT(fMapLock.IsLocked());
+	ASSERT(fMapLocker.IsLocked());
 
 	gBitmapManager->BitmapRemoved(bitmap);
 	fBitmapMap.erase(bitmap->Token());
@@ -3200,7 +3200,7 @@ ServerApp::_DeleteBitmap(ServerBitmap* bitmap)
 ServerBitmap*
 ServerApp::_FindBitmap(int32 token) const
 {
-	ASSERT(fMapLock.IsLocked());
+	ASSERT(fMapLocker.IsLocked());
 
 	BitmapMap::const_iterator iterator = fBitmapMap.find(token);
 	if (iterator == fBitmapMap.end())
@@ -3213,7 +3213,7 @@ ServerApp::_FindBitmap(int32 token) const
 ServerPicture*
 ServerApp::_FindPicture(int32 token) const
 {
-	ASSERT(fMapLock.IsLocked());
+	ASSERT(fMapLocker.IsLocked());
 
 	PictureMap::const_iterator iterator = fPictureMap.find(token);
 	if (iterator == fPictureMap.end())
diff --git a/src/servers/app/drawing/DrawingEngine.cpp b/src/servers/app/drawing/DrawingEngine.cpp
index 1dc46ab635..28974f2baa 100644
--- a/src/servers/app/drawing/DrawingEngine.cpp
+++ b/src/servers/app/drawing/DrawingEngine.cpp
@@ -126,6 +126,15 @@ DrawingEngine::LockParallelAccess()
 }
 
 
+#if DEBUG
+bool
+DrawingEngine::IsParallelAccessLocked() const
+{
+	return fGraphicsCard->IsParallelAccessLocked();
+}
+#endif
+
+
 void
 DrawingEngine::UnlockParallelAccess()
 {
diff --git a/src/servers/app/drawing/DrawingEngine.h b/src/servers/app/drawing/DrawingEngine.h
index d4dde2425b..ef8a811507 100644
--- a/src/servers/app/drawing/DrawingEngine.h
+++ b/src/servers/app/drawing/DrawingEngine.h
@@ -50,7 +50,9 @@ public:
 
 	// locking
 			bool			LockParallelAccess();
-			bool			IsParallelAccessLocked();
+#if DEBUG
+			bool			IsParallelAccessLocked() const;
+#endif
 			void			UnlockParallelAccess();
 
 			bool			LockExclusiveAccess();
diff --git a/src/servers/app/drawing/HWInterface.h b/src/servers/app/drawing/HWInterface.h
index cef1207483..ab0f7bbe9a 100644
--- a/src/servers/app/drawing/HWInterface.h
+++ b/src/servers/app/drawing/HWInterface.h
@@ -57,7 +57,7 @@ public:
 	// locking
 			bool				LockParallelAccess() { return ReadLock(); }
 #if DEBUG
-			bool				IsParallelAccessLocked()
+			bool				IsParallelAccessLocked() const
 									{ return IsReadLocked(); }
 #endif
 			void				UnlockParallelAccess() { ReadUnlock(); }