Added support for dumping variable-size data of server replies.

include/server.h

@@ -53,6 +53,7 @@ struct new_process_request
     int          hstdin;       /* handle for stdin */
     int          hstdout;      /* handle for stdout */
     int          hstderr;      /* handle for stderr */
+    int          cmd_show;     /* main window show mode */
     void*        env_ptr;      /* pointer to environment (FIXME: hack) */
     char         cmd_line[0];  /* command line */
 };
@@ -95,7 +96,9 @@ struct init_process_reply
     int          hstdin;       /* handle for stdin */
     int          hstdout;      /* handle for stdout */
     int          hstderr;      /* handle for stderr */
+    int          cmd_show;     /* main window show mode */
     void*        env_ptr;      /* pointer to environment (FIXME: hack) */
+    char         cmdline[0];   /* command line */
 };
 
 
@@ -285,12 +288,12 @@ struct select_request
     int          count;        /* handles count */
     int          flags;        /* wait flags (see below) */
     int          timeout;      /* timeout in ms */
-    /* int handles[] */
+    int          handles[0];   /* handles to select on */
 };
 struct select_reply
 {
     int          signaled;     /* signaled handle */
-/*  void*        apcs[]; */    /* async procedures to call */
+    void*        apcs[0];      /* async procedures to call */
 };
 #define SELECT_ALL       1
 #define SELECT_ALERTABLE 2

server/process.c

@@ -97,7 +97,7 @@ struct process *create_initial_process(void)
 }
 
 /* create a new process */
-static struct process *create_process( struct new_process_request *req )
+static struct process *create_process( struct new_process_request *req, const char *cmd_line )
 {
     struct process *process = NULL;
     struct process *parent = current->process;
@@ -110,8 +110,9 @@ static struct process *create_process( struct new_process_request *req )
     }
     init_process( process );
 
-    if (!(process->info = mem_alloc( sizeof(*process->info) ))) goto error;
+    if (!(process->info = mem_alloc( sizeof(*process->info) + strlen(cmd_line) + 1 ))) goto error;
     memcpy( process->info, req, sizeof(*req) );
+    strcpy( process->info->cmd_line, cmd_line );
 
     /* set the process console */
     if (req->create_flags & CREATE_NEW_CONSOLE)
@@ -202,21 +203,6 @@ struct process *get_process_from_handle( int handle, unsigned int access )
                                              access, &process_ops );
 }
 
-/* retrieve the initialization info for a new process */
-static int get_process_init_info( struct process *process, struct init_process_reply *reply )
-{
-    struct new_process_request *info;
-    if (!(info = process->info)) return 0;
-    process->info = NULL;
-    reply->start_flags = info->start_flags;
-    reply->hstdin      = info->hstdin;
-    reply->hstdout     = info->hstdout;
-    reply->hstderr     = info->hstderr;
-    reply->env_ptr     = info->env_ptr;
-    free( info );
-    return 1;
-}
-
 /* a process has been killed (i.e. its last thread died) */
 static void process_killed( struct process *process, int exit_code )
 {
@@ -377,8 +363,10 @@ DECL_HANDLER(new_process)
 {
     struct new_process_reply reply;
     struct process *process;
+    char *cmd_line = (char *)data;
 
-    if ((process = create_process( req )))
+    CHECK_STRING( "new_process", cmd_line, len );
+    if ((process = create_process( req, cmd_line )))
     {
         reply.pid    = process;
         reply.handle = alloc_handle( current->process, process,
@@ -397,17 +385,28 @@ DECL_HANDLER(new_process)
 DECL_HANDLER(init_process)
 {
     struct init_process_reply reply;
+    struct new_process_request *info;
+
     if (current->state != RUNNING)
     {
         fatal_protocol_error( "init_process: init_thread not called yet\n" );
         return;
     }
-    if (!get_process_init_info( current->process, &reply ))
+    if (!(info = current->process->info))
     {
         fatal_protocol_error( "init_process: called twice\n" );
         return;
     }
-    send_reply( current, -1, 1, &reply, sizeof(reply) );
+    current->process->info = NULL;
+    reply.start_flags = info->start_flags;
+    reply.hstdin      = info->hstdin;
+    reply.hstdout     = info->hstdout;
+    reply.hstderr     = info->hstderr;
+    reply.cmd_show    = info->cmd_show;
+    reply.env_ptr     = info->env_ptr;
+    send_reply( current, -1, 2, &reply, sizeof(reply),
+                info->cmd_line, strlen(info->cmd_line) + 1 );
+    free( info );
 }
 
 /* open a handle to a process */

tools/make_requests

@@ -11,10 +11,12 @@
     "int"          => "%d",
     "long"         => "%ld",
     "char"         => "%c",
-    "char[0]"      => "\\\"%.*s\\\"",
     "unsigned int" => "%08x",
     "void*"        => "%p",
-    "time_t"       => "%ld"
+    "time_t"       => "%ld",
+    "char[0]"      => "dump_chars",
+    "int[0]"       => "dump_ints",
+    "void*[0]"     => "dump_ptrs"
 );
 
 my @requests = ();
@@ -34,6 +36,40 @@ print TRACE <<EOF;
 #include <sys/uio.h>
 #include "server.h"
 #include "thread.h"
+
+static int dump_chars( void *ptr, int len )
+{
+    fprintf( stderr, "\\\"%.*s\\\"", len, (char *)ptr );
+    return len;
+}
+
+static int dump_ints( void *ptr, int len )
+{
+    int i;
+    if (!(len /= sizeof(int)))
+    {
+        fprintf( stderr, "{}" );
+        return 0;
+    }
+    for (i = 0; i < len; i++)
+        fprintf( stderr, "%c%d", i ? ',' : '{', *((int *)ptr + i) );
+    fprintf( stderr, "}" );
+    return len * sizeof(int);
+}
+
+static int dump_ptrs( void *ptr, int len )
+{
+    int i;
+    if (!(len /= sizeof(void*)))
+    {
+        fprintf( stderr, "{}" );
+        return 0;
+    }
+    for (i = 0; i < len; i++)
+        fprintf( stderr, "%c%p", i ? ',' : '{', *((void **)ptr + i) );
+    fprintf( stderr, "}" );
+    return len * sizeof(void*);
+}
 EOF
 
 ### Parse server.h to find request/reply structure definitions
@@ -46,29 +82,22 @@ while (<SERVER>)
 
 ### Output the dumping function tables
 
-print TRACE<<EOF;
-
-struct dumper
-{
-    int (*dump_req)( void *data, int len );
-    void (*dump_reply)( void *data );
-};
-
-static const struct dumper dumpers[REQ_NB_REQUESTS] =
+print TRACE "typedef int (*dump_func)( void *req, int len );\n\n";
+print TRACE "static const dump_func req_dumpers[REQ_NB_REQUESTS] = {\n";
+foreach $req (@requests)
 {
-EOF
+    print TRACE "    (dump_func)dump_${req}_request,\n";
+}
+print TRACE "};\n\n";
 
+print TRACE "static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {\n";
 foreach $req (@requests)
 {
-    $request = $req . "_request";
-    $reply = $replies{$req} ? "dump_${req}_reply" : "0";
-    print TRACE "    { (int(*)(void *,int))dump_$request,\n";
-    print TRACE "      (void(*)())$reply },\n";
+    print TRACE "    (dump_func)", $replies{$req} ? "dump_${req}_reply,\n" : "0,\n";
 }
+print TRACE "};\n\n";
 
 print TRACE <<EOF;
-};
-
 static const char * const req_names[REQ_NB_REQUESTS] =
 {
 EOF
@@ -87,7 +116,7 @@ void trace_request( enum request req, void *data, int len, int fd )
     int size;
     current->last_req = req;
     fprintf( stderr, "%08x: %s(", (unsigned int)current, req_names[req] );
-    size = dumpers[req].dump_req( data, len );
+    size = req_dumpers[req]( data, len );
     if ((len -= size) > 0)
     {
         unsigned char *ptr = (unsigned char *)data + size;
@@ -111,24 +140,26 @@ void trace_kill( int exit_code )
 void trace_reply( struct thread *thread, int type, int pass_fd,
                   struct iovec *vec, int veclen )
 {
+    static char buffer[MAX_MSG_LENGTH];
+
     if (!thread) return;
     fprintf( stderr, "%08x: %s() = %d",
              (unsigned int)thread, req_names[thread->last_req], type );
     if (veclen)
     {
+        char *p = buffer;
+        int len;
+        for (; veclen; veclen--, vec++)
+        {
+            memcpy( p, vec->iov_base, vec->iov_len );
+            p += vec->iov_len;
+        }
 	fprintf( stderr, " {" );
-	if (dumpers[thread->last_req].dump_reply)
-	{
-	    dumpers[thread->last_req].dump_reply( vec->iov_base );
-	    vec++;
-	    veclen--;
-	}
-	for (; veclen; veclen--, vec++)
-	{
-	    unsigned char *ptr = vec->iov_base;
-	    int len = vec->iov_len;
-	    while (len--) fprintf( stderr, ", %02x", *ptr++ );
-	}
+        len = p - buffer;
+	if (reply_dumpers[thread->last_req])
+	    len -= reply_dumpers[thread->last_req]( buffer, len );
+        p -= len;
+        while (len--) fprintf( stderr, ", %02x", *p++ );
 	fprintf( stderr, " }" );
     }
     if (pass_fd != -1) fprintf( stderr, " fd=%d\\n", pass_fd );
@@ -238,18 +269,20 @@ sub DO_DUMP_FUNC
     {
 	my $type = shift;
 	my $var = shift;
-	print TRACE "    fprintf( stderr, \" $var=$formats{$type}";
-	print TRACE "," if ($#_ > 0);
-	print TRACE "\", ";
-	if ($type =~ s/\[0\]$//g)  # vararg type?
+	if ($type =~ /\[0\]$/)  # vararg type?
 	{
 	    $vararg = 1;
-	    print TRACE "len - (int)sizeof(*req), ($type *)(req+1) );\n";
+	    print TRACE "    fprintf( stderr, \" $var=\" );\n";
+	    print TRACE "    return $formats{$type}( req+1, len - (int)sizeof(*req) ) + sizeof(*req);\n";
 	}
 	else
 	{
+	    print TRACE "    fprintf( stderr, \" $var=$formats{$type}";
+	    print TRACE "," if ($#_ > 0);
+	    print TRACE "\", ";
 	    print TRACE "req->$var );\n";
         }
     }
-    print TRACE "    return ", $vararg ? "len" : "(int)sizeof(*req)", ";\n}\n";
+    print TRACE "    return (int)sizeof(*req);\n" unless $vararg;
+    print TRACE "}\n";
 }