1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From 0437af60d3bbf09003f3fd1fdb9993958fcd430d Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Thu, 29 Oct 2015 15:43:28 +0100
Subject: [PATCH hurd 1/3] trans: improve demuxers
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.
* trans/proxy-defpager.c (proxy_defpager_demuxer): Improve the demuxer
function.
* trans/streamio.c (demuxer): Likewise.
---
trans/proxy-defpager.c | 14 ++++++++++----
trans/streamio.c | 15 +++++++++++----
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 662f269..4fdeb35 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -236,10 +236,16 @@ int
proxy_defpager_demuxer (mach_msg_header_t *inp,
mach_msg_header_t *outp)
{
- extern int default_pager_server (mach_msg_header_t *, mach_msg_header_t *);
-
- return default_pager_server (inp, outp)
- || trivfs_demuxer (inp, outp);
+ mig_routine_t routine;
+ if ((routine = default_pager_server_routine (inp)) ||
+ (routine = NULL, trivfs_demuxer (inp, outp)))
+ {
+ if (routine)
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
int
diff --git a/trans/streamio.c b/trans/streamio.c
index 54627b7..507250b 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -36,6 +36,7 @@
#include "libtrivfs/trivfs_fs_S.h"
#include "libtrivfs/trivfs_io_S.h"
+#include "device_reply_S.h"
/* The global lock */
pthread_mutex_t global_lock;
@@ -273,10 +274,16 @@ static const struct argp argp = { options, parse_opt, args_doc, doc };
int
demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
{
- extern int device_reply_server (mach_msg_header_t *, mach_msg_header_t *);
-
- return (trivfs_demuxer (inp, outp)
- || device_reply_server (inp, outp));
+ mig_routine_t routine;
+ if ((routine = NULL, trivfs_demuxer (inp, outp)) ||
+ (routine = device_reply_server_routine (inp)))
+ {
+ if (routine)
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
int
--
2.1.4
|
