Skip to content

Commit a3ae926

Browse files
github-actions[bot]github-actions[bot]
committed
Committing clang-format changes
1 parent 79a45b9 commit a3ae926

File tree

5 files changed

+30
-33
lines changed

5 files changed

+30
-33
lines changed

‎src/server/pdc_client_server_common.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,14 +2024,14 @@ HG_TEST_RPC_CB(close_server, handle)
20242024
hg_return_t ret_value = HG_SUCCESS;
20252025
close_server_in_t in;
20262026

2027-
if((ret_value = HG_Get_input(handle, &in)) != HG_SUCCESS)
2027+
if ((ret_value = HG_Get_input(handle, &in)) != HG_SUCCESS)
20282028
PGOTO_ERROR(ret_value, "Failed to HG_Get_input");
2029-
if((ret_value = HG_Free_input(handle, &in)) != HG_SUCCESS)
2029+
if ((ret_value = HG_Free_input(handle, &in)) != HG_SUCCESS)
20302030
PGOTO_ERROR(ret_value, "Failed to HG_Get_input");
20312031

20322032
close_all_server_handle_g = handle;
20332033

2034-
if(PDC_Server_set_close() != SUCCEED)
2034+
if (PDC_Server_set_close() != SUCCEED)
20352035
PGOTO_ERROR(HG_OTHER_ERROR, "Failed to PDC_Server_set_close");
20362036

20372037
done:

