Skip to content

Commit 75ab956

Browse files
committed
prov/cxi: run clang-format on all headers.
Add clang-format disable/enables in cxip.h to ensure include-order stays valid. Run clang-format over all the newly generated headers. Signed-off-by: Nicholas Sielicki <opensource@nslick.com>
1 parent 7208ce0 commit 75ab956

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+748
-814
lines changed

prov/cxi/include/cxip.h

Lines changed: 95 additions & 92 deletions
Large diffs are not rendered by default.

prov/cxi/include/cxip/addr.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#ifndef _CXIP_ADDR_H_
88
#define _CXIP_ADDR_H_
99

10-
1110
#include <stdint.h>
1211

1312
/* Macros */
@@ -27,9 +26,9 @@
2726

2827
/* Type definitions */
2928
struct cxip_addr {
30-
uint32_t pid : C_DFA_PID_BITS_MAX;
31-
uint32_t nic : C_DFA_NIC_BITS;
32-
uint32_t pad : 3;
29+
uint32_t pid : C_DFA_PID_BITS_MAX;
30+
uint32_t nic : C_DFA_NIC_BITS;
31+
uint32_t pad : 3;
3332
uint16_t vni;
3433
};
3534

prov/cxi/include/cxip/atomic.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
#ifndef _CXIP_ATOMIC_H_
88
#define _CXIP_ATOMIC_H_
99

10-
11-
#include <stdint.h>
12-
#include <stddef.h>
1310
#include <stdbool.h>
11+
#include <stddef.h>
12+
#include <stdint.h>
1413

1514
/* Forward declarations */
1615
struct cxip_cntr;

prov/cxi/include/cxip/auth.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#ifndef _CXIP_AUTH_H_
88
#define _CXIP_AUTH_H_
99

10-
1110
/* Function declarations */
1211
int cxip_check_auth_key_info(struct fi_info *info);
1312

prov/cxi/include/cxip/av.h

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
#ifndef _CXIP_AV_H_
88
#define _CXIP_AV_H_
99

10-
11-
#include <stdint.h>
12-
#include <stddef.h>
13-
#include <stdbool.h>
14-
#include <pthread.h>
15-
#include <ofi_list.h>
1610
#include <ofi_atom.h>
11+
#include <ofi_list.h>
12+
#include <pthread.h>
13+
#include <stdbool.h>
14+
#include <stddef.h>
15+
#include <stdint.h>
1716

1817
/* Forward declarations */
1918
struct cxip_addr;
@@ -92,11 +91,11 @@ struct cxip_av {
9291

9392
struct cxip_av_set {
9493
struct fid_av_set av_set_fid;
95-
struct cxip_av *cxi_av; // associated AV
96-
struct cxip_coll_mc *mc_obj; // reference MC
97-
fi_addr_t *fi_addr_ary; // addresses in set
98-
size_t fi_addr_cnt; // count of addresses
99-
struct cxip_comm_key comm_key; // communication key
94+
struct cxip_av *cxi_av; // associated AV
95+
struct cxip_coll_mc *mc_obj; // reference MC
96+
fi_addr_t *fi_addr_ary; // addresses in set
97+
size_t fi_addr_cnt; // count of addresses
98+
struct cxip_comm_key comm_key; // communication key
10099
uint64_t flags;
101100
};
102101

@@ -128,6 +127,6 @@ int cxip_av_bind_ep(struct cxip_av *av, struct cxip_ep *ep);
128127
void cxip_av_unbind_ep(struct cxip_av *av, struct cxip_ep *ep);
129128

130129
int cxip_av_set(struct fid_av *av, struct fi_av_set_attr *attr,
131-
struct fid_av_set **av_set_fid, void * context);
130+
struct fid_av_set **av_set_fid, void *context);
132131

133132
#endif /* _CXIP_AV_H_ */

prov/cxi/include/cxip/cmdq.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
#ifndef _CXIP_CMDQ_H_
88
#define _CXIP_CMDQ_H_
99

10-
11-
#include <stdint.h>
12-
#include <stddef.h>
1310
#include <stdbool.h>
11+
#include <stddef.h>
12+
#include <stdint.h>
1413

1514
/* Forward declarations */
1615
struct cxip_lni;

prov/cxi/include/cxip/cntr.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
#ifndef _CXIP_CNTR_H_
88
#define _CXIP_CNTR_H_
99

10-
11-
#include <stdint.h>
12-
#include <stdbool.h>
13-
#include <ofi_list.h>
1410
#include <ofi_atom.h>
11+
#include <ofi_list.h>
12+
#include <stdbool.h>
13+
#include <stdint.h>
1514

1615
/* Forward declarations */
1716
struct cxip_cmdq;
@@ -20,14 +19,14 @@ struct cxip_domain;
2019
/* Type definitions */
2120
struct cxip_cntr {
2221
struct fid_cntr cntr_fid;
23-
struct cxip_domain *domain; // parent domain
22+
struct cxip_domain *domain; // parent domain
2423
ofi_atomic32_t ref;
25-
struct fi_cntr_attr attr; // copy of user or default attributes
24+
struct fi_cntr_attr attr; // copy of user or default attributes
2625
struct fid_wait *wait;
2726
/* Contexts to which counter is bound */
2827
struct dlist_entry ctx_list;
2928

30-
/* Triggered cmdq for bound counters */
29+
/* Triggered cmdq for bound counters */
3130
struct cxip_cmdq *trig_cmdq;
3231

3332
struct ofi_genlock lock;
@@ -43,7 +42,8 @@ struct cxip_cntr {
4342
struct dlist_entry dom_entry;
4443

4544
/* Counter for number of operations which need progress. A separate lock
46-
* is needed since these functions may be called without counter lock held.
45+
* is needed since these functions may be called without counter lock
46+
* held.
4747
*/
4848
struct ofi_genlock progress_count_lock;
4949
int progress_count;

0 commit comments

Comments
 (0)