server: add a few more debug logging statements

[fio.git] / client.c

diff --git a/client.c b/client.c
index b632241aec791d57aaa18df4427538c635a2cb6d..4d233415b8761aad83cb91a9633045dac46f0b3d 100644 (file)
--- a/client.c
+++ b/client.c
@@ -25,6 +25,7 @@ struct fio_client {
        int fd;
 
        int state;
+       int skip_newline;
 
        uint16_t argc;
        char **argv;
@@ -170,6 +171,8 @@ void fio_clients_terminate(void)
        struct flist_head *entry;
        struct fio_client *client;
 
+       dprint(FD_NET, "client: terminate clients\n");
+
        flist_for_each(entry, &client_list) {
                client = flist_entry(entry, struct fio_client, list);
 
@@ -179,6 +182,7 @@ void fio_clients_terminate(void)
 
 static void sig_int(int sig)
 {
+       dprint(FD_NET, "client: got sign %d\n", sig);
        fio_clients_terminate();
 }
 
@@ -199,6 +203,8 @@ static void client_signal_handler(void)
 
 static void probe_client(struct fio_client *client)
 {
+       dprint(FD_NET, "client: send probe\n");
+
        fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
        handle_client(client, 1);
 }
@@ -208,6 +214,8 @@ static int send_client_cmd_line(struct fio_client *client)
        struct cmd_line_pdu *pdu;
        int i, ret;
 
+       dprint(FD_NET, "client: send cmdline\n");
+
        pdu = malloc(sizeof(*pdu));
        for (i = 0; i < client->argc; i++)
                strcpy((char *) pdu->argv[i], client->argv[i]);
@@ -224,6 +232,8 @@ int fio_clients_connect(void)
        struct flist_head *entry, *tmp;
        int ret;
 
+       dprint(FD_NET, "client: connect all\n");
+
        client_signal_handler();
 
        flist_for_each_safe(entry, tmp, &client_list) {
@@ -453,6 +463,8 @@ static int handle_client(struct fio_client *client, int one)
        struct fio_net_cmd *cmd;
        int done = 0;
 
+       dprint(FD_NET, "client: handle %s\n", client->hostname);
+
        while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
                dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
                                                        cmd->opcode);
@@ -463,12 +475,17 @@ static int handle_client(struct fio_client *client, int one)
                        free(cmd);
                        done = 1;
                        break;
-               case FIO_NET_CMD_TEXT:
-                       fprintf(f_out, "Client <%s>: ", client->hostname);
-                       fwrite(cmd->payload, cmd->pdu_len, 1, f_out);
+               case FIO_NET_CMD_TEXT: {
+                       const char *buf = (const char *) cmd->payload;
+
+                       if (!client->skip_newline)
+                               fprintf(f_out, "Client <%s>: ", client->hostname);
+                       fwrite(buf, cmd->pdu_len, 1, f_out);
                        fflush(f_out);
+                       client->skip_newline = strchr(buf, '\n') == NULL;
                        free(cmd);
                        break;
+                       }
                case FIO_NET_CMD_TS:
                        handle_ts(cmd);
                        free(cmd);