Skip to content

Commit 863a2a3

Browse files
TheAssembler1TheAssembler1
committed
checkpoint
1 parent 3ba1dbf commit 863a2a3

File tree

9 files changed

+169
-43
lines changed

9 files changed

+169
-43
lines changed

‎examples/region_transfer_2D.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ main(int argc, char **argv)
6868
LOG_INFO("Create a container property\n");
6969
}
7070
else {
71-
LOG_ERROR("Failed to create container property");
71+
LOG_ERROR("Failed to create container property\n");
7272
ret_value = 1;
7373
}
7474
// create a container
@@ -78,7 +78,7 @@ main(int argc, char **argv)
7878
LOG_INFO("Create a container c1\n");
7979
}
8080
else {
81-
LOG_ERROR("Failed to create container");
81+
LOG_ERROR("Failed to create container\n");
8282
ret_value = 1;
8383
}
8484
// create an object property
@@ -87,13 +87,13 @@ main(int argc, char **argv)
8787
LOG_INFO("Create an object property\n");
8888
}
8989
else {
90-
LOG_ERROR("Failed to create object property");
90+
LOG_ERROR("Failed to create object property\n");
9191
ret_value = 1;
9292
}
9393

9494
ret = PDCprop_set_obj_type(obj_prop, PDC_INT);
9595
if (ret != SUCCEED) {
96-
LOG_ERROR("Failed to set obj type");
96+
LOG_ERROR("Failed to set obj type\n");
9797
ret_value = 1;
9898
}
9999
PDCprop_set_obj_dims(obj_prop, 2, dims);
@@ -109,7 +109,7 @@ main(int argc, char **argv)
109109
LOG_INFO("Create an object o1\n");
110110
}
111111
else {
112-
LOG_ERROR("Failed to create object");
112+
LOG_ERROR("Failed to create object\n");
113113
ret_value = 1;
114114
}
115115
// create second object
@@ -119,7 +119,7 @@ main(int argc, char **argv)
119119
LOG_INFO("Create an object o2\n");
120120
}
121121
else {
122-
LOG_ERROR("Failed to create object");
122+
LOG_ERROR("Failed to create object\n");
123123
ret_value = 1;
124124
}
125125

@@ -143,19 +143,19 @@ main(int argc, char **argv)
143143
PDCregion_transfer_close(transfer_request);
144144

145145
if (PDCregion_close(reg) < 0) {
146-
LOG_ERROR("Failed to close local region");
146+
LOG_ERROR("Failed to close local region\n");
147147
ret_value = 1;
148148
}
149149
else {
150-
LOG_INFO("successfully closed local region");
150+
LOG_INFO("successfully closed local region\n");
151151
}
152152

153153
if (PDCregion_close(reg_global) < 0) {
154-
LOG_ERROR("Failed to close global region");
154+
LOG_ERROR("Failed to close global region\n");
155155
ret_value = 1;
156156
}
157157
else {
158-
LOG_INFO("successfully closed global region");
158+
LOG_INFO("successfully closed global region\n");
159159
}
160160

161161
offset[0] = 0;
@@ -183,65 +183,65 @@ main(int argc, char **argv)
183183
}
184184
}
185185
if (PDCregion_close(reg) < 0) {
186-
LOG_ERROR("Failed to close local region");
186+
LOG_ERROR("Failed to close local region\n");
187187
ret_value = 1;
188188
}
189189
else {
190-
LOG_INFO("successfully local region");
190+
LOG_INFO("successfully local region\n");
191191
}
192192

193193
if (PDCregion_close(reg_global) < 0) {
194-
LOG_ERROR("Failed to close global region");
194+
LOG_ERROR("Failed to close global region\n");
195195
ret_value = 1;
196196
}
197197
else {
198-
LOG_INFO("successfully closed global region");
198+
LOG_INFO("successfully closed global region\n");
199199
}
200200

