libpager: use libports notification functions

Now that we do not use sequence numbers anymore, we can simply use
libports notification server functions.

* libpager/Makefile (SRCS): Drop `no-senders.c', and `notify-stubs.c'.
(OBJS): Drop `notifyServer.o'.
* libpager/demuxer.c (pager_demuxer): Use libports server functions.
* libpager/mig-mutate.h: Drop all notification mutators.
* libpager/no-senders.c: Remove file.
* libpager/notify-stubs.c: Likewise.

5 files changed, 5 insertions, 109 deletions

diff --git a/libpager/Makefile b/libpager/Makefile
index 2bfd8450..72b4bfdc 100644
--- a/libpager/Makefile
+++ b/libpager/Makefile
@@ -20,16 +20,16 @@ makemode := library
 libname = libpager
 SRCS = data-request.c data-return.c data-unlock.c pager-port.c \
 	inhibit-term.c lock-completed.c lock-object.c mark-error.c \
-	no-senders.c object-init.c object-terminate.c pagemap.c \
+	object-init.c object-terminate.c pagemap.c \
 	pager-create.c pager-flush.c pager-shutdown.c pager-sync.c \
 	stubs.c demuxer.c chg-compl.c pager-attr.c clean.c \
-	dropweak.c notify-stubs.c get-upi.c pager-memcpy.c pager-return.c \
+	dropweak.c get-upi.c pager-memcpy.c pager-return.c \
 	offer-page.c
 installhdrs = pager.h
 
 HURDLIBS= ports
 LDLIBS += -lpthread
-OBJS = $(SRCS:.c=.o) memory_objectServer.o notifyServer.o
+OBJS = $(SRCS:.c=.o) memory_objectServer.o
 
 MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
 MIGCOMSFLAGS = -prefix _pager_
diff --git a/libpager/demuxer.c b/libpager/demuxer.c
index 57a6ccb9..4dd3cd87 100644
--- a/libpager/demuxer.c
+++ b/libpager/demuxer.c
@@ -22,7 +22,7 @@
 
 #include "priv.h"
 #include "memory_object_S.h"
-#include "notify_S.h"
+#include "libports/notify_S.h"
 #include "queue.h"
 
 /*
@@ -89,7 +89,7 @@ pager_demuxer (struct requests *requests,
 
   mig_routine_t routine;
   if (! ((routine = _pager_memory_object_server_routine (inp)) ||
-	 (routine = _pager_notify_server_routine (inp))))
+	 (routine = ports_notify_server_routine (inp))))
     return FALSE;
 
 #define MASK	(8u - 1u)
diff --git a/libpager/mig-mutate.h b/libpager/mig-mutate.h
index c4f30ce2..66d37cdc 100644
--- a/libpager/mig-mutate.h
+++ b/libpager/mig-mutate.h
@@ -21,12 +21,3 @@
 #define MEMORY_OBJECT_INTRAN_PAYLOAD pager_t begin_using_pager_payload
 #define MEMORY_OBJECT_DESTRUCTOR end_using_pager (pager_t)
 #define MEMORY_OBJECT_IMPORTS import "mig-decls.h";
-
-#define NOTIFY_INTRAN						\
-  port_info_t begin_using_port_info_port (mach_port_t)
-#define NOTIFY_INTRAN_PAYLOAD					\
-  port_info_t begin_using_port_info_payload
-#define NOTIFY_DESTRUCTOR					\
-  end_using_port_info (port_info_t)
-#define NOTIFY_IMPORTS						\
-  import "libports/mig-decls.h";
diff --git a/libpager/no-senders.c b/libpager/no-senders.c
deleted file mode 100644
index b7501018..00000000
--- a/libpager/no-senders.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Called when a nosenders notification happens
-   Copyright (C) 1994, 1995 Free Software Foundation
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-
-#include "priv.h"
-#include <mach/notify.h>
-#include "notify_S.h"
-
-error_t
-_pager_do_mach_notify_no_senders (struct port_info *pi,
-					 mach_port_mscount_t mscount)
-{
-  if (!pi ||
-      pi->class != _pager_class)
-    return EOPNOTSUPP;
-
-  ports_no_senders (pi, mscount);
-
-  return 0;
-}
diff --git a/libpager/notify-stubs.c b/libpager/notify-stubs.c
deleted file mode 100644
index 64408157..00000000
--- a/libpager/notify-stubs.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 
-   Copyright (C) 1995, 2011 Free Software Foundation, Inc.
-   Written by Michael I. Bushnell.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include "priv.h"
-#include "notify_S.h"
-#include <errno.h>
-
-error_t
-_pager_do_mach_notify_port_deleted (struct port_info *pi,
-					   mach_port_t name
-					   __attribute__ ((unused)))
-{
-  return 0;
-}
-
-error_t
-_pager_do_mach_notify_msg_accepted (struct port_info *pi,
-					   mach_port_t name
-					     __attribute__ ((unused)))
-{
-  return 0;
-}
-
-error_t
-_pager_do_mach_notify_port_destroyed (struct port_info *pi,
-					     mach_port_t name
-					       __attribute__ ((unused)))
-{
-  return 0;
-}
-
-error_t
-_pager_do_mach_notify_send_once (struct port_info *pi)
-{
-  return 0;
-}
-
-error_t
-_pager_do_mach_notify_dead_name (struct port_info *pi,
-					mach_port_t name
-					  __attribute__ ((unused)))
-{
-  return 0;
-}