[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 10/21: pflocal: include the mig-generated server headers
From: |
Samuel Thibault |
Subject: |
[hurd] 10/21: pflocal: include the mig-generated server headers |
Date: |
Tue, 04 Feb 2014 17:25:27 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 7fb8d6150b57560a7e72f50b4913be11fed0fb97
Author: Justus Winter <address@hidden>
Date: Mon Dec 2 12:11:51 2013 +0100
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.
---
pflocal/pflocal.c | 3 +--
pflocal/sserver.c | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pflocal/pflocal.c b/pflocal/pflocal.c
index d51f721..fcb62d1 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 4ce26b1..7df69a4 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)) ||
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 16/21: Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd, (continued)
- [hurd] 16/21: Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd, Samuel Thibault, 2014/02/04
- [hurd] 15/21: Make pfinet re-open ethernet device on transmission error, Samuel Thibault, 2014/02/04
- [hurd] 13/21: proc: fix the receiver lookup in S_proc_exception_raise, Samuel Thibault, 2014/02/04
- [hurd] 21/21: Merge remote-tracking branch 'upstream/master' into upstream, Samuel Thibault, 2014/02/04
- [hurd] 04/21: libdiskfs: include the mig-generated server headers in demuxer.c, Samuel Thibault, 2014/02/04
- [hurd] 17/21: Also re-open Ethernet device on EMIG_SERVER_DIED, Samuel Thibault, 2014/02/04
- [hurd] 08/21: proc: include the mig-generated server headers in main.c, Samuel Thibault, 2014/02/04
- [hurd] 19/21: Fix crash on fsysopts when pfinet has no IPv6, Samuel Thibault, 2014/02/04
- [hurd] 09/21: pfinet: include the mig-generated server headers in main.c, Samuel Thibault, 2014/02/04
- [hurd] 03/21: trans: fix the receiver lookup in password, Samuel Thibault, 2014/02/04
- [hurd] 10/21: pflocal: include the mig-generated server headers,
Samuel Thibault <=
- [hurd] 07/21: exec: include the mig-generated server headers in main.c, Samuel Thibault, 2014/02/04
- [hurd] 02/21: Rename variables with the name "error" to "err"., Samuel Thibault, 2014/02/04
- [hurd] 20/21: daemons/getty: display /etc/issue if available, Samuel Thibault, 2014/02/04
- [hurd] 01/21: libps: fix task/thread times fetching, Samuel Thibault, 2014/02/04
- [hurd] 11/21: auth: include the mig-generated server headers in auth.c, Samuel Thibault, 2014/02/04
- [hurd] 18/21: pfinet: really deallocate device port, Samuel Thibault, 2014/02/04
- [hurd] 14/21: libnetfs: fix file locking on peropen release, Samuel Thibault, 2014/02/04