Skip to content

Commit 7f0fed8

Browse files
mdoriermdorier
committed
used clang-format to format the code
1 parent 973cf2b commit 7f0fed8

Some content is hidden

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

55 files changed

+1784
-1834
lines changed

‎examples/barrier.c‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
#include <mona-coll.h>
44
#include <stdlib.h>
55

6-
#define ASSERT_MESSAGE(__cond__, __msg__) \
7-
if(!(__cond__)) { \
8-
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, __msg__); \
9-
exit(-1); \
6+
#define ASSERT_MESSAGE(__cond__, __msg__) \
7+
if (!(__cond__)) { \
8+
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, \
9+
__msg__); \
10+
exit(-1); \
1011
}
1112

12-
int main(int argc, char** argv) {
13+
int main(int argc, char** argv)
14+
{
1315

14-
int rank, size, i;
16+
int rank, size, i;
1517
na_return_t ret;
1618

1719
MPI_Init(&argc, &argv);
@@ -20,13 +22,14 @@ int main(int argc, char** argv) {
2022
MPI_Comm_size(MPI_COMM_WORLD, &size);
2123

2224
mona_instance_t mona = mona_init("ofi+tcp", true, NULL);
23-
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL, "Could not initialize Mona instance");
25+
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL,
26+
"Could not initialize Mona instance");
2427
printf("[%d] Correctly instanciated Mona\n", rank);
2528

26-
char addr_str[128];
27-
size_t addr_size = 128;
28-
mona_addr_t addr = MONA_ADDR_NULL;
29-
ret = mona_addr_self(mona, &addr);
29+
char addr_str[128];
30+
size_t addr_size = 128;
31+
mona_addr_t addr = MONA_ADDR_NULL;
32+
ret = mona_addr_self(mona, &addr);
3033
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not get self address");
3134

3235
ret = mona_addr_to_string(mona, addr_str, &addr_size, addr);
@@ -36,13 +39,14 @@ int main(int argc, char** argv) {
3639
ret = mona_addr_free(mona, addr);
3740
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free address");
3841

39-
char* all_addr_str = malloc(128*size);
40-
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t)*size);
42+
char* all_addr_str = malloc(128 * size);
43+
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t) * size);
4144

42-
MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE, MPI_COMM_WORLD);
45+
MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE,
46+
MPI_COMM_WORLD);
4347

44-
for(i=0; i < size; i++) {
45-
ret = mona_addr_lookup(mona, all_addr_str+(128*i), all_addr+i);
48+
for (i = 0; i < size; i++) {
49+
ret = mona_addr_lookup(mona, all_addr_str + (128 * i), all_addr + i);
4650
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not lookup address");
4751
}
4852

@@ -57,9 +61,7 @@ int main(int argc, char** argv) {
5761
ret = mona_comm_free(comm);
5862
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free communicator");
5963

60-
for(i=0; i < size; i++) {
61-
mona_addr_free(mona, all_addr[i]);
62-
}
64+
for (i = 0; i < size; i++) { mona_addr_free(mona, all_addr[i]); }
6365

6466
mona_finalize(mona);
6567

‎examples/bcast.c‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
#include <mona-coll.h>
44
#include <stdlib.h>
55

6-
#define ASSERT_MESSAGE(__cond__, __msg__) \
7-
if(!(__cond__)) { \
8-
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, __msg__); \
9-
exit(-1); \
6+
#define ASSERT_MESSAGE(__cond__, __msg__) \
7+
if (!(__cond__)) { \
8+
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, \
9+
__msg__); \
10+
exit(-1); \
1011
}
1112

12-
int main(int argc, char** argv) {
13+
int main(int argc, char** argv)
14+
{
1315

14-
int rank, size, i;
16+
int rank, size, i;
1517
na_return_t ret;
1618

1719
MPI_Init(&argc, &argv);
@@ -20,13 +22,14 @@ int main(int argc, char** argv) {
2022
MPI_Comm_size(MPI_COMM_WORLD, &size);
2123

2224
mona_instance_t mona = mona_init("ofi+tcp", true, NULL);
23-
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL, "Could not initialize Mona instance");
25+
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL,
26+
"Could not initialize Mona instance");
2427
printf("[%d] Correctly instanciated Mona\n", rank);
2528

26-
char addr_str[128];
27-
size_t addr_size = 128;
28-
mona_addr_t addr = MONA_ADDR_NULL;
29-
ret = mona_addr_self(mona, &addr);
29+
char addr_str[128];
30+
size_t addr_size = 128;
31+
mona_addr_t addr = MONA_ADDR_NULL;
32+
ret = mona_addr_self(mona, &addr);
3033
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not get self address");
3134

3235
ret = mona_addr_to_string(mona, addr_str, &addr_size, addr);
@@ -36,13 +39,14 @@ int main(int argc, char** argv) {
3639
ret = mona_addr_free(mona, addr);
3740
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free address");
3841

39-
char* all_addr_str = malloc(128*size);
40-
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t)*size);
42+
char* all_addr_str = malloc(128 * size);
43+
mona_addr_t* all_addr = malloc(sizeof(mona_addr_t) * size);
4144

42-
MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE, MPI_COMM_WORLD);
45+
MPI_Allgather(addr_str, 128, MPI_BYTE, all_addr_str, 128, MPI_BYTE,
46+
MPI_COMM_WORLD);
4347

