Changeset 45151 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Mar 23, 2013 8:35:23 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84473

Message:

iprt/critsect.h: Cleanups (R/W mostly).

File:

• trunk/src/VBox/Runtime/generic/critsectrw-generic.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/generic/critsectrw-generic.cpp

@@ -45 +45 @@
 #include "internal/strict.h"
 
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-/* Note! Using RTCSRW instead of RTCRITSECTRW to save space. */
-#define RTCSRW_CNT_BITS            15
-#define RTCSRW_CNT_MASK            UINT64_C(0x00007fff)
-
-#define RTCSRW_CNT_RD_SHIFT        0
-#define RTCSRW_CNT_RD_MASK         (RTCSRW_CNT_MASK << RTCSRW_CNT_RD_SHIFT)
-#define RTCSRW_CNT_WR_SHIFT        16
-#define RTCSRW_CNT_WR_MASK         (RTCSRW_CNT_MASK << RTCSRW_CNT_WR_SHIFT)
-#define RTCSRW_DIR_SHIFT           31
-#define RTCSRW_DIR_MASK            RT_BIT_64(RTCSRW_DIR_SHIFT)
-#define RTCSRW_DIR_READ            UINT64_C(0)
-#define RTCSRW_DIR_WRITE           UINT64_C(1)
-
-#define RTCSRW_WAIT_CNT_RD_SHIFT   32
-#define RTCSRW_WAIT_CNT_RD_MASK    (RTCSRW_CNT_MASK << RTCSRW_WAIT_CNT_RD_SHIFT)
-//#define RTCSRW_WAIT_CNT_WR_SHIFT   48
-//#define RTCSRW_WAIT_CNT_WR_MASK    (RTCSRW_CNT_MASK << RTCSRW_WAIT_CNT_WR_SHIFT)
 
 
@@ -771 +750 @@
     return VINF_SUCCESS;
 }
-RT_EXPORT_SYMBOL(RTSemRWReleaseWrite);
+RT_EXPORT_SYMBOL(RTCritSectRwLeaveExcl);
 
 
@@ -867 +846 @@
     return pThis->cWriterReads;
 }
-RT_EXPORT_SYMBOL(RTSemRWGetWriterReadRecursion);
-
-
-RTDECL(uint32_t) RTSemRWGetReadCount(PRTCRITSECTRW pThis)
+RT_EXPORT_SYMBOL(RTCritSectRwGetWriterReadRecursion);
+
+
+RTDECL(uint32_t) RTCritSectRwGetReadCount(PRTCRITSECTRW pThis)
 {
     /*
@@ -886 +865 @@
     return (u64State & RTCSRW_CNT_RD_MASK) >> RTCSRW_CNT_RD_SHIFT;
 }
-RT_EXPORT_SYMBOL(RTSemRWGetReadCount);
+RT_EXPORT_SYMBOL(RTCritSectRwGetReadCount);