201201
// close object
202202
if (PDCobj_close(obj1) < 0) {
203-
LOG_ERROR("Failed to close object o1");
203+
LOG_ERROR("Failed to close object o1\n");
204204
ret_value = 1;
205205
}
206206
else {
207-
LOG_INFO("Successfully closed object o1");
207+
LOG_INFO("Successfully closed object o1\n");
208208
}
209209
if (PDCobj_close(obj2) < 0) {
210-
LOG_ERROR("Failed to close object o2");
210+
LOG_ERROR("Failed to close object o2\n");
211211
ret_value = 1;
212212
}
213213
else {
214-
LOG_INFO("Successfully closed object o2");
214+
LOG_INFO("Successfully closed object o2\n");
215215
}
216216
// close a container
217217
if (PDCcont_close(cont) < 0) {
218-
LOG_ERROR("Failed to close container c1");
218+
LOG_ERROR("Failed to close container c1\n");
219219
ret_value = 1;
220220
}
221221
else {
222-
LOG_INFO("Successfully closed container c1");
222+
LOG_INFO("Successfully closed container c1\n");
223223
}
224224
// close a object property
225225
if (PDCprop_close(obj_prop) < 0) {
226226
LOG_ERROR("Failed to close property");
227227
ret_value = 1;
228228
}
229229
else {
230-
LOG_INFO("Successfully closed object property");
230+
LOG_INFO("Successfully closed object property\n");
231231
}
232232
// close a container property
233233
if (PDCprop_close(cont_prop) < 0) {
234234
LOG_ERROR("Failed to close property");
235235
ret_value = 1;
236236
}
237237
else {
238-
LOG_INFO("Successfully closed container property");
238+
LOG_INFO("Successfully closed container property\n");
239239
}
240240
free(data);
241241
free(data_read);
242242
// close pdc
243243
if (PDCclose(pdc) < 0) {
244-
LOG_ERROR("Failed to close PDC");
244+
LOG_ERROR("Failed to close PDC\n");
245245
ret_value = 1;
246246
}
247247
#ifdef ENABLE_MPI

