Skip to content

Commit 3ba1dbf

Browse files
github-actions[bot]github-actions[bot]
committed
Committing clang-format changes
1 parent 517fd6a commit 3ba1dbf

File tree

3 files changed

+34
-30
lines changed

3 files changed

+34
-30
lines changed

‎src/server/pdc_client_server_common.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,10 @@ PDC_mkdir(const char *dir)
414414

415415
for (p = tmp + 1; *p; p++) {
416416
if (*p == '/') {
417-
*p = '\0';
417+
*p = '\0';
418418
errno = 0;
419419
if (mkdir(tmp, S_IRWXU | S_IRWXG) < 0) {
420-
if(errno != EEXIST) {
420+
if (errno != EEXIST) {
421421
fprintf(stderr, "mkdir failed at %s: ", tmp);
422422
perror("mkdir");
423423
}

‎src/server/pdc_server_region/pdc_server_data.c‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -390,12 +390,12 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr
390390
if (new_obj_reg == NULL) {
391391
ret_value = FAIL;
392392
}
393-
new_obj_reg->obj_id = obj_id;
394-
new_obj_reg->region_lock_head = NULL;
395-
new_obj_reg->region_buf_map_head = NULL;
396-
new_obj_reg->region_lock_request_head = NULL;
397-
new_obj_reg->region_storage_head = NULL;
398-
new_obj_reg->close_flag = close_flag;
393+
new_obj_reg->obj_id = obj_id;
394+
new_obj_reg->region_lock_head = NULL;
395+
new_obj_reg->region_buf_map_head = NULL;
396+
new_obj_reg->region_lock_request_head = NULL;
397+
new_obj_reg->region_storage_head = NULL;
398+
new_obj_reg->close_flag = close_flag;
399399
new_obj_reg->storage_location[region_index] = (char *)calloc(ADDR_MAX, sizeof(char));
400400
new_obj_reg->region_size_elements = UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS;
401401
new_obj_reg->fd =
@@ -409,17 +409,18 @@ PDC_Server_register_obj_region_by_pointer(data_server_region_t **new_obj_reg_ptr
409409
}
410410
else {
411411
LOG_JUST_PRINT("3\n");
412-
if(new_obj_reg->storage_location[region_index] == NULL) {
412+
if (new_obj_reg->storage_location[region_index] == NULL) {
413413
new_obj_reg->storage_location[region_index] = (char *)calloc(ADDR_MAX, sizeof(char));
414414
}
415-
if(new_obj_reg->storage_location[region_index][0] == 0) {
415+
if (new_obj_reg->storage_location[region_index][0] == 0) {
416416
fill_storage_path(new_obj_reg->storage_location[region_index], obj_id, region_index);
417417
}
418418

419419
if (new_obj_reg->fd < 0) {
420420
LOG_JUST_PRINT("4\n");
421421
new_obj_reg->close_flag = close_flag;
422-
new_obj_reg->fd = server_open_storage(new_obj_reg->storage_location[region_index], obj_id, region_index);
422+
new_obj_reg->fd =
423+
server_open_storage(new_obj_reg->storage_location[region_index], obj_id, region_index);
423424

424425
if (new_obj_reg->fd < 0) {
425426
LOG_ERROR("Failed to open file %s\n", new_obj_reg->storage_location[region_index]);
@@ -4514,7 +4515,9 @@ typedef enum {
45144515
REGION_PER_FILE_IO_TYPE_WRITE,
45154516
} REGION_PER_FILE_IO_TYPE;
45164517

4517-
static int is_fd_valid(int fd) {
4518+
static int
4519+
is_fd_valid(int fd)
4520+
{
45184521
return fcntl(fd, F_GETFD) != -1 || errno != EBADF;
45194522
}
45204523

@@ -4591,7 +4594,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
45914594
// Register the initial region
45924595
PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index);
45934596

4594-
if(region == NULL) {
4597+
if (region == NULL) {
45954598
PGOTO_ERROR(FAIL, "Failed to register obj_region by pointer");
45964599
}
45974600

@@ -4606,7 +4609,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46064609
}
46074610

46084611
for (uint64_t count = 0; count < num_elements; count++) {
4609-
//printf("\tcur count: %d\n", count);
4612+
// printf("\tcur count: %d\n", count);
46104613
// Compute flat index
46114614
uint64_t flat_index = 0;
46124615
uint64_t temp_stride = 1;
@@ -4629,7 +4632,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46294632
region_index = new_region_index;
46304633
PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index);
46314634

4632-
if(region == NULL) {
4635+
if (region == NULL) {
46334636
PGOTO_ERROR(FAIL, "Failed to register obj_region by pointer");
46344637
}
46354638

@@ -4654,9 +4657,10 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46544657
}
46554658

46564659
if (res != (ssize_t)unit) {
4657-
if(is_fd_valid(region->fd)) {
4660+
if (is_fd_valid(region->fd)) {
46584661
LOG_JUST_PRINT("region->fd was valid\n");
4659-
} else {
4662+
}
4663+
else {
46604664
LOG_JUST_PRINT("region->fd %d was invalid\n", region->fd);
46614665
}
46624666
LOG_JUST_PRINT("expected io size %d: actual io size %d\n", unit, res);
@@ -4666,7 +4670,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46664670
PGOTO_ERROR(FAIL, "I/O operation failed\n");
46674671
}
46684672
else {
4669-
//LOG_JUST_PRINT("\tio storage location: %s\n", region->storage_location[region_index]);
4673+
// LOG_JUST_PRINT("\tio storage location: %s\n", region->storage_location[region_index]);
46704674
}
46714675

46724676
// Advance indices

‎src/server/pdc_server_region/pdc_server_region_request_handler.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)
8989
LOG_JUST_PRINT("\tregion offset[%d]=%d\n", j, request_data.remote_offset[i][j]);
9090
}
9191
temp_ptrs[i] = PDC_Server_get_obj_region(request_data.obj_id[i]);
92-
//PDC_Server_register_obj_region_by_pointer(&(temp_ptrs[i]), request_data.obj_id[i], 1, 0);
92+
// PDC_Server_register_obj_region_by_pointer(&(temp_ptrs[i]), request_data.obj_id[i], 1, 0);
9393
}
9494
LOG_JUST_PRINT("=====================================END=====================================\n");
9595
#endif
@@ -123,7 +123,7 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)
123123
}
124124
#ifndef PDC_SERVER_CACHE
125125
for (i = 0; i < request_data.n_objs; ++i) {
126-
//PDC_Server_unregister_obj_region_by_pointer(temp_ptrs[i], 1);
126+
// PDC_Server_unregister_obj_region_by_pointer(temp_ptrs[i], 1);
127127
}
128128
free(temp_ptrs);
129129
#endif
@@ -227,8 +227,8 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
227227
temp_ptrs[i]->region_size_elements = num_elements;
228228
}*/
229229

230-
//uint64_t region_index = num_elements / temp_ptrs[i]->region_size_elements;
231-
//PDC_Server_register_obj_region_by_pointer(temp_ptrs + i, request_data.obj_id[i], 1, 0);
230+
// uint64_t region_index = num_elements / temp_ptrs[i]->region_size_elements;
231+
// PDC_Server_register_obj_region_by_pointer(temp_ptrs + i, request_data.obj_id[i], 1, 0);
232232
}
233233
LOG_JUST_PRINT("=====================================END=====================================\n");
234234
#endif
@@ -237,15 +237,15 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
237237
remote_reg_info->ndim = request_data.remote_ndim[i];
238238
remote_reg_info->offset = request_data.remote_offset[i];
239239
remote_reg_info->size = request_data.remote_length[i];
240-
/*#ifdef PDC_SERVER_CACHE
241-
PDC_transfer_request_data_write_out(request_data.obj_id[i], request_data.obj_ndim[i],
242-
request_data.obj_dims[i], remote_reg_info,
243-
(void *)request_data.data_buf[i], request_data.unit[i]);
244-
#else*/
240+
/*#ifdef PDC_SERVER_CACHE
241+
PDC_transfer_request_data_write_out(request_data.obj_id[i], request_data.obj_ndim[i],
242+
request_data.obj_dims[i], remote_reg_info,
243+
(void *)request_data.data_buf[i], request_data.unit[i]);
244+
#else*/
245245
PDC_Server_transfer_request_io(request_data.obj_id[i], request_data.obj_ndim[i],
246246
request_data.obj_dims[i], remote_reg_info,
247247
(void *)request_data.data_buf[i], request_data.unit[i], 1);
248-
//#endif
248+
//#endif
249249

250250
#if 0
251251
uint64_t j;
@@ -266,8 +266,8 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
266266
#endif
267267

268268
#ifndef PDC_SERVER_CACHE
269-
//for (i = 0; i < request_data.n_objs; ++i) {
270-
//PDC_Server_unregister_obj_region_by_pointer(temp_ptrs[i], 1);
269+
// for (i = 0; i < request_data.n_objs; ++i) {
270+
// PDC_Server_unregister_obj_region_by_pointer(temp_ptrs[i], 1);
271271
//}
272272
free(temp_ptrs);
273273
#endif

0 commit comments

Comments
 (0)