Changeset 18328 in vbox

Timestamp:

Mar 26, 2009 5:16:00 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: init mutexes as recursive, fix for #3758

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/util/filenet.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/util/threads.c (modified) (1 diff)

trunk/Config.kmk

@@ -3533 +3533 @@
 TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS           = CHROMIUM_THREADSAFE VBOX_WITH_HGCM UNPACKS
 TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win       = _WIN32_WINNT=0x0500 WINDOWS=1
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux     = Linux=1
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.solaris   = SunOS=1 #GLEXT_64_TYPES_DEFINED
-TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux     = Linux=1 _XOPEN_SOURCE=500
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.solaris   = SunOS=1 _XOPEN_SOURCE=500 #GLEXT_64_TYPES_DEFINED
+TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY _XOPEN_SOURCE=500
 TEMPLATE_VBOXCROGLR3HOSTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
 TEMPLATE_VBOXCROGLR3HOSTDLL_SDKS.darwin    = DARWIN-OPENGL
@@ -3564 +3564 @@
 TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS           = CHROMIUM_THREADSAFE VBOX_WITH_HGCM
 TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.win       = _WIN32_WINNT=0x0500 WINDOWS=1
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.linux     = Linux=1
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.solaris   = SunOS=1 #GLEXT_64_TYPES_DEFINED
-TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.linux     = Linux=1 _XOPEN_SOURCE=500
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.solaris   = SunOS=1 _XOPEN_SOURCE=500 #GLEXT_64_TYPES_DEFINED
+TEMPLATE_VBOXCROGLR3GUESTDLL_DEFS.darwin    = DARWIN=1 GL_GLEXT_LEGACY _XOPEN_SOURCE=500
 TEMPLATE_VBOXCROGLR3GUESTDLL_INCS           = $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
 TEMPLATE_VBOXCROGLR3GUESTDLL_SDKS.darwin    = DARWIN-OPENGL

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

@@ -325 +325 @@
 #else
         conn->fd = open( conn->filename, O_CREAT | O_WRONLY | O_BINARY,
-                                                                         S_IREAD | S_IWRITE | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+                                                                     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 #endif
         if (conn->fd < 0)

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

@@ -134 +134 @@
     InitializeCriticalSection(mutex);
 #else
-    pthread_mutex_init(mutex, NULL);
+    pthread_mutexattr_t mta;
+    int rc;
+
+    rc = pthread_mutexattr_init(&mta);
+    CRASSERT(!rc);
+    rc = pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
+    CRASSERT(!rc);
+    rc = pthread_mutex_init(mutex, &mta);
+    CRASSERT(!rc);
+    pthread_mutexattr_destroy(&mta);
 #endif
 }