‎src/server/pdc_server_region/pdc_server_data.c‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,8 +2839,8 @@ PDC_Server_update_local_region_storage_loc(region_list_t *region, uint64_t obj_i
28392839

28402840
perr_t ret_value = SUCCEED;
28412841
pdc_metadata_t *target_meta = NULL;
2842-
region_list_t *region_elt = NULL, *new_region = NULL;
2843-
int update_success = -1;
2842+
region_list_t * region_elt = NULL, *new_region = NULL;
2843+
int update_success = -1;
28442844

28452845
if (region == NULL)
28462846
PGOTO_ERROR(FAIL, "region was NULL");
@@ -4102,20 +4102,18 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
41024102
{
41034103
FUNC_ENTER(NULL);
41044104

4105-
perr_t ret_value = SUCCEED;
4106-
uint64_t * indices = NULL;
4107-
pdc_metadata_t *obj_meta = NULL;
4108-
data_server_region_t *region = NULL;
4105+
perr_t ret_value = SUCCEED;
4106+
uint64_t * indices = NULL;
4107+
pdc_metadata_t * obj_meta = NULL;
4108+
data_server_region_t *region = NULL;
41094109
uint64_t * global_size = NULL;
4110-
uint64_t * offset = NULL;
4111-
uint8_t *buf_io_ops = NULL;
4112-
void * target_buf = NULL;
4113-
uint64_t flat_offset, stride, num_elements,
4114-
region_index, region_num_elements, count,
4115-
new_region_index, old_region_size, flat_index,
4116-
temp_stride, offset_region;
4117-
off_t file_offset;
4118-
int ndim, i, d;
4110+
uint64_t * offset = NULL;
4111+
uint8_t * buf_io_ops = NULL;
4112+
void * target_buf = NULL;
4113+
uint64_t flat_offset, stride, num_elements, region_index, region_num_elements, count, new_region_index,
4114+
old_region_size, flat_index, temp_stride, offset_region;
4115+
off_t file_offset;
4116+
int ndim, i, d;
41194117

41204118
#ifdef NOAH_DEBUG
41214119
LOG_JUST_PRINT("===============================================\n");
@@ -4169,7 +4167,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
41694167
#endif
41704168

41714169
// Determine initial region index
4172-
region_index = 0;
4170+
region_index = 0;
41734171
region_num_elements = 0;
41744172
if (region == NULL) {
41754173
region_index = flat_offset / num_elements;
@@ -4185,7 +4183,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
41854183
LOG_JUST_PRINT("\tregion_index: %d\n", region_index);
41864184
#endif
41874185
// Register the initial region
4188-
if(PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index) != SUCCEED)
4186+
if (PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index) != SUCCEED)
41894187
PGOTO_ERROR(FAIL, "Failed to PDC_Server_register_obj_region_by_pointer");
41904188
if (region == NULL) {
41914189
PGOTO_ERROR(FAIL, "Failed to PDC_Server_register_obj_region_by_pointer");
@@ -4196,7 +4194,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
41964194

41974195
// Used to buffer I/O operations
41984196
buf_io_ops = (uint8_t *)PDC_malloc(region->region_size_elements * unit);
4199-
errno = 0;
4197+
errno = 0;
42004198
struct stat st;
42014199
if (fstat(region->fd, &st) == 0 && st.st_size < region->region_size_elements * unit) {
42024200
if (ftruncate(region->fd, region->region_size_elements * unit) != 0) {
@@ -4233,7 +4231,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
42334231
old_region_size = region->region_size_elements;
42344232
if (region) {
42354233
pwrite(region->fd, buf_io_ops, region->region_size_elements * unit, 0);
4236-
if(PDC_Server_unregister_obj_region_by_pointer(region, 0) != SUCCEED)
4234+
if (PDC_Server_unregister_obj_region_by_pointer(region, 0) != SUCCEED)
42374235
PGOTO_ERROR(FAIL, "Failed to PDC_Server_unregister_obj_region_by_pointer");
42384236
region->fd = -1;
42394237
}
@@ -4243,7 +4241,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
42434241
LOG_JUST_PRINT("\tflat index: %d\n", flat_index);
42444242
#endif
42454243
region_index = new_region_index;
4246-
if(PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index) != SUCCEED)
4244+
if (PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index) != SUCCEED)
42474245
PGOTO_ERROR(FAIL, "Failed to PDC_Server_register_obj_region_by_pointer");
42484246

42494247
errno = 0;
@@ -4294,12 +4292,11 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
42944292

42954293
done:
42964294
if (region) {
4297-
if(io_type == REGION_PER_FILE_IO_TYPE_WRITE)
4295+
if (io_type == REGION_PER_FILE_IO_TYPE_WRITE)
42984296
pwrite(region->fd, buf_io_ops, region->region_size_elements * unit, 0);
4299-
if(PDC_Server_unregister_obj_region_by_pointer(region, 0) != SUCCEED)
4297+
if (PDC_Server_unregister_obj_region_by_pointer(region, 0) != SUCCEED)
43004298
PGOTO_ERROR(FAIL, "Failed to PDC_Server_unregister_obj_region_by_pointer");
43014299
region->fd = -1;
4302-
43034300
}
43044301
if (indices)
43054302
indices = PDC_free(indices);
@@ -4674,7 +4671,7 @@ PDC_Server_data_write_out(uint64_t obj_id, struct pdc_region_info *region_info,
46744671

46754672
perr_t
46764673
PDC_Server_data_read_from(uint64_t obj_id, struct pdc_region_info *region_info, void *buf, size_t unit)
4677-
{
4674+
{
46784675
abort();
46794676

46804677
FUNC_ENTER(NULL);

‎src/server/pdc_server_region/pdc_server_region_cache.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,8 @@ PDC_region_cache_flush_by_pointer(uint64_t obj_id, pdc_obj_cache *obj_cache, int
814814
LOG_ERROR("region_cache_info was null\n");
815815
}
816816

817-
if(PDC_Server_transfer_request_io(obj_id, obj_cache->ndim, obj_cache->dims, region_cache_info,
818-
region_cache_info->buf, region_cache_info->unit, 1) != SUCCEED) {
817+
if (PDC_Server_transfer_request_io(obj_id, obj_cache->ndim, obj_cache->dims, region_cache_info,
818+
region_cache_info->buf, region_cache_info->unit, 1) != SUCCEED) {
819819
LOG_ERROR("Failed to PDC_Server_transfer_request_io");
820820
FUNC_LEAVE(nflush);
821821
}

‎src/server/pdc_server_region/pdc_server_region_transfer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
291291
#else
292292
if (is_write) {
293293
LOG_INFO("1\n");
294-
if(PDC_Server_data_write_out_region_per_file(obj_id, region_info, buf, unit) != SUCCEED)
294+
if (PDC_Server_data_write_out_region_per_file(obj_id, region_info, buf, unit) != SUCCEED)
295295
PGOTO_ERROR(FAIL, "Failed to PDC_Server_data_write_out_region_per_file");
296296
}
297297
else {
298-
if(PDC_Server_data_read_from_region_per_file(obj_id, region_info, buf, unit) != SUCCEED)
298+
if (PDC_Server_data_read_from_region_per_file(obj_id, region_info, buf, unit) != SUCCEED)
299299
PGOTO_ERROR(FAIL, "Failed to PDC_Server_data_write_out_region_per_file");
300300
}
301301
PGOTO_DONE(SUCCEED);

‎src/tests/sandbox.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ main(int argc, char **argv)
159159
err = PDCregion_transfer_start(transfer_request);
160160
CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_start",
161161
"Failed to call PDCregion_transfer_start");
162-
err = PDCregion_transfer_wait(transfer_request);
162+
err = PDCregion_transfer_wait(transfer_request);
163163
CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_wait",
164164
"Failed to call PDCregion_transfer_wait");
165-
err = PDCregion_transfer_close(transfer_request);
165+
err = PDCregion_transfer_close(transfer_request);
166166
CHECK_AND_PRINT_GTE(err, "Succesfully called PDCregion_transfer_close",
167167
"Failed to call PDCregion_transfer_close");
168168

0 commit comments

Comments
 (0)