Changeset 25398 in vbox for trunk/include/iprt

Timestamp:

Dec 15, 2009 12:58:08 PM (15 years ago)

Author:

vboxsync

Message:

IPRT,PDMAllocCritSect: Don't bitch when recursivly entering a mutex.

Location:

trunk/include/iprt

Files:

• lockvalidator.h (modified) (2 diffs)
• thread.h (modified) (3 diffs)

trunk/include/iprt/lockvalidator.h

@@ -166 +166 @@
 RTDECL(int)  RTLockValidatorCheckOrder(PRTLOCKVALIDATORREC pRec, RTTHREAD hThread, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 
-
-/**
- * Record the specified thread as lock owner.
- *
- * This is typically called after acquiring the lock.
- *
- * @returns hThread resolved.  Can return NIL_RTHREAD iff we fail to adopt the
- *          alien thread or if pRec is invalid.
+/**
+ * Check the exit order.
+ *
+ * This is called by routines implementing lock acquisition.
+ *
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_DEADLOCK if the order is wrong, after having whined and
+ *          asserted.
  *
  * @param   pRec                The validator record.
@@ -187 +187 @@
  *                              from.  Optional.
  */
+RTDECL(int)  RTLockValidatorCheckReleaseOrder(PRTLOCKVALIDATORREC pRec, RTTHREAD hThread);
+
+/**
+ * Record the specified thread as lock owner.
+ *
+ * This is typically called after acquiring the lock.
+ *
+ * @returns hThread resolved.  Can return NIL_RTHREAD iff we fail to adopt the
+ *          alien thread or if pRec is invalid.
+ *
+ * @param   pRec                The validator record.
+ * @param   hThread             The handle of the calling thread.  If not known,
+ *                              pass NIL_RTTHREAD and this method will figure it
+ *                              out.
+ * @param   uId                 Some kind of locking location ID.  Typically a
+ *                              return address up the stack.  Optional (0).
+ * @param   pszFile             The file where the lock is being acquired from.
+ *                              Optional.
+ * @param   iLine               The line number in that file.  Optional (0).
+ * @param   pszFunction         The functionn where the lock is being acquired
+ *                              from.  Optional.
+ */
 RTDECL(RTTHREAD) RTLockValidatorSetOwner(PRTLOCKVALIDATORREC pRec, RTTHREAD hThread, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 

trunk/include/iprt/thread.h

@@ -632 +632 @@
  * Unblocks a thread.
  *
- * This function is paired with rtThreadBlocking.
+ * This function is paired with RTThreadBlocking and RTThreadBlockingDebug.
  *
  * @param   hThread     The current thread.
@@ -641 +641 @@
 
 /**
+ * Change the thread state to blocking.
+ *
+ * @param   hThread         The current thread.
+ * @param   enmState        The sleep state.
+ */
+RTDECL(void) RTThreadBlocking(RTTHREAD hThread, RTTHREADSTATE enmState);
+
+/**
  * Change the thread state to blocking and do deadlock detection.
  *
@@ -648 +656 @@
  * @param   enmState        The sleep state.
  * @param   pvBlock         Pointer to a RTLOCKVALIDATORREC structure.
+ * @param   fRecursiveOk    Whether it's ok to recurse.
  * @param   uId             Where we are blocking.
  * @param   RT_SRC_POS_DECL Where we are blocking.
- */
-RTDECL(void) RTThreadBlocking(RTTHREAD hThread, RTTHREADSTATE enmState,
-                              PRTLOCKVALIDATORREC pValidatorRec, RTHCUINTPTR uId, RT_SRC_POS_DECL);
+ *
+ * @todo    Move this to RTLockValidator.
+ */
+RTDECL(void) RTThreadBlockingDebug(RTTHREAD hThread, RTTHREADSTATE enmState, bool fRecursiveOk,
+                                   PRTLOCKVALIDATORREC pValidatorRec, RTHCUINTPTR uId, RT_SRC_POS_DECL);