Add thread number ID to appropriate network commands

The client doesn't necessarily have a 1:1 mapping between jobs
and its internal job representation, so allow it to tell the
various jobs apart.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/server.h b/server.h
index 27e5523..3c66ecb 100644
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@
 };
 
 enum {
-	FIO_SERVER_VER			= 12,
+	FIO_SERVER_VER			= 13,
 
 	FIO_SERVER_MAX_FRAGMENT_PDU	= 1024,
 
@@ -119,6 +119,8 @@
 };
 
 struct cmd_add_job_pdu {
+	uint32_t thread_number;
+	uint32_t groupid;
 	struct thread_options_pack top;
 };
 
@@ -131,6 +133,7 @@
 };
 
 struct cmd_iolog_pdu {
+	uint32_t thread_number;
 	uint32_t nr_samples;
 	uint32_t log_type;
 	uint8_t name[FIO_NET_NAME_MAX];
@@ -161,9 +164,7 @@
 extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
 
 extern int fio_send_iolog(struct thread_data *, struct io_log *, const char *);
-
-struct thread_options;
-extern void fio_server_send_add_job(struct thread_options *, const char *);
+extern void fio_server_send_add_job(struct thread_data *);
 
 extern int exit_backend;
 extern int fio_net_port;