UCT/TCP: align other structs members

Author: amastbaum

src/uct/tcp/tcp.h

@@ -344,27 +344,27 @@ typedef struct uct_tcp_ep_addr {
  * TCP endpoint
  */
 struct uct_tcp_ep {
-    uct_base_ep_t                 super;
-    uint8_t                       conn_retries; /* Number of connection attempts done */
-    uint8_t                       conn_state;   /* State of connection with peer */
-    ucs_event_set_types_t         events;       /* Current notifications */
-    uint16_t                      flags;        /* Endpoint flags */
-    int                           fd;           /* Socket file descriptor */
-    int                           stale_fd;     /* Old file descriptor which should be
-                                                 * closed as soon as the EP is connected
-                                                 * using the new fd */
-    uct_tcp_ep_cm_id_t            cm_id;        /* EP connection manager ID */
-    uct_tcp_ep_ctx_t              tx;           /* TX resources */
-    uct_tcp_ep_ctx_t              rx;           /* RX resources */
-    ucs_queue_head_t              pending_q;    /* Pending operations */
-    ucs_queue_head_t              put_comp_q;   /* Flush completions waiting for
-                                                 * outstanding PUTs acknowledgment */
+    uct_base_ep_t                   super;
+    uint8_t                         conn_retries; /* Number of connection attempts done */
+    uint8_t                         conn_state;   /* State of connection with peer */
+    ucs_event_set_types_t           events;       /* Current notifications */
+    uint16_t                        flags;        /* Endpoint flags */
+    int                             fd;           /* Socket file descriptor */
+    int                             stale_fd;     /* Old file descriptor which should be
+                                                   * closed as soon as the EP is connected
+                                                   * using the new fd */
+    uct_tcp_ep_cm_id_t              cm_id;        /* EP connection manager ID */
+    uct_tcp_ep_ctx_t                tx;           /* TX resources */
+    uct_tcp_ep_ctx_t                rx;           /* RX resources */
+    ucs_queue_head_t                pending_q;    /* Pending operations */
+    ucs_queue_head_t                put_comp_q;   /* Flush completions waiting for
+                                                   * outstanding PUTs acknowledgment */
     union {
-        ucs_list_link_t           list;         /* List element to insert into TCP EP list */
-        ucs_conn_match_elem_t     elem;         /* Connection matching element, used by EPs
-                                                 * created with CONNECT_TO_IFACE method */
+        ucs_list_link_t             list;         /* List element to insert into TCP EP list */
+        ucs_conn_match_elem_t       elem;         /* Connection matching element, used by EPs
+                                                   * created with CONNECT_TO_IFACE method */
     };
-    char                          peer_addr[0]; /* Remote iface addr */
+    char                            peer_addr[0]; /* Remote iface addr */
 };
 
 
@@ -447,30 +447,30 @@ typedef struct uct_tcp_iface {
  * TCP interface configuration
  */
 typedef struct uct_tcp_iface_config {
-    uct_iface_config_t             super;
-    size_t                         tx_seg_size;
-    size_t                         rx_seg_size;
-    size_t                         max_iov;
-    size_t                         sendv_thresh;
-    int                            prefer_default;
-    int                            put_enable;
-    int                            conn_nb;
-    unsigned                       max_poll;
-    unsigned                       max_conn_retries;
-    int                            sockopt_nodelay;
-    uct_tcp_send_recv_buf_config_t sockopt;
-    unsigned                       syn_cnt;
-    uct_iface_mpool_config_t       tx_mpool;
-    uct_iface_mpool_config_t       rx_mpool;
-    ucs_range_spec_t               port_range;
-    double                         max_bw;
+    uct_iface_config_t              super;
+    size_t                          tx_seg_size;
+    size_t                          rx_seg_size;
+    size_t                          max_iov;
+    size_t                          sendv_thresh;
+    int                             prefer_default;
+    int                             put_enable;
+    int                             conn_nb;
+    unsigned                        max_poll;
+    unsigned                        max_conn_retries;
+    int                             sockopt_nodelay;
+    uct_tcp_send_recv_buf_config_t  sockopt;
+    unsigned                        syn_cnt;
+    uct_iface_mpool_config_t        tx_mpool;
+    uct_iface_mpool_config_t        rx_mpool;
+    ucs_range_spec_t                port_range;
+    double                          max_bw;
     struct {
-        ucs_time_t                 idle;
-        unsigned long              cnt;
-        ucs_time_t                 intvl;
+        ucs_time_t                  idle;
+        unsigned long               cnt;
+        ucs_time_t                  intvl;
     } keepalive;
-    ucs_ternary_auto_value_t       ep_bind_src_addr;
-    uct_tcp_reachability_mode_t    reachability_mode;
+    ucs_ternary_auto_value_t        ep_bind_src_addr;
+    uct_tcp_reachability_mode_t     reachability_mode;
 } uct_tcp_iface_config_t;