From d3b3ba86f1fc4a1a5b4988c3bb4601a770c4721f Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 2 May 2018 14:03:26 +0100
Subject: [PATCH] Updated crude performance test.

---
 test/msgsps_common.h |  6 ++++
 test/msgsps_pub.c    | 68 +++++---------------------------------------
 test/msgsps_sub.c    | 12 +++-----
 3 files changed, 17 insertions(+), 69 deletions(-)

diff --git a/test/msgsps_common.h b/test/msgsps_common.h
index 8925f886..54657861 100644
--- a/test/msgsps_common.h
+++ b/test/msgsps_common.h
@@ -1,3 +1,9 @@
+#define HOST "127.0.0.1"
+#define PORT 1888
+
+#define PUB_QOS 1
+#define SUB_QOS 1
+
 #define MESSAGE_COUNT 100000L
 #define MESSAGE_SIZE 1024L
 
diff --git a/test/msgsps_pub.c b/test/msgsps_pub.c
index b2ac6256..df4554bb 100644
--- a/test/msgsps_pub.c
+++ b/test/msgsps_pub.c
@@ -27,60 +27,17 @@ void my_disconnect_callback(struct mosquitto *mosq, void *obj, int result)
 void my_publish_callback(struct mosquitto *mosq, void *obj, int mid)
 {
 	message_count++;
-	//printf("%d ", message_count);
 	if(message_count == MESSAGE_COUNT){
 		gettimeofday(&stop, NULL);
 		mosquitto_disconnect((struct mosquitto *)obj);
 	}
 }
 
-int create_data(void)
-{
-	int i;
-	FILE *fptr, *rnd;
-	int rc = 0;
-	char buf[MESSAGE_SIZE];
-
-	fptr = fopen("msgsps_pub.dat", "rb");
-	if(fptr){
-		fseek(fptr, 0, SEEK_END);
-		if(ftell(fptr) >= MESSAGE_SIZE*MESSAGE_COUNT){
-			fclose(fptr);
-			return 0;
-		}
-		fclose(fptr);
-	}
-
-	fptr = fopen("msgsps_pub.dat", "wb");
-	if(!fptr) return 1;
-	rnd = fopen("/dev/urandom", "rb");
-	if(!rnd){
-		fclose(fptr);
-		return 1;
-	}
-
-	for(i=0; i<MESSAGE_COUNT; i++){
-		if(fread(buf, sizeof(char), MESSAGE_SIZE, rnd) != MESSAGE_SIZE){
-			rc = 1;
-			break;
-		}
-		if(fwrite(buf, sizeof(char), MESSAGE_SIZE, fptr) != MESSAGE_SIZE){
-			rc = 1;
-			break;
-		}
-	}
-	fclose(rnd);
-	fclose(fptr);
-
-	return rc;
-}
-
 int main(int argc, char *argv[])
 {
 	struct mosquitto *mosq;
 	int i;
 	double dstart, dstop, diff;
-	FILE *fptr;
 	uint8_t *buf;
 	
 	buf = malloc(MESSAGE_SIZE*MESSAGE_COUNT);
@@ -94,18 +51,6 @@ int main(int argc, char *argv[])
 	stop.tv_sec = 0;
 	stop.tv_usec = 0;
 
-	if(create_data()){
-		printf("Error: Unable to create random input data.\n");
-		return 1;
-	}
-	fptr = fopen("msgsps_pub.dat", "rb");
-	if(!fptr){
-		printf("Error: Unable to open random input data.\n");
-		return 1;
-	}
-	fread(buf, sizeof(uint8_t), MESSAGE_SIZE*MESSAGE_COUNT, fptr);
-	fclose(fptr);
-
 	mosquitto_lib_init();
 
 	mosq = mosquitto_new("perftest", true, NULL);
@@ -113,15 +58,16 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, my_disconnect_callback);
 	mosquitto_publish_callback_set(mosq, my_publish_callback);
 
-	mosquitto_connect(mosq, "127.0.0.1", 1884, 600);
+	mosquitto_connect(mosq, HOST, PORT, 600);
+
+	mosquitto_loop_start(mosq);
 
 	i=0;
-	while(!mosquitto_loop(mosq, 1, 10) && run){
-		if(i<MESSAGE_COUNT){
-			mosquitto_publish(mosq, NULL, "perf/test", MESSAGE_SIZE, &buf[i*MESSAGE_SIZE], 0, false);
-			i++;
-		}
+	for(i=0; i<MESSAGE_COUNT; i++){
+		mosquitto_publish(mosq, NULL, "perf/test", MESSAGE_SIZE, &buf[i*MESSAGE_SIZE], PUB_QOS, false);
 	}
+	mosquitto_loop_stop(mosq, false);
+
 	dstart = (double)start.tv_sec*1.0e6 + (double)start.tv_usec;
 	dstop = (double)stop.tv_sec*1.0e6 + (double)stop.tv_usec;
 	diff = (dstop-dstart)/1.0e6;
diff --git a/test/msgsps_sub.c b/test/msgsps_sub.c
index e95e79bd..3156d741 100644
--- a/test/msgsps_sub.c
+++ b/test/msgsps_sub.c
@@ -30,7 +30,7 @@ void my_message_callback(struct mosquitto *mosq, void *obj, const struct mosquit
 	if(message_count == 0){
 		gettimeofday(&start, NULL);
 	}
-	fwrite(msg->payload, sizeof(uint8_t), msg->payloadlen, fptr);
+	//fwrite(msg->payload, sizeof(uint8_t), msg->payloadlen, fptr);
 	message_count++;
 	if(message_count == MESSAGE_COUNT){
 		gettimeofday(&stop, NULL);
@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
 	double dstart, dstop, diff;
 	int mid = 0;
 	char id[50];
-	int rc;
 
 	start.tv_sec = 0;
 	start.tv_usec = 0;
@@ -64,13 +63,10 @@ int main(int argc, char *argv[])
 	mosquitto_disconnect_callback_set(mosq, my_disconnect_callback);
 	mosquitto_message_callback_set(mosq, my_message_callback);
 
-	mosquitto_connect(mosq, "127.0.0.1", 1884, 600);
-	mosquitto_subscribe(mosq, &mid, "perf/test", 0);
+	mosquitto_connect(mosq, HOST, PORT, 600);
+	mosquitto_subscribe(mosq, &mid, "perf/test", SUB_QOS);
 
-	do{
-		rc = mosquitto_loop(mosq, 1, 10);
-	}while(rc == MOSQ_ERR_SUCCESS && run);
-	printf("rc: %d\n", rc);
+	mosquitto_loop_forever(mosq, 10, 1);
 
 	dstart = (double)start.tv_sec*1.0e6 + (double)start.tv_usec;
 	dstop = (double)stop.tv_sec*1.0e6 + (double)stop.tv_usec;