ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed process startup synchronization broken by previous change.

This commit is contained in:
Alexandre Julliard 2002-05-25 21:15:03 +00:00
parent 987d8a4ffc
commit ca96de344b
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/process.c
View File

@ -74,12 +74,9 @@ static const struct object_ops process_ops =
/* process startup info */ /* process startup info */
enum startup_state { STARTUP_IN_PROGRESS, STARTUP_DONE, STARTUP_ABORTED };
struct startup_info struct startup_info
{ {
struct object obj; /* object header */ struct object obj; /* object header */
enum startup_state state; /* child process startup state */
int inherit_all; /* inherit all handles from parent */ int inherit_all; /* inherit all handles from parent */
int use_handles; /* use stdio handles */ int use_handles; /* use stdio handles */
int create_flags; /* creation flags */ int create_flags; /* creation flags */
@ -119,11 +116,13 @@ static const struct object_ops startup_info_ops =
/* set the state of the process startup info */ /* set the state of the process startup info */
static void set_process_startup_state( struct process *process, enum startup_state state ) static void set_process_startup_state( struct process *process, enum startup_state state )
{ {
if (!process->startup_info) return; if (process->startup_state == STARTUP_IN_PROGRESS) process->startup_state = state;
process->startup_info->state = state; if (process->startup_info)
wake_up( &process->startup_info->obj, 0 ); {
release_object( process->startup_info ); wake_up( &process->startup_info->obj, 0 );
process->startup_info = NULL; release_object( process->startup_info );
process->startup_info = NULL;
}
} }
/* set the console and stdio handles for a newly created process */ /* set the console and stdio handles for a newly created process */
@ -206,6 +205,7 @@ struct thread *create_process( int fd )
process->suspend = 0; process->suspend = 0;
process->create_flags = 0; process->create_flags = 0;
process->console = NULL; process->console = NULL;
process->startup_state = STARTUP_IN_PROGRESS;
process->startup_info = NULL; process->startup_info = NULL;
process->idle_event = NULL; process->idle_event = NULL;
process->queue = NULL; process->queue = NULL;
@ -214,7 +214,6 @@ struct thread *create_process( int fd )
process->exe.next = NULL; process->exe.next = NULL;
process->exe.prev = NULL; process->exe.prev = NULL;
process->exe.file = NULL; process->exe.file = NULL;
process->exe.base = NULL;
process->exe.dbg_offset = 0; process->exe.dbg_offset = 0;
process->exe.dbg_size = 0; process->exe.dbg_size = 0;
process->exe.namelen = 0; process->exe.namelen = 0;
@ -377,14 +376,14 @@ static void startup_info_dump( struct object *obj, int verbose )
struct startup_info *info = (struct startup_info *)obj; struct startup_info *info = (struct startup_info *)obj;
assert( obj->ops == &startup_info_ops ); assert( obj->ops == &startup_info_ops );
fprintf( stderr, "Startup info flags=%x in=%d out=%d err=%d state=%d\n", fprintf( stderr, "Startup info flags=%x in=%d out=%d err=%d\n",
info->create_flags, info->hstdin, info->hstdout, info->hstderr, info->state ); info->create_flags, info->hstdin, info->hstdout, info->hstderr );
} }
static int startup_info_signaled( struct object *obj, struct thread *thread ) static int startup_info_signaled( struct object *obj, struct thread *thread )
{ {
struct startup_info *info = (struct startup_info *)obj; struct startup_info *info = (struct startup_info *)obj;
return info->state != STARTUP_IN_PROGRESS; return info->process && is_process_init_done(info->process);
} }
/* get a process from an id (and increment the refcount) */ /* get a process from an id (and increment the refcount) */
@ -782,7 +781,6 @@ DECL_HANDLER(new_process)
/* build the startup info for a new process */ /* build the startup info for a new process */
if (!(info = alloc_object( &startup_info_ops, -1 ))) return; if (!(info = alloc_object( &startup_info_ops, -1 ))) return;
info->state = STARTUP_IN_PROGRESS;
info->inherit_all = req->inherit_all; info->inherit_all = req->inherit_all;
info->use_handles = req->use_handles; info->use_handles = req->use_handles;
info->create_flags = req->create_flags; info->create_flags = req->create_flags;
@ -823,7 +821,7 @@ DECL_HANDLER(get_new_process_info)
PROCESS_ALL_ACCESS, req->pinherit ); PROCESS_ALL_ACCESS, req->pinherit );
reply->thandle = alloc_handle( current->process, info->thread, reply->thandle = alloc_handle( current->process, info->thread,
THREAD_ALL_ACCESS, req->tinherit ); THREAD_ALL_ACCESS, req->tinherit );
reply->success = (info->state == STARTUP_DONE); reply->success = is_process_init_done( info->process );
release_object( info ); release_object( info );
} }
else else
@ -892,7 +890,7 @@ DECL_HANDLER(init_process_done)
process->exe.size = req->module_size; process->exe.size = req->module_size;
process->exe.name = req->name; process->exe.name = req->name;
if (req->exe_file) file = get_file_obj( current->process, req->exe_file, GENERIC_READ ); if (req->exe_file) file = get_file_obj( process, req->exe_file, GENERIC_READ );
if (process->exe.file) release_object( process->exe.file ); if (process->exe.file) release_object( process->exe.file );
process->exe.file = file; process->exe.file = file;
@ -903,8 +901,8 @@ DECL_HANDLER(init_process_done)
set_process_startup_state( process, STARTUP_DONE ); set_process_startup_state( process, STARTUP_DONE );
if (req->gui) process->idle_event = create_event( NULL, 0, 1, 0 ); if (req->gui) process->idle_event = create_event( NULL, 0, 1, 0 );
if (current->suspend + current->process->suspend > 0) stop_thread( current ); if (current->suspend + process->suspend > 0) stop_thread( current );
reply->debugged = (current->process->debugger != 0); reply->debugged = (process->debugger != 0);
} }
/* open a handle to a process */ /* open a handle to a process */

9
server/process.h
View File

@ -27,6 +27,9 @@ struct msg_queue;
struct atom_table; struct atom_table;
struct startup_info; struct startup_info;
/* process startup state */
enum startup_state { STARTUP_IN_PROGRESS, STARTUP_DONE, STARTUP_ABORTED };
/* process structures */ /* process structures */
struct process_dll struct process_dll
@ -61,6 +64,7 @@ struct process
int suspend; /* global process suspend count */ int suspend; /* global process suspend count */
int create_flags; /* process creation flags */ int create_flags; /* process creation flags */
struct console_input*console; /* console input */ struct console_input*console; /* console input */
enum startup_state startup_state; /* startup state */
struct startup_info *startup_info; /* startup info while init is in progress */ struct startup_info *startup_info; /* startup info while init is in progress */
struct event *idle_event; /* event for input idle */ struct event *idle_event; /* event for input idle */
struct msg_queue *queue; /* main message queue */ struct msg_queue *queue; /* main message queue */
@ -108,6 +112,9 @@ extern struct process_snapshot *process_snap( int *count );
extern struct module_snapshot *module_snap( struct process *process, int *count ); extern struct module_snapshot *module_snap( struct process *process, int *count );
inline static void *get_process_id( struct process *process ) { return process; } inline static void *get_process_id( struct process *process ) { return process; }
inline static int is_process_init_done( struct process *process ) { return process->exe.base != 0; } inline static int is_process_init_done( struct process *process )
{
return process->startup_state == STARTUP_DONE;
}
#endif /* __WINE_SERVER_PROCESS_H */ #endif /* __WINE_SERVER_PROCESS_H */