Skip to content

Commit 23cded6

Browse files
github-actions[bot]github-actions[bot]
committed
Committing clang-format changes
1 parent e70bfd4 commit 23cded6

File tree

8 files changed

+49
-47
lines changed

8 files changed

+49
-47
lines changed

‎src/server/include/pdc_client_server_common.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ typedef struct data_server_region_t {
334334
region_list_t *region_storage_head;
335335
// For non-mapped object analysis
336336
// Used primarily as a local_temp
337-
void * obj_data_ptr;
337+
void *obj_data_ptr;
338338
// FIXME: (Noah) we should dynamically allocate this number....
339-
char* storage_location[1024]; // save the file location to enable reopening
339+
char * storage_location[1024]; // save the file location to enable reopening
340340
struct data_server_region_t *prev;
341341
struct data_server_region_t *next;
342342
} data_server_region_t;

‎src/server/pdc_client_server_common.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,8 +1214,9 @@ PDC_Server_release_lock_request(uint64_t obj_id ATTRIBUTE(unused)
12141214
{
12151215
return SUCCEED;
12161216
}
1217-
perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
1218-
struct pdc_region_info *region_info, void *buf, size_t unit)
1217+
perr_t
1218+
PDC_Server_data_write_out_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
1219+
size_t unit)
12191220
{
12201221
return SUCCEED;
12211222
}
@@ -1228,8 +1229,8 @@ PDC_Server_data_write_out(uint64_t obj_id ATTRIBUTE(unused),
12281229
}
12291230
perr_t
12301231
PDC_Server_data_read_from_region_per_file(uint64_t obj_id ATTRIBUTE(unused),
1231-
struct pdc_region_info *region_info ATTRIBUTE(unused), void *buf ATTRIBUTE(unused),
1232-
size_t unit ATTRIBUTE(unused))
1232+
struct pdc_region_info *region_info ATTRIBUTE(unused),
1233+
void *buf ATTRIBUTE(unused), size_t unit ATTRIBUTE(unused))
12331234
{
12341235
return SUCCEED;
12351236
}
@@ -1348,7 +1349,8 @@ PDC_Server_unregister_obj_region(pdcid_t obj_id ATTRIBUTE(unused))
13481349
}
13491350
perr_t
13501351
PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg ATTRIBUTE(unused),
1351-
pdcid_t obj_id ATTRIBUTE(unused), int close_flag ATTRIBUTE(unused), uint64_t offset ATTRIBUTE(unused))
1352+
pdcid_t obj_id ATTRIBUTE(unused), int close_flag ATTRIBUTE(unused),
1353+
uint64_t offset ATTRIBUTE(unused))
13521354
{
13531355
return 0;
13541356
}

‎src/server/pdc_server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ PDC_Server_restart(char *filename)
16991699
for (i = 0; i < n_objs; ++i) {
17001700
data_server_region_t *new_obj_reg =
17011701
(data_server_region_t *)calloc(1, sizeof(struct data_server_region_t));
1702-
new_obj_reg->fd = -1;
1702+
new_obj_reg->fd = -1;
17031703
// FIXME: (Noah)
17041704
new_obj_reg->storage_location[0] = (char *)malloc(sizeof(char) * ADDR_MAX);
17051705
if (fread(&new_obj_reg->obj_id, sizeof(uint64_t), 1, file) != 1) {

‎src/server/pdc_server_region/include/pdc_server_data.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ hg_return_t PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_
479479
*
480480
* \return Non-negative on success/Negative on failure
481481
*/
482-
perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
483-
struct pdc_region_info *region_info, void *buf, size_t unit);
482+
perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info,
483+
void *buf, size_t unit);
484484

485485
/**
486486
* Write data out to desired storage
@@ -505,9 +505,8 @@ perr_t PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region
505505
*
506506
* \return Non-negative on success/Negative on failure
507507
*/
508-
perr_t
509-
PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info,
510-
void *buf, size_t unit);
508+
perr_t PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info,
509+
void *buf, size_t unit);
511510

