Merge branch 'nate-i50737-magic' into 'master'

See merge request SchedMD/dev/slurm!2898

Author: benglines

src/api/allocate.c

@@ -1400,7 +1400,7 @@ static int _handle_msg(slurm_msg_t *msg, uint16_t msg_type, void **resp,
 static int _accept_msg_connection(int listen_fd, uint16_t msg_type, void **resp,
 				  uint32_t job_id)
 {
-	void *conn = NULL;
+	conn_t *conn = NULL;
 	slurm_msg_t  *msg = NULL;
 	slurm_addr_t cli_addr;
 	int          rc = 0;

src/api/reconfigure.c

@@ -190,7 +190,7 @@ extern int slurm_takeover(int backup_inx)
 static int _send_message_controller(int dest, slurm_msg_t *req)
 {
 	int rc = SLURM_SUCCESS;
-	void *conn = NULL;
+	conn_t *conn = NULL;
 	slurm_msg_t resp_msg;
 
 	/*

src/api/slurm_pmi.c

@@ -222,7 +222,7 @@ extern int slurm_pmi_get_kvs_comm_set(kvs_comm_set_t **kvs_set_ptr,
 				      int pmi_rank, int pmi_size)
 {
 	int rc, retries = 0, timeout = 0;
-	void *conn = NULL;
+	conn_t *conn = NULL;
 	slurm_msg_t msg_send, msg_rcv;
 	slurm_addr_t slurm_addr, srun_reply_addr;
 	char hostname[HOST_NAME_MAX];

src/api/step_io.c

@@ -81,7 +81,7 @@ static struct io_buf *_alloc_io_buf(void);
 static void	_init_stdio_eio_objs(slurm_step_io_fds_t fds,
 				     client_io_t *cio);
 static void	_handle_io_init_msg(int fd, client_io_t *cio);
-static int _read_io_init_msg(int fd, void *conn, client_io_t *cio,
+static int _read_io_init_msg(int fd, conn_t *conn, client_io_t *cio,
 			     slurm_addr_t *host);
 static int      _wid(int n);
 static bool     _incoming_buf_free(client_io_t *cio);
@@ -220,7 +220,7 @@ _set_listensocks_nonblocking(client_io_t *cio)
 /**********************************************************************
  * IO server socket functions
  **********************************************************************/
-static eio_obj_t *_create_server_eio_obj(int fd, void *conn, client_io_t *cio,
+static eio_obj_t *_create_server_eio_obj(int fd, conn_t *conn, client_io_t *cio,
 					 int nodeid, int stdout_objs,
 					 int stderr_objs)
 {
@@ -846,7 +846,7 @@ _create_listensock_eio(int fd, client_io_t *cio)
 	return eio;
 }
 
-static int _read_io_init_msg(int fd, void *conn, client_io_t *cio,
+static int _read_io_init_msg(int fd, conn_t *conn, client_io_t *cio,
 			     slurm_addr_t *host)
 {
 	io_init_msg_t msg = { 0 };
@@ -926,7 +926,7 @@ _handle_io_init_msg(int fd, client_io_t *cio)
 
 	for (j = 0; j < 15; j++) {
 		int sd;
-		void *conn = NULL;
+		conn_t *conn = NULL;
 		slurm_addr_t addr;
 
 		/*

src/common/eio.c

@@ -173,7 +173,7 @@ bool eio_message_socket_readable(eio_obj_t *obj)
 
 int eio_message_socket_accept(eio_obj_t *obj, list_t *objs)
 {
-	void *conn = NULL;
+	conn_t *conn = NULL;
 	int fd;
 	slurm_addr_t addr;
 	slurm_msg_t *msg = NULL;

src/common/eio.h

@@ -31,6 +31,9 @@
 #include "src/common/list.h"
 #include "src/common/macros.h"
 #include "src/common/slurm_protocol_defs.h"
+
+#include "src/interfaces/conn.h"
+
 typedef struct eio_obj eio_obj_t;
 
 typedef struct eio_handle_components eio_handle_t;
@@ -65,7 +68,7 @@ struct io_operations {
 
 struct eio_obj {
 	int fd;                           /* fd to operate on                */
-	void *conn;
+	conn_t *conn;
 	uint32_t data_on_conn;
 	void *arg;                        /* application-specific data       */
 	struct io_operations *ops;        /* pointer to ops struct for obj   */

src/common/forward.c

@@ -122,7 +122,7 @@ static void *_forward_thread(void *arg)
 	forward_t *fwd_ptr = &fwd_msg->header.forward;
 	buf_t *buffer = init_buf(BUF_SIZE);	/* probably enough for header */
 	list_t *ret_list = NULL;
-	void *conn = NULL;
+	conn_t *conn = NULL;
 	ret_data_info_t *ret_data_info = NULL;
 	char *name = NULL;
 	hostlist_t *hl = hostlist_create(fwd_ptr->nodelist);

src/common/half_duplex.c

@@ -42,6 +42,8 @@
 #include "src/common/list.h"
 #include "src/common/xmalloc.h"
 
+#include "src/interfaces/conn.h"
+
 #define BUFFER_SIZE 4096
 
 static bool _half_duplex_readable(eio_obj_t *obj);
@@ -62,7 +64,7 @@ typedef struct {
 
 extern int half_duplex_add_objs_to_handle(eio_handle_t *eio_handle,
 					  int *local_fd, int *remote_fd,
-					  void *conn)
+					  conn_t *conn)
 {
 	void **conn_ptr = xmalloc(sizeof(*conn_ptr));
 	half_duplex_eio_arg_t *local_arg = NULL;

src/common/half_duplex.h

@@ -37,12 +37,13 @@
 #ifndef _SLURM_HALF_DUPLEX_H
 #define _SLURM_HALF_DUPLEX_H
 
+#include "src/common/eio.h"
 #include "src/interfaces/conn.h"
 
 extern struct io_operations half_duplex_ops;
 
 extern int half_duplex_add_objs_to_handle(eio_handle_t *eio_handle,
 					  int *local_fd, int *remote_fd,
-					  void *conn);
+					  conn_t *conn);
 
 #endif

src/common/io_hdr.c

@@ -91,7 +91,7 @@ int io_hdr_unpack(io_hdr_t *hdr, buf_t *buffer)
  * Only return when the all of the bytes have been read, or an unignorable
  * error has occurred.
  */
-static int _full_read(int fd, void *conn, void *buf, size_t count)
+static int _full_read(int fd, conn_t *conn, void *buf, size_t count)
 {
 	int n;
 	int left;
@@ -127,7 +127,7 @@ static int _full_read(int fd, void *conn, void *buf, size_t count)
 /*
  * Read and unpack an io_hdr_t from a file descriptor (socket).
  */
-int io_hdr_read_fd(int fd, void *conn, io_hdr_t *hdr)
+extern int io_hdr_read_fd(int fd, conn_t *conn, io_hdr_t *hdr)
 {
 	int n = 0;
 	buf_t *buffer = init_buf(IO_HDR_PACKET_BYTES);
@@ -216,9 +216,7 @@ static int io_init_msg_unpack(io_init_msg_t *hdr, buf_t *buffer)
 	return SLURM_ERROR;
 }
 
-
-int
-io_init_msg_write_to_fd(int fd, void *conn, io_init_msg_t *msg)
+extern int io_init_msg_write_to_fd(int fd, conn_t *conn, io_init_msg_t *msg)
 {
 	int rc = SLURM_ERROR;
 	buf_t *buf = init_buf(0);
@@ -243,7 +241,7 @@ io_init_msg_write_to_fd(int fd, void *conn, io_init_msg_t *msg)
 	return rc;
 }
 
-extern int io_init_msg_read_from_fd(int fd, void *conn, io_init_msg_t *msg)
+extern int io_init_msg_read_from_fd(int fd, conn_t *conn, io_init_msg_t *msg)
 {
 	buf_t *buf = NULL;
 	uint32_t len;