[haiku-commits] r35820 - in haiku/trunk/src/servers/app: . drawing

From: superstippi@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Fri, 12 Mar 2010 12:07:23 +0100 (CET)
Author: stippi
Date: 2010-03-12 12:07:23 +0100 (Fri, 12 Mar 2010)
New Revision: 35820
Changeset: http://dev.haiku-os.org/changeset/35820/haiku

Modified:
   haiku/trunk/src/servers/app/MultiLocker.cpp
   haiku/trunk/src/servers/app/MultiLocker.h
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.h
   haiku/trunk/src/servers/app/drawing/HWInterface.h
Log:
Fixed debug build.


Modified: haiku/trunk/src/servers/app/MultiLocker.cpp
===================================================================
--- haiku/trunk/src/servers/app/MultiLocker.cpp 2010-03-11 23:23:37 UTC (rev 
35819)
+++ haiku/trunk/src/servers/app/MultiLocker.cpp 2010-03-12 11:07:23 UTC (rev 
35820)
@@ -149,7 +149,7 @@
        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 @@
 
 
 bool
-MultiLocker::IsReadLocked()
+MultiLocker::IsReadLocked() const
 {
        if (fInit == B_NO_INIT)
                return false;

Modified: haiku/trunk/src/servers/app/MultiLocker.h
===================================================================
--- haiku/trunk/src/servers/app/MultiLocker.h   2010-03-11 23:23:37 UTC (rev 
35819)
+++ haiku/trunk/src/servers/app/MultiLocker.h   2010-03-12 11:07:23 UTC (rev 
35820)
@@ -57,12 +57,12 @@
 
                        // 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:

Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp   2010-03-11 23:23:37 UTC (rev 
35819)
+++ haiku/trunk/src/servers/app/ServerApp.cpp   2010-03-12 11:07:23 UTC (rev 
35820)
@@ -3188,7 +3188,7 @@
 void
 ServerApp::_DeleteBitmap(ServerBitmap* bitmap)
 {
-       ASSERT(fMapLock.IsLocked());
+       ASSERT(fMapLocker.IsLocked());
 
        gBitmapManager->BitmapRemoved(bitmap);
        fBitmapMap.erase(bitmap->Token());
@@ -3200,7 +3200,7 @@
 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 @@
 ServerPicture*
 ServerApp::_FindPicture(int32 token) const
 {
-       ASSERT(fMapLock.IsLocked());
+       ASSERT(fMapLocker.IsLocked());
 
        PictureMap::const_iterator iterator = fPictureMap.find(token);
        if (iterator == fPictureMap.end())

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp       2010-03-11 
23:23:37 UTC (rev 35819)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp       2010-03-12 
11:07:23 UTC (rev 35820)
@@ -126,6 +126,15 @@
 }
 
 
+#if DEBUG
+bool
+DrawingEngine::IsParallelAccessLocked() const
+{
+       return fGraphicsCard->IsParallelAccessLocked();
+}
+#endif
+
+
 void
 DrawingEngine::UnlockParallelAccess()
 {

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.h 2010-03-11 23:23:37 UTC 
(rev 35819)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.h 2010-03-12 11:07:23 UTC 
(rev 35820)
@@ -50,7 +50,9 @@
 
        // locking
                        bool                    LockParallelAccess();
-                       bool                    IsParallelAccessLocked();
+#if DEBUG
+                       bool                    IsParallelAccessLocked() const;
+#endif
                        void                    UnlockParallelAccess();
 
                        bool                    LockExclusiveAccess();

Modified: haiku/trunk/src/servers/app/drawing/HWInterface.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/HWInterface.h   2010-03-11 23:23:37 UTC 
(rev 35819)
+++ haiku/trunk/src/servers/app/drawing/HWInterface.h   2010-03-12 11:07:23 UTC 
(rev 35820)
@@ -57,7 +57,7 @@
        // locking
                        bool                            LockParallelAccess() { 
return ReadLock(); }
 #if DEBUG
-                       bool                            IsParallelAccessLocked()
+                       bool                            
IsParallelAccessLocked() const
                                                                        { 
return IsReadLocked(); }
 #endif
                        void                            UnlockParallelAccess() 
{ ReadUnlock(); }
[haiku-commits] r35820 - in haiku/trunk/src/servers/app: . drawing

Other related posts:
