 @@ -1,14 +1,14 @@
-/*      $NetBSD: rumpuser_sp.c,v 1.1 2010/10/27 20:44:50 pooka Exp $	*/
+/*      $NetBSD: rumpuser_sp.c,v 1.2 2010/10/28 14:37:29 pooka Exp $	*/
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -28,27 +28,27 @@
 /*
  * Sysproxy routines.  This provides system RPC support over host sockets.
  * The most notable limitation is that the client and server must share
  * the same ABI.  This does not mean that they have to be the same
  * machine or that they need to run the same version of the host OS,
  * just that they must agree on the data structures.  This even *might*
  * work correctly from one hardware architecture to another.
+ *
  * Not finished yet, i.e. don't use in production.  Lacks locking plus
  * handling of multiple clients and unexpected connection closes.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.1 2010/10/27 20:44:50 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.2 2010/10/28 14:37:29 pooka Exp $");
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 @@ -111,26 +111,27 @@ struct rsp_copydata {
 	void *rcp_addr;
 	uint8_t rcp_data[0];
 };
 /* syscall response */
 struct rsp_sysresp {
 	int rsys_error;
 	register_t rsys_retval[2];
 };
 struct spclient {
 	int spc_fd;
 	struct lwp *spc_lwp;
 	/* incoming */
 	struct rsp_hdr spc_hdr;
 	uint8_t *spc_buf;
 	size_t spc_off;
 #if 0
 	/* outgoing */
 	int spc_obusy;
 	pthread_mutex_t spc_omtx;
 	pthread_cond_t spc_cv;
 #endif
 };
 @@ -302,33 +303,36 @@ send_anonmmap_resp(struct spclient *spc,
 	rhdr.rsp_len = sizeof(rhdr) + sizeof(addr);
 	rhdr.rsp_reqno = reqno;
 	rhdr.rsp_type = RUMPSP_ANONMMAP_RESP;
 	rhdr.rsp_sysnum = 0;
 	dosend(spc, &rhdr, sizeof(rhdr));
 	dosend(spc, &addr, sizeof(addr));
 	return 0;
+}
 static void
-serv_handle_disco(unsigned int idx)
+serv_handledisco(unsigned int idx)
+{
 	struct spclient *spc = &spclist[idx];
 	int fd = spc->spc_fd;
 	DPRINTF(("rump_sp: disconnecting [%u]\n", idx));
 	rump_pub_lwproc_switch(spc->spc_lwp);
 	rump_pub_lwproc_releaselwp();
 	free(spc->spc_buf);
 	memset(spc, 0, sizeof(*spc));
 	close(fd);
 	pfdlist[idx].fd = -1;
 	nfds--;
 	if (idx == maxidx) {
 		while (idx--) {
 			if (pfdlist[idx].fd != -1) {
 				maxidx = idx;
 				break;
+			}
 			assert(idx != 0);
 @@ -359,57 +363,68 @@ serv_handleconn(int fd, connecthook_fn c
 	flags = fcntl(newfd, F_GETFL, 0);
 	if (fcntl(newfd, F_SETFL, flags | O_NONBLOCK) == -1) {
 		close(newfd);
 		return errno;
+	}
 	flags = 1;
 	if ((error = connhook(newfd)) != 0) {
 		close(newfd);
 		return error;
+	}
 	if ((error = rump_pub_lwproc_newproc()) != 0) {
 		close(newfd);
 		return error;
+	}
 	/* find empty slot the simple way */
 	for (i = 0; i < MAXCLI; i++) {
 		if (pfdlist[i].fd == -1)
-		break;
+			break;
+	}
 	assert(i < MAXCLI);
 	nfds++;
 	pfdlist[i].fd = newfd;
 	spclist[i].spc_fd = newfd;
 	spclist[i].spc_lwp = rump_pub_lwproc_curlwp();
 	if (maxidx < i)
 		maxidx = i;
-	DPRINTF(("rump_sp: added new connection at idx %u\n", i));
+	DPRINTF(("rump_sp: added new connection at idx %u, pid %d\n",
 	    i, rump_sys_getpid()));
 	rump_pub_lwproc_switch(NULL);
 	return 0;
+}
 static void
 serv_handlesyscall(struct spclient *spc, struct rsp_hdr *rhdr, uint8_t *data)
+{
 	register_t retval[2];
 	int rv, sysnum;
 	sysnum = (int)rhdr->rsp_sysnum;
 	DPRINTF(("rump_sp: handling syscall %d from client %d\n",
 	    sysnum, 0));
 	pthread_setspecific(spclient_tls, spc);
 	rump_pub_lwproc_switch(spc->spc_lwp);
 	rv = rump_pub_syscall(sysnum, data, retval);
 	rump_pub_lwproc_switch(NULL);
 	pthread_setspecific(spclient_tls, NULL);
 	send_syscall_resp(spc, rhdr->rsp_reqno, rv, retval);
+}
 static int
 readframe(struct spclient *spc)
+{
 	int fd = spc->spc_fd;
 	size_t left;
 	size_t framelen;
 	ssize_t n;
 @@ -802,27 +817,27 @@ spserver(void *arg)
 				continue;
 			seen++;
 			DPRINTF(("rump_sp: activity at [%u] %d/%d\n",
 			    idx, seen, rv));
 			if (idx > 0) {
 				struct spclient *spc = &spclist[idx];
 				DPRINTF(("rump_sp: mainloop read [%u]\n", idx));
 				switch (readframe(spc)) {
 				case 0:
 					break;
 				case -1:
-					serv_handle_disco(idx);
+					serv_handledisco(idx);
 					break;
 				default:
 					spc->spc_off = 0;
 					serv_handlesyscall(spc,
 					    &spc->spc_hdr, spc->spc_buf);
 					spc->spc_buf = NULL;
 					break;
+				}
 			} else {
 				DPRINTF(("rump_sp: mainloop new connection\n"));
 				serv_handleconn(pfdlist[0].fd,
 				    sarg->sps_connhook);
+			}