Changeset 82527 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

Timestamp:

Dec 10, 2019 1:46:40 AM (5 years ago)

Author:

vboxsync

Message:

SharedClipboardSvc,Vbgl: Worked over the host messages, taking locks when needed, not using C++ lists and a bunch of other simplifications. bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (14 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -89 +89 @@
 }
 
+#if 0 /* currently not used */
 /**
  * Creates (initializes) an event.
@@ -94 +95 @@
  * @returns VBox status code.
  * @param   pEvent              Event to initialize.
- * @param   uID                 Event ID to use.
- */
-int ShClEventCreate(PSHCLEVENT pEvent, SHCLEVENTID uID)
+ * @param   idEvent             Event ID to use.
+ */
+static int shClEventInit(PSHCLEVENT pEvent, SHCLEVENTID idEvent)
 {
     AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("Event %RU32\n", uID));
-
-    int rc = RTSemEventCreate(&pEvent->hEventSem);
+    LogFlowFunc(("Event %RU32\n", idEvent));
+
+    int rc = RTSemEventMultiCreate(&pEvent->hEvtMulSem);
     if (RT_SUCCESS(rc))
     {
-        pEvent->uID      = uID;
+        pEvent->idEvent  = idEvent;
         pEvent->pPayload = NULL;
     }
@@ -111 +112 @@
     return rc;
 }
-
-/**
- * Destroys an event.
+#endif
+
+/**
+ * Destroys an event, but doesn't free the memory.
  *
  * @param   pEvent              Event to destroy.
  */
-void ShClEventDestroy(PSHCLEVENT pEvent)
+static void shClEventTerm(PSHCLEVENT pEvent)
 {
     if (!pEvent)
         return;
 
-    LogFlowFunc(("Event %RU32\n", pEvent->uID));
-
-    if (pEvent->hEventSem != NIL_RTSEMEVENT)
-    {
-        RTSemEventDestroy(pEvent->hEventSem);
-        pEvent->hEventSem = NIL_RTSEMEVENT;
+    LogFlowFunc(("Event %RU32\n", pEvent->idEvent));
+
+    if (pEvent->hEvtMulSem != NIL_RTSEMEVENT)
+    {
+        RTSemEventMultiDestroy(pEvent->hEvtMulSem);
+        pEvent->hEvtMulSem = NIL_RTSEMEVENT;
     }
 
     ShClPayloadFree(pEvent->pPayload);
 
-    pEvent->uID = 0;
+    pEvent->idEvent = 0;
 }
 
@@ -151 +153 @@
     pSource->uID          = uID;
     /* Choose a random event ID starting point. */
-    pSource->uEventIDNext = RTRandU32() % VBOX_SHCL_MAX_EVENTS;
+    pSource->idNextEvent  = RTRandU32Ex(1, VBOX_SHCL_MAX_EVENTS - 1);
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -172 +174 @@
 
     pSource->uID          = UINT16_MAX;
-    pSource->uEventIDNext = UINT32_MAX;
+    pSource->idNextEvent  = UINT32_MAX;
 }
 
@@ -190 +192 @@
         RTListNodeRemove(&pEvIt->Node);
 
-        ShClEventDestroy(pEvIt);
+        shClEventTerm(pEvIt);
 
         RTMemFree(pEvIt);
         pEvIt = NULL;
     }
-}
-
-/**
- * Generates a new event ID for a specific event source.
- *
- * @returns New event ID generated, or 0 on error.
- * @param   pSource             Event source to generate event for.
- */
-SHCLEVENTID ShClEventIDGenerate(PSHCLEVENTSOURCE pSource)
-{
-    AssertPtrReturn(pSource, 0);
-
-    LogFlowFunc(("uSource=%RU16: New event: %RU32\n", pSource->uID, pSource->uEventIDNext));
-
-    pSource->uEventIDNext++;
-    if (pSource->uEventIDNext == VBOX_SHCL_MAX_EVENTS)
-        pSource->uEventIDNext = 0;
-
-    return pSource->uEventIDNext;
 }
 
@@ -223 +206 @@
  * @param   uID                 Event ID to get.
  */