‎network.patch‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c
2+
index 7aa15998..f861ae8e 100644
3+
--- a/examples/read_write_col_perf.c
4+
+++ b/examples/read_write_col_perf.c
5+
@@ -117,6 +117,7 @@ main(int argc, char **argv)
6+
7+
char hostname[256];
8+
gethostname(hostname, 256);
9+
+ strcpy(hostname, "eno1");
10+
if (rank == 0) {
11+
LOG_INFO("number of dimensions in this test is %d\n", ndim);
12+
LOG_INFO("data size = %llu\n", (long long unsigned)data_size);
13+
diff --git a/examples/read_write_perf.c b/examples/read_write_perf.c
14+
index 923fdae1..6b27c700 100644
15+
--- a/examples/read_write_perf.c
16+
+++ b/examples/read_write_perf.c
17+
@@ -111,6 +111,7 @@ main(int argc, char **argv)
18+
#endif
19+
char hostname[256];
20+
gethostname(hostname, 256);
21+
+ strcpy(hostname, "eno1");
22+
if (rank == 0) {
23+
LOG_INFO("number of dimensions in this test is %d\n", ndim);
24+
LOG_INFO("data size = %llu\n", (long long unsigned)data_size);
25+
diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c
26+
index 50e29956..7e84f3a8 100644
27+
--- a/src/api/pdc_client_connect.c
28+
+++ b/src/api/pdc_client_connect.c
29+
@@ -1380,6 +1380,7 @@ PDC_Client_mercury_init(hg_class_t **hg_class, hg_context_t **hg_context, int po
30+
}
31+
memset(hostname, 0, sizeof(hostname));
32+
gethostname(hostname, sizeof(hostname));
33+
+ strcpy(hostname, "eno1");
34+
sprintf(na_info_string, "%s://%s:%d", hg_transport, hostname, port);
35+
if (pdc_client_mpi_rank_g == 0) {
36+
LOG_INFO("==PDC_CLIENT: using %.7s\n", na_info_string);
37+
diff --git a/src/commons/utils/pdc_timing.c b/src/commons/utils/pdc_timing.c
38+
index 0adea269..322674c1 100644
39+
--- a/src/commons/utils/pdc_timing.c
40+
+++ b/src/commons/utils/pdc_timing.c
41+
@@ -41,6 +41,7 @@ PDC_timing_init()
42+
43+
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
44+
gethostname(hostname, HOST_NAME_MAX);
45+
+ strcpy(hostname, "eno1");
46+
if (!(rank % 31)) {
47+
LOG_INFO("client process rank %d, hostname = %s\n", rank, hostname);
48+
}
49+
@@ -126,6 +127,7 @@ PDC_timing_report(const char *prefix)
50+
time(&now);
51+
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
52+
gethostname(hostname, HOST_NAME_MAX);
53+
+ strcpy(hostname, "eno1");
54+
if (!(rank % 32)) {
55+
LOG_INFO("client process rank %d, hostname = %s\n", rank, hostname);
56+
}
57+
@@ -261,6 +263,7 @@ PDC_server_timing_init()
58+
59+
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
60+
gethostname(hostname, HOST_NAME_MAX);
61+
+ strcpy(hostname, "eno1");
62+
63+
LOG_INFO("server process rank %d, hostname = %s\n", rank, hostname);
64+
/*
65+
diff --git a/src/server/pdc_server.c b/src/server/pdc_server.c
66+
index 9247005f..4c8b52e2 100644
67+
--- a/src/server/pdc_server.c
68+
+++ b/src/server/pdc_server.c
69+
@@ -819,6 +819,7 @@ PDC_Server_init(int port, hg_class_t **hg_class, hg_context_t **hg_context)
70+
}
71+
memset(hostname, 0, HOSTNAME_LEN);
72+
gethostname(hostname, HOSTNAME_LEN - 1);
73+
+ strcpy(hostname, "eno1");
74+
snprintf(na_info_string, NA_STRING_INFO_LEN, "%s://%s:%d", hg_transport, hostname, port);
75+
if (pdc_server_rank_g == 0)
76+
LOG_INFO("==PDC_SERVER[%d]: using %.7s\n", pdc_server_rank_g, na_info_string);
77+
diff --git a/src/tests/read_write_col_perf.c b/src/tests/read_write_col_perf.c
78+
index d9d0d0ee..20fbb616 100644
79+
--- a/src/tests/read_write_col_perf.c
80+
+++ b/src/tests/read_write_col_perf.c
81+
@@ -119,6 +119,7 @@ main(int argc, char **argv)
82+
83+
char hostname[256];
84+
gethostname(hostname, 256);
85+
+ strcpy(hostname, "eno1");
86+
87+
if (rank == 0) {
88+
LOG_INFO("number of dimensions in this test is %d\n", ndim);
89+
diff --git a/src/tests/read_write_perf.c b/src/tests/read_write_perf.c
90+
index 152140d5..6f5a9840 100644
91+
--- a/src/tests/read_write_perf.c
92+
+++ b/src/tests/read_write_perf.c
93+
@@ -113,6 +113,7 @@ main(int argc, char **argv)
94+
#endif
95+
char hostname[256];
96+
gethostname(hostname, 256);
97+
+ strcpy(hostname, "eno1");
98+
if (rank == 0) {
99+
LOG_INFO("number of dimensions in this test is %d\n", ndim);
100+
LOG_INFO("data size = %llu\n", (long long unsigned)data_size);

‎push.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
git commit -m "another"
2+
git push

‎src/server/include/pdc_client_server_common.h‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ typedef struct pdc_data_server_io_list_t {
318318
} pdc_data_server_io_list_t;
319319

320320
#define UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS -1
321+
// FIXME: temp for region per file
322+
#define PDC_USE_REGION_PER_FILE
321323

322324
typedef struct data_server_region_t {
323325
uint64_t obj_id;
@@ -337,10 +339,22 @@ typedef struct data_server_region_t {
337339
// For non-mapped object analysis
338340
// Used primarily as a local_temp
339341
void *obj_data_ptr;
340-
// FIXME: (Noah) we should dynamically allocate this number....
342+
#ifdef PDC_USE_REGION_PER_FILE
343+
// FIXME: (Noah) we should dynamically allocate this number
341344
char *storage_location[4096]; // save the file location to enable reopening
342-
// number of elements per region
343-
int region_size_elements;
345+
/**
346+
* Number of elements per region, based on the size
347+
* of the first region transfer size for an object
348+
* Initial value of UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS
349+
*/
350+
int region_size_elements;
351+
/**
352+
* Used as flag to indicate whether region per file is used
353+
* The flag should be set if region size in bytes is greater than or equal
354+
* to chunk size
355+
*/
356+
uint8_t use_region_per_file;
357+
#endif
344358
struct data_server_region_t *prev;
345359
struct data_server_region_t *next;
346360
} data_server_region_t;

‎src/server/pdc_client_server_common.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ PDC_mkdir(const char *dir)
418418
errno = 0;
419419
if (mkdir(tmp, S_IRWXU | S_IRWXG) < 0) {
420420
if (errno != EEXIST) {
421-
fprintf(stderr, "mkdir failed at %s: ", tmp);
422-
perror("mkdir");
421+
LOG_ERROR("mkdir failed at %s: ", tmp);
422+
FUNC_LEAVE_VOID;
423423
}
424424
}
425425
*p = '/';

‎src/server/pdc_server.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,8 +1700,10 @@ PDC_Server_restart(char *filename)
17001700
data_server_region_t *new_obj_reg =
17011701
(data_server_region_t *)calloc(1, sizeof(struct data_server_region_t));
17021702
new_obj_reg->fd = -1;
1703+
#ifdef PDC_USE_REGION_PER_FILE
17031704
// FIXME: (Noah)
17041705
new_obj_reg->storage_location[0] = (char *)malloc(sizeof(char) * ADDR_MAX);
1706+
#endif
17051707
if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) {
17061708
LOG_ERROR("Read failed for obj_id\n");
17071709
}

0 commit comments

Comments
 (0)