commit f52424055f9fe684751528630374ce70ccf9765e
author Alexandre Julliard <julliard@winehq.org> Wed Feb 28 21:45:23 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 28 21:45:23 2001 +0000
tree 22d9b4a42c1661a9242c7a33819756a0103c424e
parent 0ba5909038373f190892d044cdfff6923a60f830

New mechanism to transfer file descriptors from client to server.

server/process.c

diff --git a/server/process.c b/server/process.c
index 21a50ca..9f4bdc4 100644
--- a/server/process.c
+++ b/server/process.c
@@ -36,6 +36,7 @@
 
 static void process_dump( struct object *obj, int verbose );
 static int process_signaled( struct object *obj, struct thread *thread );
+static void process_poll_event( struct object *obj, int event );
 static void process_destroy( struct object *obj );
 
 static const struct object_ops process_ops =
@@ -47,7 +48,7 @@
     process_signaled,            /* signaled */
     no_satisfied,                /* satisfied */
     NULL,                        /* get_poll_events */
-    NULL,                        /* poll_event */
+    process_poll_event,          /* poll_event */
     no_get_fd,                   /* get_fd */
     no_flush,                    /* flush */
     no_get_file_info,            /* get_file_info */
@@ -147,11 +148,7 @@
     struct process *process;
     struct thread *thread = NULL;
 
-    if (!(process = alloc_object( &process_ops, -1 )))
-    {
-        close( fd );
-        return NULL;
-    }
+    if (!(process = alloc_object( &process_ops, fd ))) return NULL;
     process->next            = NULL;
     process->prev            = NULL;
     process->thread_list     = NULL;
@@ -183,8 +180,9 @@
     if (!(process->init_event = create_event( NULL, 0, 1, 0 ))) goto error;
 
     /* create the main thread */
-    if (!(thread = create_thread( fd, process ))) goto error;
+    if (!(thread = create_thread( dup(fd), process ))) goto error;
 
+    set_select_events( &process->obj, POLLIN );  /* start listening to events */
     release_object( process );
     return thread;
 
@@ -311,6 +309,15 @@
 }
 
 
+static void process_poll_event( struct object *obj, int event )
+{
+    struct process *process = (struct process *)obj;
+    assert( obj->ops == &process_ops );
+
+    if (event & (POLLERR | POLLHUP)) set_select_events( obj, -1 );
+    else if (event & POLLIN) receive_fd( process );
+}
+
 static void startup_info_destroy( struct object *obj )
 {
     struct startup_info *info = (struct startup_info *)obj;
@@ -491,7 +498,7 @@
 }
 
 /* kill a process on the spot */
-static void kill_process( struct process *process, struct thread *skip, int exit_code )
+void kill_process( struct process *process, struct thread *skip, int exit_code )
 {
     struct thread *thread = process->thread_list;
     while (thread)