Rebase against 0ae1669ec2798193b11fd2d2ac74d51203f673b2.

This commit is contained in:
Alistair Leslie-Hughes
2021-03-12 10:33:43 +11:00
parent acc0de4def
commit 5bcba4ef5a
4 changed files with 20 additions and 20 deletions

View File

@@ -1,4 +1,4 @@
From e3bc0f8b38f7f68fe132db47a0fc239af4843181 Mon Sep 17 00:00:00 2001
From f2dc92d71f8d78d6396c6c98010d4709696ac43c Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 6 Jul 2020 15:11:12 -0500
Subject: [PATCH] server: Create eventfd file descriptors for process objects.
@@ -49,7 +49,7 @@ index 7ca4ca89394..6a0a367124d 100644
void esync_init(void);
+int esync_create_fd( int initval, int flags );
diff --git a/server/process.c b/server/process.c
index e95c33132e6..7cf8953f47e 100644
index af7aef0cdac..0be707404f4 100644
--- a/server/process.c
+++ b/server/process.c
@@ -49,6 +49,7 @@
@@ -77,7 +77,7 @@ index e95c33132e6..7cf8953f47e 100644
no_satisfied, /* satisfied */
no_signal, /* signal */
no_get_fd, /* get_fd */
@@ -553,6 +555,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
@@ -555,6 +557,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
process->trace_data = 0;
process->rawinput_mouse = NULL;
process->rawinput_kbd = NULL;
@@ -96,9 +96,9 @@ index e95c33132e6..7cf8953f47e 100644
return process;
@@ -655,6 +661,7 @@ static void process_destroy( struct object *obj )
if (process->id) free_ptid( process->id );
if (process->token) release_object( process->token );
free( process->dir_cache );
free( process->image );
+ if (do_esync()) close( process->esync_fd );
}
@@ -118,10 +118,10 @@ index e95c33132e6..7cf8953f47e 100644
{
access = default_map_access( obj, access );
diff --git a/server/process.h b/server/process.h
index caab869c8a0..afa90581b97 100644
index 0997a759330..638497857b3 100644
--- a/server/process.h
+++ b/server/process.h
@@ -95,6 +95,7 @@ struct process
@@ -87,6 +87,7 @@ struct process
const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */
const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */
struct list kernel_object; /* list of kernel object pointers */
@@ -130,5 +130,5 @@ index caab869c8a0..afa90581b97 100644
#define CPU_FLAG(cpu) (1 << (cpu))
--
2.20.1
2.30.1