Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
46d7fa48
Commit
46d7fa48
authored
Jan 15, 2007
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Properly wake the waiting threads when an APC is cancelled.
parent
0df37dd9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
4 deletions
+23
-4
thread.c
server/thread.c
+23
-4
No files found.
server/thread.c
View file @
46d7fa48
...
...
@@ -77,6 +77,7 @@ struct thread_apc
static
void
dump_thread_apc
(
struct
object
*
obj
,
int
verbose
);
static
int
thread_apc_signaled
(
struct
object
*
obj
,
struct
thread
*
thread
);
static
void
clear_apc_queue
(
struct
list
*
queue
);
static
const
struct
object_ops
thread_apc_ops
=
{
...
...
@@ -102,7 +103,6 @@ static int thread_signaled( struct object *obj, struct thread *thread );
static
unsigned
int
thread_map_access
(
struct
object
*
obj
,
unsigned
int
access
);
static
void
thread_poll_event
(
struct
fd
*
fd
,
int
event
);
static
void
destroy_thread
(
struct
object
*
obj
);
static
struct
thread_apc
*
thread_dequeue_apc
(
struct
thread
*
thread
,
int
system_only
);
static
const
struct
object_ops
thread_ops
=
{
...
...
@@ -227,9 +227,9 @@ static void thread_poll_event( struct fd *fd, int event )
static
void
cleanup_thread
(
struct
thread
*
thread
)
{
int
i
;
struct
thread_apc
*
apc
;
while
((
apc
=
thread_dequeue_apc
(
thread
,
0
)))
release_object
(
apc
);
clear_apc_queue
(
&
thread
->
system_apc
);
clear_apc_queue
(
&
thread
->
user_apc
);
free
(
thread
->
req_data
);
free
(
thread
->
reply_data
);
if
(
thread
->
request_fd
)
release_object
(
thread
->
request_fd
);
...
...
@@ -709,12 +709,14 @@ void thread_cancel_apc( struct thread *thread, struct object *owner, enum apc_ty
{
if
(
apc
->
owner
!=
owner
)
continue
;
list_remove
(
&
apc
->
entry
);
apc
->
executed
=
1
;
wake_up
(
&
apc
->
obj
,
0
);
release_object
(
apc
);
return
;
}
}
/* remove the head apc from the queue; the returned
pointer must be fre
ed by the caller */
/* remove the head apc from the queue; the returned
object must be releas
ed by the caller */
static
struct
thread_apc
*
thread_dequeue_apc
(
struct
thread
*
thread
,
int
system_only
)
{
struct
thread_apc
*
apc
=
NULL
;
...
...
@@ -729,6 +731,21 @@ static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_
return
apc
;
}
/* clear an APC queue, cancelling all the APCs on it */
static
void
clear_apc_queue
(
struct
list
*
queue
)
{
struct
list
*
ptr
;
while
((
ptr
=
list_head
(
queue
)))
{
struct
thread_apc
*
apc
=
LIST_ENTRY
(
ptr
,
struct
thread_apc
,
entry
);
list_remove
(
&
apc
->
entry
);
apc
->
executed
=
1
;
wake_up
(
&
apc
->
obj
,
0
);
release_object
(
apc
);
}
}
/* add an fd to the inflight list */
/* return list index, or -1 on error */
int
thread_add_inflight_fd
(
struct
thread
*
thread
,
int
client
,
int
server
)
...
...
@@ -1108,6 +1125,8 @@ DECL_HANDLER(get_apc)
* wake up a thread, but since we got here the thread woke up already.
*/
if
(
apc
->
call
.
type
!=
APC_NONE
)
break
;
apc
->
executed
=
1
;
wake_up
(
&
apc
->
obj
,
0
);
release_object
(
apc
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment