Changeset 42235 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 19, 2012 5:02:41 PM (13 years ago)

Author:

vboxsync

Message:

Runtime/generic/timer-generic.cpp+timerlr-generic.cpp: make timer destruction faster by always signalling the event semaphore, as that's the same as stopping the timer first and then destroying it, only with one event semaphore signalling eliminated

Location:

trunk/src/VBox/Runtime/generic

Files:

• timer-generic.cpp (modified) (2 diffs)
• timerlr-generic.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -159 +159 @@
 
     /*
-     * If the timer is active, we just flag it to self destruct on the next tick.
-     * If it's suspended we can safely set the destroy flag and signal it.
+     * If the timer is active, we stop and destruct it in one go, to avoid
+     * unnecessary waiting for the next tick. If it's suspended we can safely
+     * set the destroy flag and signal it.
      */
     RTTHREAD Thread = pTimer->Thread;
     if (!pTimer->fSuspended)
-    {
         ASMAtomicXchgU8(&pTimer->fSuspended, true);
-        ASMAtomicXchgU8(&pTimer->fDestroyed, true);
-    }
-    else
-    {
-        ASMAtomicXchgU8(&pTimer->fDestroyed, true);
-        int rc = RTSemEventSignal(pTimer->Event);
-        if (rc == VERR_ALREADY_POSTED)
-            rc = VINF_SUCCESS;
-        AssertRC(rc);
-    }
+    ASMAtomicXchgU8(&pTimer->fDestroyed, true);
+    int rc = RTSemEventSignal(pTimer->Event);
+    if (rc == VERR_ALREADY_POSTED)
+        rc = VINF_SUCCESS;
+    AssertRC(rc);
 
     RTThreadWait(Thread, 250, NULL);

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

@@ -8 +8 @@
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -154 +154 @@
 
     /*
-     * If the timer is active, we just flag it to self destruct on the next tick.
-     * If it's suspended we can safely set the destroy flag and signal it.
+     * If the timer is active, we stop and destruct it in one go, to avoid
+     * unnecessary waiting for the next tick. If it's suspended we can safely
+     * set the destroy flag and signal it.
      */
     RTTHREAD hThread = pThis->hThread;
     if (!pThis->fSuspended)
-    {
         ASMAtomicWriteBool(&pThis->fSuspended, true);
-        ASMAtomicWriteBool(&pThis->fDestroyed, true);
-    }
-    else
-    {
-        ASMAtomicWriteBool(&pThis->fDestroyed, true);
-        int rc = RTSemEventSignal(pThis->hEvent);
-        if (rc == VERR_ALREADY_POSTED)
-            rc = VINF_SUCCESS;
-        AssertRC(rc);
-    }
-
-    RTThreadWait(hThread, 500, NULL); /* 250 ms was not enough for valgrind! */
+    ASMAtomicWriteBool(&pThis->fDestroyed, true);
+    int rc = RTSemEventSignal(pThis->hEvent);
+    if (rc == VERR_ALREADY_POSTED)
+        rc = VINF_SUCCESS;
+    AssertRC(rc);
+
+    RTThreadWait(hThread, 250, NULL);
     return VINF_SUCCESS;
 }