summaryrefslogtreecommitdiff
path: root/pflocal
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2013-12-02 12:11:51 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-01-20 10:37:00 +0100
commit7fb8d6150b57560a7e72f50b4913be11fed0fb97 (patch)
tree26464e1ce3c054d09afaec8b4770449e97acd0c6 /pflocal
parent2634719587458febd3e307eecf1a99428279778f (diff)
pflocal: include the mig-generated server headers
GNU MIG recently gained support for emitting x_server_routine declarations in the generated server header file. Using this declaration, the x_server_routine functions can be inlined into the demuxer function. * pflocal/demuxer.c: Include the mig-generated server headers. * pflocal/sserver.c: Likewise.
Diffstat (limited to 'pflocal')
-rw-r--r--pflocal/pflocal.c3
-rw-r--r--pflocal/sserver.c10
2 files changed, 6 insertions, 7 deletions
diff --git a/pflocal/pflocal.c b/pflocal/pflocal.c
index d51f721e..fcb62d1d 100644
--- a/pflocal/pflocal.c
+++ b/pflocal/pflocal.c
@@ -46,13 +46,12 @@ int trivfs_protid_nportclasses = 1;
int trivfs_cntl_nportclasses = 1;
/* ---------------------------------------------------------------- */
+#include "socket_S.h"
/* A demuxer to separate out pf-level operations on our node. */
static int
pf_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
{
- mig_routine_t socket_server_routine (mach_msg_header_t *);
-
mig_routine_t routine;
if ((routine = socket_server_routine (inp)) ||
(routine = NULL, trivfs_demuxer (inp, outp)))
diff --git a/pflocal/sserver.c b/pflocal/sserver.c
index 4ce26b13..7df69a41 100644
--- a/pflocal/sserver.c
+++ b/pflocal/sserver.c
@@ -32,15 +32,15 @@ struct port_bucket *sock_port_bucket;
static int sock_server_active = 0;
static pthread_spinlock_t sock_server_active_lock = PTHREAD_SPINLOCK_INITIALIZER;
+#include "io_S.h"
+#include "socket_S.h"
+#include "../libports/interrupt_S.h"
+#include "../libports/notify_S.h"
+
/* A demuxer for socket operations. */
static int
sock_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
{
- mig_routine_t io_server_routine (mach_msg_header_t *);
- mig_routine_t socket_server_routine (mach_msg_header_t *);
- mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
- mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
-
mig_routine_t routine;
if ((routine = io_server_routine (inp)) ||
(routine = socket_server_routine (inp)) ||