[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 49/98: libdiskfs: improve the diskfs_demuxer function
From: |
Samuel Thibault |
Subject: |
[hurd] 49/98: libdiskfs: improve the diskfs_demuxer function |
Date: |
Tue, 14 Jan 2014 02:00:01 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit bbf408117c40f2e02b9d3e23025c01b74f5bdc09
Author: Justus Winter <address@hidden>
Date: Fri Nov 29 13:51:19 2013 +0100
libdiskfs: improve the diskfs_demuxer function
Handle multiple request types as recommended by the Mach Server
Writer's Guide section 4, subsection "Handling Multiple Request
Types". This avoids initializing the reply message in every X_server
function. The reply message has already been properly initialized in
libports, so there is no need to call mig_reply_setup.
Furthermore, move diskfs_exec_startup_server_routine to the end of the
chain, as the startup related functions are only needed at system
bootstrap time in the root filesystem.
* libdiskfs/demuxer.c (diskfs_demuxer): Improve the demuxer function.
---
libdiskfs/demuxer.c | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/libdiskfs/demuxer.c b/libdiskfs/demuxer.c
index 7425dc5..5412f26 100644
--- a/libdiskfs/demuxer.c
+++ b/libdiskfs/demuxer.c
@@ -1,5 +1,5 @@
/* Demultiplexer for diskfs library
- Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1995, 1996, 2013 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -21,20 +21,29 @@ int
diskfs_demuxer (mach_msg_header_t *inp,
mach_msg_header_t *outp)
{
- int diskfs_fs_server (mach_msg_header_t *, mach_msg_header_t *);
- int diskfs_io_server (mach_msg_header_t *, mach_msg_header_t *);
- int diskfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *);
- int diskfs_exec_startup_server (mach_msg_header_t *, mach_msg_header_t *);
- int diskfs_ifsock_server (mach_msg_header_t *, mach_msg_header_t *);
- int diskfs_startup_notify_server (mach_msg_header_t *, mach_msg_header_t *);
-
-
- return (diskfs_io_server (inp, outp)
- || diskfs_fs_server (inp, outp)
- || ports_notify_server (inp, outp)
- || diskfs_fsys_server (inp, outp)
- || diskfs_exec_startup_server (inp, outp)
- || ports_interrupt_server (inp, outp)
- || (diskfs_shortcut_ifsock ? diskfs_ifsock_server (inp, outp) : 0)
- || diskfs_startup_notify_server (inp, outp));
+ mig_routine_t diskfs_io_server_routine (mach_msg_header_t *);
+ mig_routine_t diskfs_fs_server_routine (mach_msg_header_t *);
+ mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
+ mig_routine_t diskfs_fsys_server_routine (mach_msg_header_t *);
+ mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
+ mig_routine_t diskfs_ifsock_server_routine (mach_msg_header_t *);
+ mig_routine_t diskfs_exec_startup_server_routine (mach_msg_header_t *);
+ mig_routine_t diskfs_startup_notify_server_routine (mach_msg_header_t *);
+
+ mig_routine_t routine;
+ if ((routine = diskfs_io_server_routine (inp)) ||
+ (routine = diskfs_fs_server_routine (inp)) ||
+ (routine = ports_notify_server_routine (inp)) ||
+ (routine = diskfs_fsys_server_routine (inp)) ||
+ (routine = ports_interrupt_server_routine (inp)) ||
+ (diskfs_shortcut_ifsock ?
+ (routine = diskfs_ifsock_server_routine (inp)) : 0) ||
+ (routine = diskfs_startup_notify_server_routine (inp)) ||
+ (routine = diskfs_exec_startup_server_routine (inp)))
+ {
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 44/98: libports: improve error reporting in adjust_priority, (continued)
- [hurd] 44/98: libports: improve error reporting in adjust_priority, Samuel Thibault, 2014/01/13
- [hurd] 47/98: libfshelp: improve error handling in fshelp_start_translator_long, Samuel Thibault, 2014/01/13
- [hurd] 46/98: proc: store the device master port in _hurd_device_master, Samuel Thibault, 2014/01/13
- [hurd] 50/98: libnetfs: improve the netfs_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 31/98: fatfs: fix error handling in diskfs_get_directs, Samuel Thibault, 2014/01/13
- [hurd] 51/98: libtrivfs: improve the trivfs_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 24/98: Clean up the included header files, Samuel Thibault, 2014/01/13
- [hurd] 54/98: pfinet: improve the pfinet_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 52/98: exec: improve the exec_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 34/98: mach-defpager: drop all register qualifiers, Samuel Thibault, 2014/01/13
- [hurd] 49/98: libdiskfs: improve the diskfs_demuxer function,
Samuel Thibault <=
- [hurd] 56/98: auth: improve the auth_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 12/98: mach-defpager: remove unused variables, Samuel Thibault, 2014/01/13
- [hurd] 45/98: proc: store the privileged host port in _hurd_host_priv, Samuel Thibault, 2014/01/13
- [hurd] 36/98: libports: fix right leaks when adjusting priorities, Samuel Thibault, 2014/01/13
- [hurd] 65/98: trans: fix the use of the hash table in fakeroot.c, Samuel Thibault, 2014/01/13
- [hurd] 37/98: libshouldbeinlibc: fix minor port leak in maptime_map, Samuel Thibault, 2014/01/13
- [hurd] 38/98: init: fix port leak, Samuel Thibault, 2014/01/13
- [hurd] 68/98: trans: fix locking issue in fakeroot, Samuel Thibault, 2014/01/13
- [hurd] 55/98: pflocal: improve the demuxer functions, Samuel Thibault, 2014/01/13
- [hurd] 57/98: utils: improve the auth_demuxer function in fakeauth.c, Samuel Thibault, 2014/01/13