Skip to content

Commit 1ad0201

Browse files
amastbaumamastbaum
committed
UCT/TCP: align tcp iface struct members
1 parent 9f96287 commit 1ad0201

File tree

1 file changed

+55
-56
lines changed

1 file changed

+55
-56
lines changed

‎src/uct/tcp/tcp.h‎

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -375,71 +375,70 @@ UCS_PTR_MAP_DEFINE(tcp_ep, 0);
375375
* TCP interface
376376
*/
377377
typedef struct uct_tcp_iface {
378-
uct_base_iface_t super; /* Parent class */
379-
int listen_fd; /* Server socket */
380-
ucs_conn_match_ctx_t conn_match_ctx; /* Connection matching context that contains EPs
381-
* created with CONNECT_TO_IFACE method */
382-
UCS_PTR_MAP_T(tcp_ep) ep_ptr_map; /* EP PTR map that contains
383-
* EPs created with
384-
* CONNECT_TO_EP method */
385-
ucs_list_link_t ep_list; /* List of endpoints */
386-
char if_name[IFNAMSIZ]; /* Network interface name */
387-
ucs_sys_event_set_t *event_set; /* Event set identifier */
388-
ucs_mpool_t tx_mpool; /* TX memory pool */
389-
ucs_mpool_t rx_mpool; /* RX memory pool */
390-
size_t outstanding; /* How much data in the EP send buffers
391-
* + how many non-blocking connections
392-
* are in progress + how many EPs are
393-
* waiting for PUT Zcopy operation ACKs
394-
* (0/1 for each EP) */
395-
ucs_range_spec_t port_range; /** Range of ports to use for bind() */
378+
uct_base_iface_t super; /* Parent class */
379+
int listen_fd; /* Server socket */
380+
ucs_conn_match_ctx_t conn_match_ctx; /* Connection matching context that contains EPs
381+
* created with CONNECT_TO_IFACE method */
382+
UCS_PTR_MAP_T(tcp_ep) ep_ptr_map; /* EP PTR map that contains
383+
* EPs created with
384+
* CONNECT_TO_EP method */
385+
ucs_list_link_t ep_list; /* List of endpoints */
386+
char if_name[IFNAMSIZ]; /* Network interface name */
387+
ucs_sys_event_set_t *event_set; /* Event set identifier */
388+
ucs_mpool_t tx_mpool; /* TX memory pool */
389+
ucs_mpool_t rx_mpool; /* RX memory pool */
390+
size_t outstanding; /* How much data in the EP send buffers
391+
* + how many non-blocking connections
392+
* are in progress + how many EPs are
393+
* waiting for PUT Zcopy operation ACKs
394+
* (0/1 for each EP) */
395+
ucs_range_spec_t port_range; /** Range of ports to use for bind() */
396396

397397
struct {
398-
size_t tx_seg_size; /* TX AM buffer size */
399-
size_t rx_seg_size; /* RX AM buffer size */
400-
size_t sendv_thresh; /* Minimum size of user's payload from which
401-
* non-blocking vector send should be used */
402-
size_t max_iov; /* Maximum supported IOVs limited by
403-
* user configuration and service buffers
404-
* (TCP protocol and user's AM headers) */
398+
size_t tx_seg_size; /* TX AM buffer size */
399+
size_t rx_seg_size; /* RX AM buffer size */
400+
size_t sendv_thresh; /* Minimum size of user's payload from which
401+
* non-blocking vector send should be used */
402+
size_t max_iov; /* Maximum supported IOVs limited by
403+
* user configuration and service buffers
404+
* (TCP protocol and user's AM headers) */
405405
struct {
406-
size_t max_hdr; /* Maximum supported AM Zcopy header */
407-
size_t hdr_offset; /* Offset in TX buffer to empty space that
408-
* can be used for AM Zcopy header */
406+
size_t max_hdr; /* Maximum supported AM Zcopy header */
407+
size_t hdr_offset; /* Offset in TX buffer to empty space that
408+
* can be used for AM Zcopy header */
409409
} zcopy;
410-
struct sockaddr_storage ifaddr; /* Network address */
411-
struct sockaddr_storage netmask; /* Network address mask */
412-
size_t sockaddr_len; /* Network address length */
413-
ucs_ternary_auto_value_t ep_bind_src_addr; /* Bind EP's FD to ifaddr */
414-
int prefer_default; /* Prefer default gateway */
415-
int put_enable; /* Enable PUT Zcopy operation support */
416-
int conn_nb; /* Use non-blocking connect() */
417-
unsigned max_poll; /* Number of events to poll per socket*/
418-
uint8_t max_conn_retries; /* How many connection establishment attempts
419-
* should be done if dropped connection was
420-
* detected due to lack of system resources */
421-
unsigned syn_cnt; /* Number of SYN retransmits that TCP should send
422-
* before aborting the attempt to connect.
423-
* It cannot exceed 255. */
424-
double max_bw; /* Upper bound to TCP iface bandwidth */
410+
struct sockaddr_storage ifaddr; /* Network address */
411+
struct sockaddr_storage netmask; /* Network address mask */
412+
size_t sockaddr_len; /* Network address length */
413+
ucs_ternary_auto_value_t ep_bind_src_addr; /* Bind EP's FD to ifaddr */
414+
int prefer_default; /* Prefer default gateway */
415+
int put_enable; /* Enable PUT Zcopy operation support */
416+
int conn_nb; /* Use non-blocking connect() */
417+
unsigned max_poll; /* Number of events to poll per socket*/
418+
uint8_t max_conn_retries; /* How many connection establishment attempts
419+
* should be done if dropped connection was
420+
* detected due to lack of system resources */
421+
unsigned syn_cnt; /* Number of SYN retransmits that TCP should send
422+
* before aborting the attempt to connect.
423+
* It cannot exceed 255. */
424+
double max_bw; /* Upper bound to TCP iface bandwidth */
425425
struct {
426-
ucs_time_t idle; /* The time the connection needs to remain
427-
* idle before TCP starts sending keepalive
428-
* probes (TCP_KEEPIDLE socket option) */
429-
unsigned long cnt; /* The maximum number of keepalive probes TCP
430-
* should send before dropping the connection
431-
* (TCP_KEEPCNT socket option). */
432-
ucs_time_t intvl; /* The time between individual keepalive
433-
* probes (TCP_KEEPINTVL socket option). */
426+
ucs_time_t idle; /* The time the connection needs to remain
427+
* idle before TCP starts sending keepalive
428+
* probes (TCP_KEEPIDLE socket option) */
429+
unsigned long cnt; /* The maximum number of keepalive probes TCP
430+
* should send before dropping the connection
431+
* (TCP_KEEPCNT socket option). */
432+
ucs_time_t intvl; /* The time between individual keepalive
433+
* probes (TCP_KEEPINTVL socket option). */
434434
} keepalive;
435-
uct_tcp_reachability_mode_t
436-
reachability_mode; /* Mode used for performing reachability check */
435+
uct_tcp_reachability_mode_t reachability_mode; /* Mode used for performing reachability check */
437436
} config;
438437

439438
struct {
440-
int nodelay; /* TCP_NODELAY */
441-
size_t sndbuf; /* SO_SNDBUF */
442-
size_t rcvbuf; /* SO_RCVBUF */
439+
int nodelay; /* TCP_NODELAY */
440+
size_t sndbuf; /* SO_SNDBUF */
441+
size_t rcvbuf; /* SO_RCVBUF */
443442
} sockopt;
444443
} uct_tcp_iface_t;
445444

0 commit comments

Comments
 (0)