diff --git a/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch b/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch index 70943b5a..d94913bd 100644 --- a/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch +++ b/patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch @@ -1,4 +1,4 @@ -From 846f2603e9d2a3a3b5a56b0e1140bb49a95053a6 Mon Sep 17 00:00:00 2001 +From ec18233558b62aa736b5ecf20d2f7487e2823286 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 7 Jun 2018 20:09:59 -0500 Subject: [PATCH] server: Create server objects for eventfd-based @@ -15,7 +15,7 @@ Subject: [PATCH] server: Create server objects for eventfd-based create mode 100644 server/esync.h diff --git a/server/Makefile.in b/server/Makefile.in -index c81a2112632..da20dff9f56 100644 +index 3b9446fe224..776faec63e4 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ @@ -28,7 +28,7 @@ index c81a2112632..da20dff9f56 100644 file.c \ diff --git a/server/esync.c b/server/esync.c new file mode 100644 -index 00000000000..b9dbfa322bc +index 00000000000..35b4833fd4c --- /dev/null +++ b/server/esync.c @@ -0,0 +1,318 @@ @@ -158,7 +158,7 @@ index 00000000000..b9dbfa322bc + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ -+ no_map_access, /* map_access */ ++ default_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + default_get_full_name, /* get_full_name */ @@ -403,10 +403,10 @@ index a134d811d82..3436b0871b4 100644 set_current_time(); init_scheduler(); diff --git a/server/protocol.def b/server/protocol.def -index 6bfcda213a4..6b0e0e6f6e4 100644 +index 99df502e398..9e15ada5bd0 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -3738,7 +3738,6 @@ struct handle_info +@@ -3777,7 +3777,6 @@ struct handle_info obj_handle_t handle; /* process handle */ @END @@ -414,7 +414,7 @@ index 6bfcda213a4..6b0e0e6f6e4 100644 /* Iterate thread list for process */ @REQ(get_next_thread) obj_handle_t process; /* process handle */ -@@ -3749,3 +3748,27 @@ struct handle_info +@@ -3788,3 +3787,27 @@ struct handle_info @REPLY obj_handle_t handle; /* next thread handle */ @END @@ -443,5 +443,5 @@ index 6bfcda213a4..6b0e0e6f6e4 100644 + unsigned int shm_idx; +@END -- -2.35.1 +2.38.1 diff --git a/patches/eventfd_synchronization/0032-server-Implement-esync_map_access.patch b/patches/eventfd_synchronization/0032-server-Implement-esync_map_access.patch index 8c443920..ecaa5091 100644 --- a/patches/eventfd_synchronization/0032-server-Implement-esync_map_access.patch +++ b/patches/eventfd_synchronization/0032-server-Implement-esync_map_access.patch @@ -1,4 +1,4 @@ -From 161ae4c64b5e3bd33771671f518c482a6a66700b Mon Sep 17 00:00:00 2001 +From 614c13aed3d20a772c3ccd26547fa93a56fcc40b Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sun, 10 Jun 2018 19:08:18 -0500 Subject: [PATCH] server: Implement esync_map_access(). @@ -8,10 +8,10 @@ Subject: [PATCH] server: Implement esync_map_access(). 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/server/esync.c b/server/esync.c -index 1703608263f..20f149cdad3 100644 +index eca9b6aa67d..3a334b3b330 100644 --- a/server/esync.c +++ b/server/esync.c -@@ -114,6 +114,7 @@ struct esync +@@ -112,6 +112,7 @@ struct esync }; static void esync_dump( struct object *obj, int verbose ); @@ -19,16 +19,16 @@ index 1703608263f..20f149cdad3 100644 static void esync_destroy( struct object *obj ); const struct object_ops esync_ops = -@@ -128,7 +129,7 @@ const struct object_ops esync_ops = +@@ -126,7 +127,7 @@ const struct object_ops esync_ops = NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -- no_map_access, /* map_access */ +- default_map_access, /* map_access */ + esync_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ default_get_full_name, /* get_full_name */ -@@ -148,6 +149,16 @@ static void esync_dump( struct object *obj, int verbose ) +@@ -146,6 +147,16 @@ static void esync_dump( struct object *obj, int verbose ) fprintf( stderr, "esync fd=%d\n", esync->fd ); } @@ -46,5 +46,5 @@ index 1703608263f..20f149cdad3 100644 { struct esync *esync = (struct esync *)obj; -- -2.28.0 +2.38.1