512511
/**
513512
* Read data from desired storage

‎src/server/pdc_server_region/pdc_server_data.c‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,9 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr
363363
new_obj_reg->region_storage_head = NULL;
364364
new_obj_reg->close_flag = close_flag;
365365
// FIXME: (Noah)
366-
new_obj_reg->storage_location[region_index] = (char *)malloc(sizeof(char) * ADDR_MAX);
367-
new_obj_reg->fd = server_open_storage(new_obj_reg->storage_location[region_index], obj_id, region_index);
366+
new_obj_reg->storage_location[region_index] = (char *)malloc(sizeof(char) * ADDR_MAX);
367+
new_obj_reg->fd =
368+
server_open_storage(new_obj_reg->storage_location[region_index], obj_id, region_index);
368369

369370
if (new_obj_reg->fd < 0) {
370371
goto done;
@@ -377,13 +378,13 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr
377378
fill_storage_path(new_obj_reg->storage_location[region_index], obj_id, region_index);
378379
}
379380
if (new_obj_reg->fd < 0) {
380-
if(new_obj_reg->storage_location[region_index] == NULL) {
381-
new_obj_reg->storage_location[region_index] = (char *)malloc(sizeof(char) * ADDR_MAX);
381+
if (new_obj_reg->storage_location[region_index] == NULL) {
382+
new_obj_reg->storage_location[region_index] = (char *)malloc(sizeof(char) * ADDR_MAX);
382383
fill_storage_path(new_obj_reg->storage_location[region_index], obj_id, region_index);
383384
}
384385
new_obj_reg->close_flag = close_flag;
385386
// FIXME: (Noah)
386-
new_obj_reg->fd = open(new_obj_reg->storage_location[region_index], O_RDWR | O_CREAT, 0666);
387+
new_obj_reg->fd = open(new_obj_reg->storage_location[region_index], O_RDWR | O_CREAT, 0666);
387388
if (new_obj_reg->fd < 0) {
388389
goto done;
389390
}
@@ -4470,8 +4471,9 @@ _setup_zfp(struct pdc_region_info *region_info, zfp_stream **zfp)
44704471
}
44714472
#endif
44724473

4473-
perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
4474-
struct pdc_region_info *region_info, void *buf, size_t unit)
4474+
perr_t
4475+
PDC_Server_data_write_out_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
4476+
size_t unit)
44754477
{
44764478
int ret_value = SUCCEED;
44774479

@@ -4480,23 +4482,23 @@ perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
44804482
LOG_JUST_PRINT("===============================================\n");
44814483
LOG_JUST_PRINT("Called with parameters:\n");
44824484
LOG_JUST_PRINT("\tobj_id: %" PRIu64 "\n", obj_id);
4483-
LOG_JUST_PRINT("\tregion_info: %p\n", (void*)region_info);
4485+
LOG_JUST_PRINT("\tregion_info: %p\n", (void *)region_info);
44844486
LOG_JUST_PRINT("\tbuf: %p\n", buf);
44854487
LOG_JUST_PRINT("\tunit: %zu\n", unit);
44864488

44874489
// compute total write size in bytes
44884490
uint64_t write_size_bytes = region_info->size[0];
4489-
for(int i = 1; i < region_info->ndim; i++) {
4491+
for (int i = 1; i < region_info->ndim; i++) {
44904492
write_size_bytes *= region_info->size[i];
44914493
}
44924494
write_size_bytes *= unit;
4493-
if(write_size_bytes <= 0) {
4495+
if (write_size_bytes <= 0) {
44944496
PGOTO_ERROR(FAIL, "Write size was <= 0");
44954497
}
44964498

44974499
// compute the total offset in bytes
44984500
uint64_t offset_size_bytes = region_info->offset[0];
4499-
for(int i = 1; i < region_info->ndim; i++) {
4501+
for (int i = 1; i < region_info->ndim; i++) {
45004502
offset_size_bytes *= region_info->offset[i];
45014503
}
45024504
offset_size_bytes *= unit;
@@ -4506,10 +4508,10 @@ perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
45064508
LOG_JUST_PRINT("\tregion index: %lu\n", region_index);
45074509

45084510
// get storage location
4509-
data_server_region_t* region = PDC_Server_get_obj_region(obj_id);
4511+
data_server_region_t *region = PDC_Server_get_obj_region(obj_id);
45104512
PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index);
45114513

4512-
if(!region) {
4514+
if (!region) {
45134515
LOG_ERROR("Failed to find region with obj_id: %d\n", obj_id);
45144516
PGOTO_ERROR(FAIL, "Failed to find region");
45154517
}
@@ -4522,7 +4524,7 @@ perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
45224524
LOG_JUST_PRINT("\tfd: %d\n", region->fd);
45234525

45244526
perr_t write_stat = PDC_Server_posix_write(region->fd, buf, write_size_bytes);
4525-
if(write_stat != SUCCEED) {
4527+
if (write_stat != SUCCEED) {
45264528
PGOTO_ERROR(FAIL, "Failed to posix write region\n");
45274529
}
45284530

@@ -4533,10 +4535,9 @@ perr_t PDC_Server_data_write_out_region_per_file(uint64_t obj_id,
45334535
FUNC_LEAVE(ret_value);
45344536
}
45354537

4536-
45374538
perr_t
4538-
PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info,
4539-
void *buf, size_t unit)
4539+
PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
4540+
size_t unit)
45404541
{
45414542
int ret_value = SUCCEED;
45424543

@@ -4545,23 +4546,23 @@ PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_inf
45454546
LOG_JUST_PRINT("===============================================\n");
45464547
LOG_JUST_PRINT("Called with parameters:\n");
45474548
LOG_JUST_PRINT("\tobj_id: %" PRIu64 "\n", obj_id);
4548-
LOG_JUST_PRINT("\tregion_info: %p\n", (void*)region_info);
4549+
LOG_JUST_PRINT("\tregion_info: %p\n", (void *)region_info);
45494550
LOG_JUST_PRINT("\tbuf: %p\n", buf);
45504551
LOG_JUST_PRINT("\tunit: %zu\n", unit);
45514552

45524553
// compute total write size in bytes
45534554
uint64_t read_size_bytes = region_info->size[0];
4554-
for(int i = 1; i < region_info->ndim; i++) {
4555+
for (int i = 1; i < region_info->ndim; i++) {
45554556
read_size_bytes *= region_info->size[i];
45564557
}
45574558
read_size_bytes *= unit;
4558-
if(read_size_bytes <= 0) {
4559+
if (read_size_bytes <= 0) {
45594560
PGOTO_ERROR(FAIL, "Read size was <= 0");
45604561
}
45614562

45624563
// compute the total offset in bytes
45634564
uint64_t offset_size_bytes = region_info->offset[0];
4564-
for(int i = 1; i < region_info->ndim; i++) {
4565+
for (int i = 1; i < region_info->ndim; i++) {
45654566
offset_size_bytes *= region_info->offset[i];
45664567
}
45674568
offset_size_bytes *= unit;
@@ -4571,10 +4572,10 @@ PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_inf
45714572
LOG_JUST_PRINT("\tregion index: %lu\n", region_index);
45724573

45734574
// get storage location
4574-
data_server_region_t* region = PDC_Server_get_obj_region(obj_id);
4575+
data_server_region_t *region = PDC_Server_get_obj_region(obj_id);
45754576
PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index);
45764577

4577-
if(!region) {
4578+
if (!region) {
45784579
LOG_ERROR("Failed to find region with obj_id: %d\n", obj_id);
45794580
PGOTO_ERROR(FAIL, "Failed to find region");
45804581
}
@@ -4588,7 +4589,7 @@ PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_inf
45884589

45894590
// region index acts as the offset so the offset here is 0
45904591
ssize_t bytes_read = pread(region->fd, buf, read_size_bytes, 0);
4591-
if(bytes_read != read_size_bytes) {
4592+
if (bytes_read != read_size_bytes) {
45924593
PGOTO_ERROR(FAIL, "Failed to posix read region\n");
45934594
}
45944595

‎src/server/pdc_server_region/pdc_server_region_cache.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -808,10 +808,10 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int
808808
while (region_cache_iter != NULL) {
809809
region_cache_info = region_cache_iter->region_cache_info;
810810

811-
if(obj_cache == NULL) {
811+
if (obj_cache == NULL) {
812812
LOG_ERROR("obj_cache was null\n");
813813
}
814-
if(region_cache_info == NULL) {
814+
if (region_cache_info == NULL) {
815815
LOG_ERROR("region_cache_info was null\n");
816816
}
817817

@@ -825,8 +825,8 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int
825825
write_size *= region_cache_info->size[2];
826826

827827
if (write_size > 0) {
828-
LOG_INFO("==PDC_SERVER[%d.%d]: server flushed %.1f / %.1f MB to storage\n",
829-
PDC_get_rank(), flag, write_size / 1048576.0, total_cache_size / 1048576.0);
828+
LOG_INFO("==PDC_SERVER[%d.%d]: server flushed %.1f / %.1f MB to storage\n", PDC_get_rank(), flag,
829+
write_size / 1048576.0, total_cache_size / 1048576.0);
830830
}
831831

832832
total_cache_size -= write_size;

‎src/server/pdc_server_region/pdc_server_region_transfer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
276276
if (io_by_region_g || obj_ndim == 0) {
277277
if (is_write) {
278278
// FIXME: (Noah) switching to region per file manually
279-
//PDC_Server_data_write_out(obj_id, region_info, buf, unit);
279+
// PDC_Server_data_write_out(obj_id, region_info, buf, unit);
280280
PDC_Server_data_write_out_region_per_file(obj_id, region_info, buf, unit);
281281
}
282282
else {
283-
//PDC_Server_data_read_from(obj_id, region_info, buf, unit);
283+
// PDC_Server_data_read_from(obj_id, region_info, buf, unit);
284284
PDC_Server_data_read_from_region_per_file(obj_id, region_info, buf, unit);
285285
}
286286
goto done;

‎src/tests/sandbox.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ main(int argc, char **argv)
100100
size[0] = NPARTICLES;
101101
final_size[0] = 2 * NPARTICLES;
102102
offset[0] = 0;
103-
offset2[0] = NPARTICLES;
103+
offset2[0] = NPARTICLES;
104104

105105
pdc = PDCinit("pdc");
106106
printf("generated new pdc\n");
@@ -165,10 +165,10 @@ main(int argc, char **argv)
165165
err = PDCregion_transfer_close(transfer_request);
166166
CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_close",
167167
"Failed to call PDCregion_transfer_close");
168-
168+
169169
// reopen object
170170
PDCobj_close(obj);
171-
obj = PDCobj_open(obj_name, cont);
171+
obj = PDCobj_open(obj_name, cont);
172172

173173
sleep(5);
174174

@@ -197,7 +197,7 @@ main(int argc, char **argv)
197197
err = PDCregion_transfer_close(transfer_request);
198198
CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_close",
199199
"Failed to call PDCregion_transfer_close");
200-
200+
201201
check_buf(NPARTICLES, buf, 3.5);
202202

203203
PDCobj_close(obj);

0 commit comments

Comments
 (0)