Re: [PATCH 1/4] term: improve the demuxer

[Samuel Thibault]

Justus Winter, le Wed 11 Jun 2014 13:41:07 +0200, a écrit :
> 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.
> 
> * term/main.c (demuxer): Improve the demuxer function.

Ack.

> ---
>  term/main.c | 24 ++++++++++++++++--------
>  1 file changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/term/main.c b/term/main.c
> index 9cc32d4..be014e1 100644
> --- a/term/main.c
> +++ b/term/main.c
> @@ -32,6 +32,10 @@
>  
>  #include <version.h>
>  
> +#include "term_S.h"
> +#include "tioctl_S.h"
> +#include "device_reply_S.h"
> +
>  const char *argp_program_version = STANDARD_HURD_VERSION (term);
>  
>  int trivfs_fstype = FSTYPE_TERM;
> @@ -61,14 +65,18 @@ dev_t rdev;
>  int
>  demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
>  {
> -  extern int term_server (mach_msg_header_t *, mach_msg_header_t *);
> -  extern int tioctl_server (mach_msg_header_t *, mach_msg_header_t *);
> -  extern int device_reply_server (mach_msg_header_t *, mach_msg_header_t *);
> -
> -  return (trivfs_demuxer (inp, outp)
> -       || term_server (inp, outp)
> -       || tioctl_server (inp, outp)
> -       || device_reply_server (inp, outp));
> +  mig_routine_t routine;
> +  if ((routine = NULL, trivfs_demuxer (inp, outp)) ||
> +      (routine = term_server_routine (inp)) ||
> +      (routine = tioctl_server_routine (inp)) ||
> +      (routine = device_reply_server_routine (inp)))
> +    {
> +      if (routine)
> +        (*routine) (inp, outp);
> +      return TRUE;
> +    }
> +  else
> +    return FALSE;
>  }
>  
>  static struct argp_option options[] =
> -- 
> 2.0.0
> 

-- 
Samuel
<r> make
<r> oops
<m> make clean