svn merge ^/branches/released .

1 files changed, 27 insertions, 20 deletions

diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index aaff1c625..774dda664 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -40,14 +40,18 @@
 #include <stdio.h>

 #include <string.h>

 #include <stdlib.h>

-#include <pthread.h>

 #include <stdbool.h>

 #include <signal.h>

 

+#ifdef HAVE_LIBDISPATCH

+#include <dispatch/dispatch.h>

+#else

+#include <pthread.h>

+#endif

+

 #include <sys/socket.h>

 #include <sys/un.h>

 

-#include <sys/time.h>

 #include <fcntl.h>

 

 #include <mach/mach.h>

@@ -95,8 +99,9 @@ int server_main(int argc, char **argv, char **envp);
 static int execute(const char *command);

 static char *command_from_prefs(const char *key, const char *default_value);

 

+#ifndef HAVE_LIBDISPATCH

 /*** Pthread Magics ***/

-static pthread_t create_thread(void *func, void *arg) {

+static pthread_t create_thread(void *(*func)(void *), void *arg) {

     pthread_attr_t attr;

     pthread_t tid;

 	

@@ -108,6 +113,7 @@ static pthread_t create_thread(void *func, void *arg) {
 	

     return tid;

 }

+#endif

 

 /*** Mach-O IPC Stuffs ***/

 

@@ -200,11 +206,15 @@ typedef struct {
 /* This thread accepts an incoming connection and hands off the file

  * descriptor for the new connection to accept_fd_handoff()

  */

-static void socket_handoff_thread(void *arg) {

+#ifdef HAVE_LIBDISPATCH

+static void socket_handoff(socket_handoff_t *handoff_data) {

+#else

+static void *socket_handoff_thread(void *arg) {

     socket_handoff_t *handoff_data = (socket_handoff_t *)arg;

+#endif

+

     int launchd_fd = -1;

     int connected_fd;

-    unsigned remain;

 

     /* Now actually get the passed file descriptor from this connection

      * If we encounter an error, keep listening.

@@ -227,22 +237,13 @@ static void socket_handoff_thread(void *arg) {
     close(handoff_data->fd);

     unlink(handoff_data->filename);

     free(handoff_data);

-    

-    /* TODO: Clean up this race better... giving xinitrc time to run... need to wait for 1.5 branch:

-     *

-     * From ajax:

-     * There's already an internal callback chain for setting selection [in 1.5]

-     * ownership.  See the CallSelectionCallback at the bottom of

-     * ProcSetSelectionOwner, and xfixes/select.c for an example of how to hook

-     * into it.

-     */

-    

-    remain = 3000000;

-    fprintf(stderr, "X11.app: Received new $DISPLAY fd: %d ... sleeping to allow xinitrc to catchup.\n", launchd_fd);

-    while((remain = usleep(remain)) > 0);

-    

+        

     fprintf(stderr, "X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n", launchd_fd);

     DarwinListenOnOpenFD(launchd_fd);

+

+#ifndef HAVE_LIBDISPATCH

+    return NULL;

+#endif

 }

 

 static int create_socket(char *filename_out) {

@@ -311,8 +312,14 @@ kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename)
     }

 

     strlcpy(filename, handoff_data->filename, STRING_T_SIZE);

-    

+

+#ifdef HAVE_LIBDISPATCH

+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{

+        socket_handoff(handoff_data);

+    });

+#else

     create_thread(socket_handoff_thread, handoff_data);

+#endif

     

 #ifdef DEBUG

     fprintf(stderr, "X11.app: Thread created for handoff.  Returning success to tell caller to connect and push the fd.\n");