44-
for(i=0; i < size; i++) {
45-
ret = mona_addr_lookup(mona, all_addr_str+(128*i), all_addr+i);
48+
for (i = 0; i < size; i++) {
49+
ret = mona_addr_lookup(mona, all_addr_str + (128 * i), all_addr + i);
4650
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not lookup address");
4751
}
4852

@@ -53,15 +57,13 @@ int main(int argc, char** argv) {
5357

5458
uint64_t v[10000];
5559

56-
ret = mona_comm_bcast(comm, v, sizeof(*v)*10000, 0, 0);
60+
ret = mona_comm_bcast(comm, v, sizeof(*v) * 10000, 0, 0);
5761
ASSERT_MESSAGE(ret == NA_SUCCESS, "Barrier failed");
5862

5963
ret = mona_comm_free(comm);
6064
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free communicator");
6165

62-
for(i=0; i < size; i++) {
63-
mona_addr_free(mona, all_addr[i]);
64-
}
66+
for (i = 0; i < size; i++) { mona_addr_free(mona, all_addr[i]); }
6567

6668
mona_finalize(mona);
6769

‎examples/example.c‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
#include <mona.h>
33
#include <stdlib.h>
44

5-
#define ASSERT_MESSAGE(__cond__, __msg__) \
6-
if(!(__cond__)) { \
7-
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, __msg__); \
8-
exit(-1); \
5+
#define ASSERT_MESSAGE(__cond__, __msg__) \
6+
if (!(__cond__)) { \
7+
fprintf(stderr, "[%d] Assertion failed (%s): %s\n", rank, #__cond__, \
8+
__msg__); \
9+
exit(-1); \
910
}
1011

11-
int main(int argc, char** argv) {
12+
int main(int argc, char** argv)
13+
{
1214

13-
int rank, size, i;
15+
int rank, size, i;
1416
na_return_t ret;
1517

1618
MPI_Init(&argc, &argv);
@@ -19,13 +21,14 @@ int main(int argc, char** argv) {
1921
MPI_Comm_size(MPI_COMM_WORLD, &size);
2022

2123
mona_instance_t mona = mona_init("na+sm", true, NULL);
22-
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL, "Could not initialize Mona instance");
24+
ASSERT_MESSAGE(mona != MONA_INSTANCE_NULL,
25+
"Could not initialize Mona instance");
2326
printf("[%d] Correctly instanciated Mona\n", rank);
2427

25-
char addr_str[128];
26-
size_t addr_size = 128;
27-
mona_addr_t addr = MONA_ADDR_NULL;
28-
ret = mona_addr_self(mona, &addr);
28+
char addr_str[128];
29+
size_t addr_size = 128;
30+
mona_addr_t addr = MONA_ADDR_NULL;
31+
ret = mona_addr_self(mona, &addr);
2932
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not get self address");
3033

3134
ret = mona_addr_to_string(mona, addr_str, &addr_size, addr);
@@ -39,26 +42,28 @@ int main(int argc, char** argv) {
3942
printf("[%d] Message size: %ld\n", rank, msg_len);
4043

4144
void* plugin_data = NULL;
42-
char* buf = (char*)mona_msg_buf_alloc(mona, msg_len, &plugin_data);
45+
char* buf = (char*)mona_msg_buf_alloc(mona, msg_len, &plugin_data);
4346
ASSERT_MESSAGE(buf != NULL, "Could not allocate message buffer");
4447

45-
if(rank == 0) {
46-
MPI_Recv(addr_str, 128, MPI_CHAR, 1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
48+
if (rank == 0) {
49+
MPI_Recv(addr_str, 128, MPI_CHAR, 1, 0, MPI_COMM_WORLD,
50+
MPI_STATUS_IGNORE);
4751

4852
ret = mona_addr_lookup(mona, addr_str, &addr);
4953
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not lookup address");
5054

5155
printf("[0] Sending message to rank 1\n");
5256

53-
for(i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len; i++) {
57+
for (i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len;
58+
i++) {
5459
buf[i] = i % 32;
5560
}
5661

5762
ret = mona_msg_init_unexpected(mona, buf, msg_len);
5863
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not initialize message");
5964

60-
ret = mona_msg_send_unexpected(
61-
mona, buf, msg_len, plugin_data, addr, 0, 1234);
65+
ret = mona_msg_send_unexpected(mona, buf, msg_len, plugin_data, addr, 0,
66+
1234);
6267
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not send message");
6368

6469
ret = mona_addr_free(mona, addr);
@@ -68,20 +73,21 @@ int main(int argc, char** argv) {
6873
MPI_Send(addr_str, 128, MPI_CHAR, 0, 0, MPI_COMM_WORLD);
6974

7075
mona_addr_t source_addr = MONA_ADDR_NULL;
71-
na_tag_t tag = 0;
72-
size_t actual_size = 0;
76+
na_tag_t tag = 0;
77+
size_t actual_size = 0;
7378

74-
ret = mona_msg_recv_unexpected(
75-
mona, buf, msg_len, plugin_data,
76-
&source_addr, &tag, &actual_size);
79+
ret = mona_msg_recv_unexpected(mona, buf, msg_len, plugin_data,
80+
&source_addr, &tag, &actual_size);
7781
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not receive message");
7882

79-
printf("[1] Receiving message from rank 0 with tag %d and size %ld\n", tag, actual_size);
83+
printf("[1] Receiving message from rank 0 with tag %d and size %ld\n",
84+
tag, actual_size);
8085

8186
ret = mona_addr_free(mona, source_addr);
8287
ASSERT_MESSAGE(ret == NA_SUCCESS, "Could not free source address");
8388

84-
for(i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len; i++) {
89+
for (i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len;
90+
i++) {
8591
ASSERT_MESSAGE(buf[i] == i % 32, "Incorrect byte received");
8692
}
8793
}

‎include/mona-coll.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
extern "C" {
1313
#endif
1414

15-
#define MONA_IN_PLACE ((void*)-1)
15+
#define MONA_IN_PLACE ((void*)-1)
1616
#define MONA_ANY_SOURCE ((int)-1)
1717

1818
/**
@@ -50,10 +50,10 @@ typedef void (*mona_op_t)(const void*, void*, size_t, size_t, void*);
5050
*
5151
* @return NA_SUCCESS or corresponding error code (see na.h)
5252
*/
53-
na_return_t mona_comm_create(mona_instance_t mona,
54-
size_t count,
53+
na_return_t mona_comm_create(mona_instance_t mona,
54+
size_t count,
5555
const mona_addr_t* peers,
56-
mona_comm_t* comm);
56+
mona_comm_t* comm);
5757

5858
/**
5959
* @brief Free a communicator.
@@ -235,13 +235,13 @@ na_return_t mona_comm_probe(mona_comm_t comm,
235235
/**
236236
* @see Non-blocking version of mona_comm_probe.
237237
*/
238-
na_return_t mona_comm_iprobe(mona_comm_t comm,
239-
int src,
240-
na_tag_t tag,
241-
int* flag,
242-
size_t* actual_size,
243-
int* actual_src,
244-
na_tag_t* actual_tag);
238+
na_return_t mona_comm_iprobe(mona_comm_t comm,
239+
int src,
240+
na_tag_t tag,
241+
int* flag,
242+
size_t* actual_size,
243+
int* actual_src,
244+
na_tag_t* actual_tag);
245245
/**
246246
* @brief Issue a send and a receive in parallel.
247247
*

‎include/mona.h‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ typedef struct mona_request* mona_request_t;
2424
#define MONA_ADDR_NULL ((mona_addr_t)NULL)
2525
#define MONA_MEM_HANDLE_NULL ((mona_mem_handle_t)NULL)
2626

27-
#define MONA_ANY_ADDR MONA_ADDR_NULL
28-
#define MONA_ANY_TAG 0xFFFFFFFF
27+
#define MONA_ANY_ADDR MONA_ADDR_NULL
28+
#define MONA_ANY_TAG 0xFFFFFFFF
2929

3030
/**
3131
* @brief Initialize a Mona instance.
@@ -581,25 +581,25 @@ na_return_t mona_uisend_nc(mona_instance_t mona,
581581
*
582582
* @return NA_SUCCESS or corresponding NA error code
583583
*/
584-
na_return_t mona_usend_mem(mona_instance_t mona,
584+
na_return_t mona_usend_mem(mona_instance_t mona,
585585
mona_mem_handle_t mem,
586-
size_t size,
587-
size_t offset,
588-
mona_addr_t dest,
589-
uint8_t dest_id,
590-
na_tag_t tag);
586+
size_t size,
587+
size_t offset,
588+
mona_addr_t dest,
589+
uint8_t dest_id,
590+
na_tag_t tag);
591591

592592
/**
593593
* @see Non-blocking version of mona_usend_mem.
594594
*/
595-
na_return_t mona_uisend_mem(mona_instance_t mona,
595+
na_return_t mona_uisend_mem(mona_instance_t mona,
596596
mona_mem_handle_t mem,
597-
size_t size,
598-
size_t offset,
599-
mona_addr_t dest,
600-
uint8_t dest_id,
601-
na_tag_t tag,
602-
mona_request_t* req);
597+
size_t size,
598+
size_t offset,
599+
mona_addr_t dest,
600+
uint8_t dest_id,
601+
na_tag_t tag,
602+
mona_request_t* req);
603603

604604
/**
605605
* @brief High-level blocking urecv function. This function will
@@ -1201,11 +1201,11 @@ na_return_t mona_mem_handle_create(mona_instance_t mona,
12011201
*
12021202
* \return NA_SUCCESS or corresponding NA error code
12031203
*/
1204-
na_return_t mona_mem_handle_create_segments(mona_instance_t mona,
1205-
struct na_segment* segments,
1206-
size_t segment_count,
1207-
unsigned long flags,
1208-
mona_mem_handle_t* mem_handle);
1204+
na_return_t mona_mem_handle_create_segments(mona_instance_t mona,
1205+
struct na_segment* segments,
1206+
size_t segment_count,
1207+
unsigned long flags,
1208+
mona_mem_handle_t* mem_handle);
12091209

12101210
/**
12111211
* Free memory handle.
@@ -1228,7 +1228,8 @@ na_return_t mona_mem_handle_free(mona_instance_t mona,
12281228
*
12291229
* \return NA_SUCCESS or corresponding NA error code
12301230
*/
1231-
na_return_t mona_mem_register(mona_instance_t mona, mona_mem_handle_t mem_handle);
1231+
na_return_t mona_mem_register(mona_instance_t mona,
1232+
mona_mem_handle_t mem_handle);
12321233

12331234
/**
12341235
* Unregister memory.
@@ -1238,7 +1239,7 @@ na_return_t mona_mem_register(mona_instance_t mona, mona_mem_handle_t mem_handle
12381239
*
12391240
* \return NA_SUCCESS or corresponding NA error code
12401241
*/
1241-
na_return_t mona_mem_deregister(mona_instance_t mona,
1242+
na_return_t mona_mem_deregister(mona_instance_t mona,
12421243
mona_mem_handle_t mem_handle);
12431244

12441245
/**

0 commit comments

Comments
 (0)