X-Git-Url: http://git.alex.org.uk

diff --git a/nbd-tester-client.c b/nbd-tester-client.c
index cecddf7..3169ab1 100644
--- a/nbd-tester-client.c
+++ b/nbd-tester-client.c
@@ -24,20 +24,24 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <glib.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <syslog.h>
 #include <unistd.h>
 #include "config.h"
 #include "lfs.h"
 #define MY_NAME "nbd-tester-client"
 #include "cliserv.h"
 
+#include <netinet/in.h>
+#include <glib.h>
+
 static gchar errstr[1024];
 const static int errstr_len=1024;
 
+static uint64_t size;
+
 typedef enum {
 	CONNECTION_TYPE_NONE,
 	CONNECTION_TYPE_CONNECT,
@@ -67,12 +71,14 @@ inline int read_all(int f, void *buf, size_t len) {
 	return retval;
 }
 
-int setup_connection(gchar *hostname, int port, CONNECTION_TYPE ctype) {
+int setup_connection(gchar *hostname, int port, gchar* name, CONNECTION_TYPE ctype) {
 	int sock;
 	struct hostent *host;
 	struct sockaddr_in addr;
 	char buf[256];
+	uint64_t mymagic = (name ? opts_magic : cliserv_magic);
 	u64 tmp64;
+	uint32_t tmp32 = 0;
 
 	sock=0;
 	if(ctype<CONNECTION_TYPE_CONNECT)
@@ -116,20 +122,34 @@ int setup_connection(gchar *hostname, int port, CONNECTION_TYPE ctype) {
 		goto err_open;
 	}
 	tmp64=ntohll(tmp64);
-	if(tmp64 != cliserv_magic) {
-		strncpy(errstr, "cliserv_magic does not match", errstr_len);
+	if(tmp64 != mymagic) {
+		strncpy(errstr, "mymagic does not match", errstr_len);
 		goto err_open;
 	}
 	if(ctype<CONNECTION_TYPE_FULL)
 		goto end;
-	/* The information we get now contains information on sizes. If
-	 * we're here, that means we want a 'working' connection, but
-	 * we're not interested in the sizes. So, read them but throw
-	 * the values away. We need to read the size of the device (a
-	 * 64bit integer) plus the reserved fields (128 bytes; should
-	 * all be zeroes).
-	 */
-	read_all(sock, buf, sizeof(tmp64)+128);
+	if(!name) {
+		read_all(sock, &size, sizeof(size));
+		size=ntohll(size);
+		read_all(sock, buf, 128);
+		goto end;
+	}
+	/* flags */
+	read_all(sock, buf, sizeof(uint16_t));
+	/* reserved field */
+	write(sock, &tmp32, sizeof(tmp32));
+	/* magic */
+	tmp64 = htonll(opts_magic);
+	write(sock, &tmp64, sizeof(tmp64));
+	/* name */
+	tmp32 = htonl(NBD_OPT_EXPORT_NAME);
+	write(sock, &tmp32, sizeof(tmp32));
+	tmp32 = htonl((uint32_t)strlen(name));
+	write(sock, &tmp32, sizeof(tmp32));
+	write(sock, name, strlen(name));
+	read_all(sock, &size, sizeof(size));
+	size = ntohll(size);
+	read_all(sock, buf, sizeof(uint16_t)+124);
 	goto end;
 err_open:
 	close(sock);
@@ -177,12 +197,12 @@ int read_packet_check_header(int sock, size_t datasize, long long int curhandle)
 	rep.magic=ntohl(rep.magic);
 	rep.error=ntohl(rep.error);
 	if(rep.magic!=NBD_REPLY_MAGIC) {
-		snprintf(errstr, errstr_len, "Received package with incorrect reply_magic. Index of sent packages is %lld (0x%llX), received handle is %lld (0x%llX). Received magic 0x%lX, expected 0x%lX", curhandle, curhandle, *((u64*)rep.handle), *((u64*)rep.handle), rep.magic, NBD_REPLY_MAGIC);
+		snprintf(errstr, errstr_len, "Received package with incorrect reply_magic. Index of sent packages is %lld (0x%llX), received handle is %lld (0x%llX). Received magic 0x%lX, expected 0x%lX", curhandle, curhandle, *((u64*)rep.handle), *((u64*)rep.handle), (long unsigned int)rep.magic, (long unsigned int)NBD_REPLY_MAGIC);
 		retval=-1;
 		goto end;
 	}
 	if(rep.error) {
-		snprintf(errstr, errstr_len, "Received error from server: %ld (0x%lX). Handle is %lld (0x%llX).", rep.error, *((u64*)rep.handle), *((u64*)rep.handle));
+		snprintf(errstr, errstr_len, "Received error from server: %ld (0x%lX). Handle is %lld (0x%llX).", (long int)rep.error, (long unsigned int)rep.error, (long long int)(*((u64*)rep.handle)), *((u64*)rep.handle));
 		retval=-1;
 		goto end;
 	}
@@ -192,51 +212,45 @@ end:
 	return retval;
 }
 
-int throughput_test(gchar* hostname, int port, int sock, char sock_is_open, char close_sock) {
+int throughput_test(gchar* hostname, int port, char* name, int sock, char sock_is_open, char close_sock) {
 	long long int i;
 	char buf[1024];
 	struct nbd_request req;
-	u64 size;
 	int requests=0;
 	fd_set set;
 	struct timeval tv;
+	struct timeval start;
+	struct timeval stop;
+	float timespan;
+	int speed;
+	char speedchar[2] = { '\0', '\0' };
 	int retval=0;
 	size_t tmp;
 	signed int do_write=TRUE;
+	pid_t mypid = getpid();
 
+	size=0;
 	if(!sock_is_open) {
-		if((sock=setup_connection(hostname, port, CONNECTION_TYPE_CLISERV))<0) {
+		if((sock=setup_connection(hostname, port, name, CONNECTION_TYPE_FULL))<0) {
 			g_warning("Could not open socket: %s", errstr);
 			retval=-1;
 			goto err;
 		}
-	} else {
-		/* Assume the file is at least 4k in size. Not much of a test
-		 * this way, but, well. */
-		size=4096;
 	}
-	size=0;
-	if((tmp=read_all(sock, &size, sizeof(u64)))<0) {
-		retval=-1;
-		snprintf(errstr, errstr_len, "Could not read from socket: %s", strerror(errno));
-		goto err_open;
-	}
-	if(tmp==0) {
-		retval=-1;
-		snprintf(errstr, errstr_len, "Server closed connection unexpectedly when trying to read size of device in throughput test");
-		goto err;
-	}
-	read_all(sock,&buf,128);
-	size=ntohll(size);
 	req.magic=htonl(NBD_REQUEST_MAGIC);
 	req.type=htonl(NBD_CMD_READ);
 	req.len=htonl(1024);
+	if(gettimeofday(&start, NULL)<0) {
+		retval=-1;
+		snprintf(errstr, errstr_len, "Could not measure start time: %s", strerror(errno));
+		goto err_open;
+	}
 	for(i=0;i+1024<=size;i+=1024) {
 		if(do_write) {
-			*((u64*)req.handle)=i;
+			memcpy(&(req.handle),&i,sizeof(i));
 			req.from=htonll(i);
 			write(sock, &req, sizeof(req));
-			printf("Requests(+): %d\n", ++requests);
+			printf("%d: Requests(+): %d\n", (int)mypid, ++requests);
 		}
 		do {
 			FD_ZERO(&set);
@@ -251,7 +265,7 @@ int throughput_test(gchar* hostname, int port, int sock, char sock_is_open, char
 					retval=-1;
 					goto err_open;
 				}
-				printf("Requests(-): %d\n", --requests);
+				printf("%d: Requests(-): %d\n", (int)mypid, --requests);
 			}
 		} while FD_ISSET(sock, &set);
 		/* Now wait until we can write again or until a second have
@@ -279,9 +293,29 @@ int throughput_test(gchar* hostname, int port, int sock, char sock_is_open, char
 			/* Okay, there's something ready for
 			 * reading here */
 			read_packet_check_header(sock, 1024, i);
-			printf("Requests(-): %d\n", --requests);
+			printf("%d: Requests(-): %d\n", (int)mypid, --requests);
 		}
 	} while (requests);
+	if(gettimeofday(&stop, NULL)<0) {
+		retval=-1;
+		snprintf(errstr, errstr_len, "Could not measure end time: %s", strerror(errno));
+		goto err_open;
+	}
+	timespan=(float)(stop.tv_sec-start.tv_sec+(stop.tv_usec-start.tv_usec))/(float)1000000;
+	speed=(int)(size/timespan);
+	if(speed>1024) {
+		speed>>=10;
+		speedchar[0]='K';
+	}
+	if(speed>1024) {
+		speed>>=10;
+		speedchar[0]='M';
+	}
+	if(speed>1024) {
+		speed>>=10;
+		speedchar[0]='G';
+	}
+	g_message("%d: Throughput test complete. Took %.3f seconds to complete, %d%sB/s", (int)getpid(), timespan,speed,speedchar);
 
 err_open:
 	if(close_sock) {
@@ -293,25 +327,32 @@ err:
 
 int main(int argc, char**argv) {
 	gchar *hostname;
-	long int p;
+	long int p = 0;
 	int port;
-	int sock;
+	char* name = NULL;
+	int sock=0;
 
 	if(argc<3) {
-		g_message("Not enough arguments");
-		g_message("Usage: %s <hostname> <port>", argv[0]);
+		g_message("%d: Not enough arguments", (int)getpid());
+		g_message("%d: Usage: %s <hostname> <port>", (int)getpid(), argv[0]);
+		g_message("%d: Or: %s <hostname> -N <exportname>", (int)getpid(), argv[0]);
 		exit(EXIT_FAILURE);
 	}
 	logging();
 	hostname=g_strdup(argv[1]);
-	p=(strtol(argv[2], NULL, 0));
-	if(p==LONG_MIN||p==LONG_MAX) {
-		g_critical("Could not parse port number: %s", strerror(errno));
-		exit(EXIT_FAILURE);
+	if(!strncmp(argv[2], "-N", 2)) {
+		name = g_strdup(argv[3]);
+		p = 10809;
+	} else {
+		p=(strtol(argv[2], NULL, 0));
+		if(p==LONG_MIN||p==LONG_MAX) {
+			g_critical("Could not parse port number: %s", strerror(errno));
+			exit(EXIT_FAILURE);
+		}
 	}
 	port=(int)p;
 
-	if(throughput_test(hostname, port, sock, FALSE, TRUE)<0) {
+	if(throughput_test(hostname, port, name, sock, FALSE, TRUE)<0) {
 		g_warning("Could not run throughput test: %s", errstr);
 		exit(EXIT_FAILURE);
 	}