-inline PSHCLEVENT shclEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID uID)
-{
-    PSHCLEVENT pEvIt;
-    RTListForEach(&pSource->lstEvents, pEvIt, SHCLEVENT, Node)
-    {
-        if (pEvIt->uID == uID)
-            return pEvIt;
+DECLINLINE(PSHCLEVENT) shclEventGet(PSHCLEVENTSOURCE pSource, SHCLEVENTID idEvent)
+{
+    PSHCLEVENT pEvent;
+    RTListForEach(&pSource->lstEvents, pEvent, SHCLEVENT, Node)
+    {
+        if (pEvent->idEvent == idEvent)
+            return pEvent;
     }
 
     return NULL;
+}
+
+/**
+ * Generates a new event ID for a specific event source.
+ *
+ * @returns New event ID generated, or 0 on error.
+ * @param   pSource             Event source to generate event for.
+ * @deprecated as this does not deal with duplicates.
+ */
+SHCLEVENTID ShClEventIDGenerate(PSHCLEVENTSOURCE pSource)
+{
+    AssertPtrReturn(pSource, 0);
+
+    SHCLEVENTID idEvent = ++pSource->idNextEvent;
+    if (idEvent >= VBOX_SHCL_MAX_EVENTS)
+        pSource->idNextEvent = idEvent = 1;  /* zero == error, remember! */
+
+    LogFlowFunc(("uSource=%RU16: New event: %RU32\n", pSource->uID, idEvent));
+    return idEvent;
+}
+
+/**
+ * Generates a new event ID for a specific event source and registers it.
+ *
+ * @returns New event ID generated, or 0 on error.
+ * @param   pSource             Event source to generate event for.
+ */
+SHCLEVENTID ShClEventIdGenerateAndRegister(PSHCLEVENTSOURCE pSource)
+{
+    AssertPtrReturn(pSource, 0);
+
+    /*
+     * Allocate an event.
+     */
+    PSHCLEVENT pEvent = (PSHCLEVENT)RTMemAllocZ(sizeof(SHCLEVENT));
+    AssertReturn(pEvent, 0);
+    int rc = RTSemEventMultiCreate(&pEvent->hEvtMulSem);
+    AssertRCReturnStmt(rc, RTMemFree(pEvent), 0);
+
+    /*
+     * Allocate an unique event ID.
+     */
+    for (uint32_t cTries = 0;; cTries++)
+    {
+        SHCLEVENTID idEvent = ++pSource->idNextEvent;
+        if (idEvent < VBOX_SHCL_MAX_EVENTS)
+        { /* likely */ }
+        else
+            pSource->idNextEvent = idEvent = 1; /* zero == error, remember! */
+
+        if (shclEventGet(pSource, idEvent) == NULL)
+        {
+
+            pEvent->idEvent = idEvent;
+            RTListAppend(&pSource->lstEvents, &pEvent->Node);
+
+            LogFlowFunc(("uSource=%RU16: New event: %#x\n", pSource->uID, idEvent));
+            return idEvent;
+        }
+
+        AssertBreak(cTries < 4096);
+    }
+
+    RTMemFree(pEvent);
+    return 0;
 }
 
@@ -246 +294 @@
     PSHCLEVENT pEvent = RTListGetLast(&pSource->lstEvents, SHCLEVENT, Node);
     if (pEvent)
-        return pEvent->uID;
+        return pEvent->idEvent;
 
     return 0;
@@ -266 +314 @@
 }
 
+#if 0 /** @todo fix later */
 /**
  * Registers an event.
@@ -283 +332 @@
     if (shclEventGet(pSource, uID) == NULL)
     {
-        PSHCLEVENT pEvent
-            = (PSHCLEVENT)RTMemAllocZ(sizeof(SHCLEVENT));
+        PSHCLEVENT pEvent = (PSHCLEVENT)RTMemAllocZ(sizeof(SHCLEVENT));
         if (pEvent)
         {
-            rc = ShClEventCreate(pEvent, uID);
+            rc = shClEventInit(pEvent, uID);
             if (RT_SUCCESS(rc))
             {
@@ -308 +356 @@
     return rc;
 }
+#endif /* later */
 
 /**
@@ -327 +376 @@
     if (pEvent)
     {
-        LogFlowFunc(("Event %RU32\n", pEvent->uID));
+        LogFlowFunc(("Event %RU32\n", pEvent->idEvent));
 
         RTListNodeRemove(&pEvent->Node);
 
-        ShClEventDestroy(pEvent);
+        shClEventTerm(pEvent);
 
         RTMemFree(pEvent);
@@ -368 +417 @@
     if (pEvent)
     {
-        rc = RTSemEventWait(pEvent->hEventSem, uTimeoutMs);
+        rc = RTSemEventMultiWait(pEvent->hEvtMulSem, uTimeoutMs);
         if (RT_SUCCESS(rc))
         {
@@ -411 +460 @@
         pEvent->pPayload = pPayload;
 
-        rc = RTSemEventSignal(pEvent->hEventSem);
+        rc = RTSemEventMultiSignal(pEvent->hEvtMulSem);
     }
     else