tried some random cosmetic stuff and removed it

[citadel.git] / citadel / utils / loadtest.c

diff --git a/citadel/utils/loadtest.c b/citadel/utils/loadtest.c
index b376f7d5c0faca27f22ceab22decf0b7f8c6943b..67a8209749b2ff646d36ea05695573d635ab00df 100644 (file)
--- a/citadel/utils/loadtest.c
+++ b/citadel/utils/loadtest.c
@@ -1,4 +1,4 @@
-// unfinished load testing utility for Citadel Server
+// Load testing utility for Citadel Server
 //
 // Copyright (c) 1987-2023 by the citadel.org team
 //
@@ -127,17 +127,15 @@ int uds_connectsock(char *sockpath) {
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
-               fprintf(stderr, "loadtest: Can't create socket: %s\n", strerror(errno));
-               exit(3);
+               return(-1);
        }
 
        if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               fprintf(stderr, "loadtest: can't connect: %s\n", strerror(errno));
                close(s);
-               exit(3);
+               return(-1);
        }
 
-       return s;
+       return(s);
 }
 
 
@@ -200,7 +198,6 @@ void serv_puts(int serv_sock, char *buf) {
 }
 
 
-
 char *random_rooms[] = {
        "Load Testing Test Room One",
        "Load Test 2: Electric Boogaloo",
@@ -210,8 +207,10 @@ char *random_rooms[] = {
 };
 int nrooms = sizeof(random_rooms) / sizeof(char *);
 char *test_user = "Load Test User";
-char *test_pass = "TheTestPW";
+char test_pass[16];
+
 
+// These are our randomized load test operations: an even mix of changing rooms, posting messages, and deleting messages.
 void perform_random_thing(int serv_sock) {
        int op = random() % 3;
        char buf[SIZ];
@@ -275,9 +274,20 @@ void perform_random_thing(int serv_sock) {
 }
 
 
-void do_stuff(int serv_sock) {
+// This is the main loop.  We log in as the load test user, and then perform random operations until stopped.
+void *loadtest(void *blah) {
        char buf[SIZ];
+       int serv_sock;
 
+       serv_sock = uds_connectsock(file_citadel_socket);
+
+       if (serv_sock < 0) {
+               printf("\033[8;0H\033[31mWarning: some threads failed to connect to Citadel Server.\033[0m");
+               fflush(stdout);
+               pthread_exit(NULL);
+       }
+
+       serv_gets(serv_sock, buf);
        snprintf(buf, sizeof buf, "USER %s", test_user);
        serv_puts(serv_sock, buf);
        serv_gets(serv_sock, buf);
@@ -288,18 +298,22 @@ void do_stuff(int serv_sock) {
        serv_puts(serv_sock, buf);
        serv_gets(serv_sock, buf);
 
-       printf("\033[%d;0H\033[32m%6d\033[0m", 7+serv_sock, serv_sock-3);
-
+       // Find a nice spot on the screen to show the operation count for this thread.
+       int row = 10 + ((serv_sock-3) % 20);
+       int col = ((serv_sock-3) / 20) * 10;
        long ops = 0;
+       printf("\033[%d;%dH\033[33m       0\033[0m", row, col);
+       fflush(stdout);
+
        while(1) {
-               //alarm(30);
                perform_random_thing(serv_sock);
-               printf("\033[%d;11H\033[33m%8ld\033[0m", 7+serv_sock, ++ops);
+               printf("\033[%d;%dH\033[32m%8ld\033[0m", row, col, ++ops);
                fflush(stdout);
        }
 }
 
 
+// Create (or replace) the account used for load testing, then create the rooms in which we will load test.
 void setup_accounts(int serv_sock) {
        int i;
        char buf[SIZ];
@@ -324,33 +338,23 @@ void setup_accounts(int serv_sock) {
        }
 }
 
-void *loadtest(void *blah) {
-       char buf[SIZ];
-       int serv_sock;
-
-       serv_sock = uds_connectsock(file_citadel_socket);
-       serv_gets(serv_sock, buf);
-       do_stuff(serv_sock);
-       close(serv_sock);
-}
-
 
 // Main loop.  Do things and have fun.
 int main(int argc, char **argv) {
-       int a;
+       int i;
        int nthreads = 3;
 
        fprintf(stderr, "\033[2J\033[H"
-                       "\033[44m\033[33m\033[1m \033[K\033[0m\n"
-                       "\033[44m\033[33m\033[1m Load testing utility for Citadel \033[K\033[0m\n"
-                       "\033[44m\033[33m\033[1m Copyright (c) 2023 by citadel.org et al.  \033[K\033[0m\n"
+                       "\033[44m\033[33m\033[1m                                                                        \033[K\033[0m\n"
+                       "\033[44m\033[33m\033[1m Load testing utility for Citadel                                       \033[K\033[0m\n"
+                       "\033[44m\033[33m\033[1m Copyright (c) 2023 by citadel.org et al.                               \033[K\033[0m\n"
                        "\033[44m\033[33m\033[1m This program is open source software.  Use, duplication, or disclosure \033[K\033[0m\n"
-                       "\033[44m\033[33m\033[1m is subject to the terms of the GNU General Public license v3. \033[K\033[0m\n"
-                       "\033[44m\033[33m\033[1m \033[K\033[0m\n");
+                       "\033[44m\033[33m\033[1m is subject to the terms of the GNU General Public license v3.          \033[K\033[0m\n"
+                       "\033[44m\033[33m\033[1m                                                                        \033[K\033[0m\n");
 
        // Parse command line
-       while ((a = getopt(argc, argv, "h:n:")) != EOF) {
-               switch (a) {
+       while ((i = getopt(argc, argv, "h:n:")) != EOF) {
+               switch (i) {
                case 'h':
                        strncpy(ctdldir, optarg, sizeof ctdldir);
                        break;
@@ -368,15 +372,32 @@ int main(int argc, char **argv) {
                exit(errno);
        }
 
+       // Generate a random password for load test user.  No one needs this password except us.
+       srand(time(NULL)+getpid());
+       for (i=0; i<sizeof(test_pass)-1; ++i) {
+               test_pass[i] = (rand() % 74) + 48;
+       }
+       test_pass[sizeof(test_pass)] = 0;
+
+       // start connecting
        int serv_sock = uds_connectsock(file_citadel_admin_socket);
+       if (serv_sock < 0) {
+               fprintf(stderr, "loadtest: cannot connect to Citadel Server\n");
+               exit(1);
+       }
+
        char buf[SIZ];
        serv_gets(serv_sock, buf);
        setup_accounts(serv_sock);
        close(serv_sock);
 
-       printf("\033[8Hthread   num_ops\n------ -----------");
+       for (i=0; i<(nthreads-1); ++i) {
+
+               int row = 10 + ((i+1) % 20);
+               int col = ((i+1) / 20) * 10;
+               printf("\033[%d;%dH\033[31m--------\033[0m", row, col);
+               fflush(stdout);
 
-       for (a=0; a<(nthreads-1); ++a) {
                pthread_t thread;
                pthread_attr_t attr;
                int ret = 0;
@@ -390,6 +411,5 @@ int main(int argc, char **argv) {
 
        }
        loadtest(NULL);
-
        return(0);
 }