Changeset 78341 in vbox for trunk/src/VBox/GuestHost/OpenGL/util/net.c

Timestamp:

Apr 28, 2019 4:47:51 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,Additions/common/crOpenGL,VBox/GuestHost/OpenGL,HostServices/SharedOpenGL: Remove CHROMIUM_THREADSAFE define and apply the current default

File:

• trunk/src/VBox/GuestHost/OpenGL/util/net.c (modified) (14 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/net.c

@@ -48 +48 @@
     int                  num_clients; /* total number of clients (unused?) */
 
-#ifdef CHROMIUM_THREADSAFE
     CRmutex              mutex;
-#endif
 } cr_net;
 
@@ -134 +132 @@
     {
         crDebug("crNetConnectToServer() failed, freeing the connection");
-        #ifdef CHROMIUM_THREADSAFE
-            crFreeMutex( &conn->messageList.lock );
-        #endif
+        crFreeMutex( &conn->messageList.lock );
         conn->Disconnect(conn);
         crFree( conn );
@@ -219 +215 @@
 {
     conn->Disconnect(conn);
-    #ifdef CHROMIUM_THREADSAFE
-        crFreeMutex( &conn->messageList.lock );
-    #endif
+    crFreeMutex( &conn->messageList.lock );
     crFree(conn);
 }
@@ -244 +238 @@
         cr_net.use_hgcm    = 0;
         cr_net.num_clients = 0;
-#ifdef CHROMIUM_THREADSAFE
         crInitMutex(&cr_net.mutex);
-#endif
 
         cr_net.initialized = 1;
@@ -305 +297 @@
     if (!cr_net.initialized) return;
 
-#ifdef CHROMIUM_THREADSAFE
     crLockMutex(&cr_net.mutex);
-#endif
 
     /* Note, other protocols used by chromium should free up stuff too,
@@ -329 +319 @@
     cr_net.initialized = 0;
 
-#ifdef CHROMIUM_THREADSAFE
     crUnlockMutex(&cr_net.mutex);
     crFreeMutex(&cr_net.mutex);
-#endif
 }
 
@@ -380 +368 @@
     list->head = list->tail = NULL;
     list->numMessages = 0;
-#ifdef CHROMIUM_THREADSAFE
     crInitMutex(&list->lock);
     crInitCondition(&list->nonEmpty);
-#endif
 }
 
@@ -400 +386 @@
     CRMessageListNode *node;
 
-#ifdef CHROMIUM_THREADSAFE
     crLockMutex(&list->lock);
-#endif
 
     node = (CRMessageListNode *) crAlloc(sizeof(CRMessageListNode));
@@ -419 +403 @@
     list->numMessages++;
 
-#ifdef CHROMIUM_THREADSAFE
     crSignalCondition(&list->nonEmpty);
     crUnlockMutex(&list->lock);
-#endif
 }
 
@@ -437 +419 @@
     int retval;
 
-#ifdef CHROMIUM_THREADSAFE
     crLockMutex(&list->lock);
-#endif
 
     if (list->head) {
@@ -467 +447 @@
     }
 
-#ifdef CHROMIUM_THREADSAFE
     crUnlockMutex(&list->lock);
-#endif
-
     return retval;
 }
@@ -488 +465 @@
     CRMessageListNode *node;
 
-#ifdef CHROMIUM_THREADSAFE
     crLockMutex(&list->lock);
-#endif
-
-#ifdef CHROMIUM_THREADSAFE
+
     while (!list->head) {
         crWaitCondition(&list->nonEmpty, &list->lock);
     }
-#else
-    CRASSERT(list->head);
-#endif
 
     node = list->head;
@@ -518 +489 @@
 
     crFree(node);
-
-#ifdef CHROMIUM_THREADSAFE
     crUnlockMutex(&list->lock);
-#endif
 }
 
@@ -653 +621 @@
 {
     conn->Disconnect( conn );
-#ifdef CHROMIUM_THREADSAFE
     crFreeMutex( &conn->messageList.lock );
-#endif
     crFree( conn );
 }