Changeset 29661 in vbox for trunk/src/VBox

Timestamp:

May 19, 2010 2:29:49 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: IPRT_DEBUG_SEMS cleanup - use macros.

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• semevent-r0drv-linux.c (modified) (2 diffs)
• semeventmulti-r0drv-linux.c (modified) (2 diffs)
• semfastmutex-r0drv-linux.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c

@@ -142 +142 @@
     int     rc       = VINF_SUCCESS;
     long    lTimeout = cMillies == RT_INDEFINITE_WAIT ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(cMillies);
-#ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "e%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
-#endif
+    IPRT_DEBUG_SEMS_STATE(pThis, 'e');
     for (;;)
     {
@@ -182 +180 @@
 
     finish_wait(&pThis->Head, &Wait);
-#ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "e%lx:%d", IPRT_DEBUG_SEMS_ADDRESS(pThis), rc);
-#endif
+    IPRT_DEBUG_SEMS_STATE_RC(pThis, 'e', rc);
     return rc;
 }

trunk/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c

@@ -166 +166 @@
     int     rc       = VINF_SUCCESS;
     long    lTimeout = cMillies == RT_INDEFINITE_WAIT ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(cMillies);
-#ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "E%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
-#endif
+    IPRT_DEBUG_SEMS_STATE(pThis, 'E');
     for (;;)
     {
@@ -206 +204 @@
 
     finish_wait(&pThis->Head, &Wait);
-#ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "E%lx:%d", IPRT_DEBUG_SEMS_ADDRESS(pThis), rc);
-#endif
+    IPRT_DEBUG_SEMS_STATE_RC(pThis, 'E', rc);
     return rc;
 }

trunk/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c

@@ -114 +114 @@
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("u32Magic=%RX32 pThis=%p\n", pThis->u32Magic, pThis), VERR_INVALID_HANDLE);
 
-#ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "d%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
-#endif
+    IPRT_DEBUG_SEMS_STATE(pThis, 'd');
     down(&pThis->Semaphore);
 #ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "o%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
+    IPRT_DEBUG_SEMS_STATE(pThis, 'o');
     AssertRelease(pThis->Owner == NIL_RTNATIVETHREAD);
     ASMAtomicUoWriteSize(&pThis->Owner, RTThreadNativeSelf());
@@ -142 +140 @@
 #endif
     up(&pThis->Semaphore);
-#ifdef IPRT_DEBUG_SEMS
-    snprintf(current->comm, sizeof(current->comm), "u%lx", IPRT_DEBUG_SEMS_ADDRESS(pThis));
-#endif
+    IPRT_DEBUG_SEMS_STATE(pThis, 'u');
     return VINF_SUCCESS;
 }