Skip to content

Commit d5e71a2

Browse files
github-actions[bot]github-actions[bot]
committed
Committing clang-format changes
1 parent 54ce12c commit d5e71a2

File tree

4 files changed

+45
-39
lines changed

4 files changed

+45
-39
lines changed

‎src/server/include/pdc_client_server_common.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ typedef struct data_server_region_t {
338338
// Used primarily as a local_temp
339339
void *obj_data_ptr;
340340
// FIXME: (Noah) we should dynamically allocate this number....
341-
char * storage_location[4096]; // save the file location to enable reopening
341+
char *storage_location[4096]; // save the file location to enable reopening
342342
// number of elements per region
343-
int region_size_elements;
343+
int region_size_elements;
344344
struct data_server_region_t *prev;
345345
struct data_server_region_t *next;
346346
} data_server_region_t;

‎src/server/pdc_server_region/pdc_server_data.c‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ server_open_storage(char *storage_location, pdcid_t obj_id, uint64_t region_inde
128128
{
129129
fill_storage_path(storage_location, obj_id, region_index);
130130

131-
errno = 0;
131+
errno = 0;
132132
int fd = open(storage_location, O_RDWR | O_CREAT, 0666);
133133

134-
if(fd <= 0) {
134+
if (fd <= 0) {
135135
LOG_ERROR("Failed to open file: %s\n", storage_location);
136136
perror("open");
137-
}
137+
}
138138

139139
return fd;
140140
}
@@ -4518,7 +4518,8 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
45184518
FUNC_ENTER(NULL);
45194519

45204520
LOG_JUST_PRINT("===============================================\n");
4521-
LOG_JUST_PRINT("IO (%s) called with parameters:\n", io_type == REGION_PER_FILE_IO_TYPE_READ ? "READ" : "WRITE");
4521+
LOG_JUST_PRINT("IO (%s) called with parameters:\n",
4522+
io_type == REGION_PER_FILE_IO_TYPE_READ ? "READ" : "WRITE");
45224523
LOG_JUST_PRINT("\tobj_id: %" PRIu64 "\n", obj_id);
45234524
LOG_JUST_PRINT("\tregion_info: %p\n", (void *)region_info);
45244525
LOG_JUST_PRINT("\tbuf: %p\n", buf);
@@ -4544,10 +4545,10 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
45444545
PGOTO_ERROR(FAIL, "Object metadata not found");
45454546
}
45464547

4547-
data_server_region_t *region = PDC_Server_get_obj_region(obj_id);
4548-
uint64_t *global_size = obj_meta->dims;
4549-
uint64_t *offset = region_info->offset;
4550-
int ndim = region_info->ndim;
4548+
data_server_region_t *region = PDC_Server_get_obj_region(obj_id);
4549+
uint64_t * global_size = obj_meta->dims;
4550+
uint64_t * offset = region_info->offset;
4551+
int ndim = region_info->ndim;
45514552

45524553
LOG_JUST_PRINT("\tobj meta ndim: %d\n", ndim);
45534554
for (int i = 0; i < ndim; i++) {
@@ -4560,16 +4561,17 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
45604561
flat_offset += offset[i] * stride;
45614562
stride *= global_size[i];
45624563
}
4563-
4564+
45644565
LOG_JUST_PRINT("\tnum_elements: %d\n", num_elements);
45654566
LOG_JUST_PRINT("\tflat_offset: %d\n", flat_offset);
45664567

45674568
// Determine initial region index
45684569
uint64_t region_index = 0;
45694570
if (region == NULL) {
45704571
region_index = flat_offset / num_elements;
4571-
} else {
4572-
if(region->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
4572+
}
4573+
else {
4574+
if (region->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
45734575
region->region_size_elements = num_elements;
45744576
}
45754577
region_index = flat_offset / region->region_size_elements;
@@ -4580,7 +4582,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
45804582
// Register the initial region
45814583
PDC_Server_register_obj_region_by_pointer(&region, obj_id, 0, region_index);
45824584

4583-
if(region->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
4585+
if (region->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
45844586
region->region_size_elements = num_elements;
45854587
}
45864588

@@ -4593,7 +4595,7 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
45934595
for (uint64_t count = 0; count < num_elements; count++) {
45944596
printf("cur count: %d\n", count);
45954597
// Compute flat index
4596-
uint64_t flat_index = 0;
4598+
uint64_t flat_index = 0;
45974599
uint64_t temp_stride = 1;
45984600
for (int i = ndim - 1; i >= 0; i--) {
45994601
flat_index += (offset[i] + indices[i]) * temp_stride;
@@ -4618,14 +4620,15 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46184620
}
46194621

46204622
uint64_t offset_region = flat_index % region->region_size_elements;
4621-
void *target_buf = (char *)buf + (count * unit);
4622-
off_t file_offset = offset_region * unit;
4623+
void * target_buf = (char *)buf + (count * unit);
4624+
off_t file_offset = offset_region * unit;
46234625

46244626
ssize_t res;
46254627
errno = 0;
46264628
if (io_type == REGION_PER_FILE_IO_TYPE_READ) {
46274629
res = pread(region->fd, target_buf, unit, file_offset);
4628-
} else {
4630+
}
4631+
else {
46294632
res = pwrite(region->fd, target_buf, unit, file_offset);
46304633
}
46314634

@@ -4635,7 +4638,8 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46354638
LOG_JUST_PRINT("io error storage location: %s\n", region->storage_location[region_index]);
46364639
perror(io_type == REGION_PER_FILE_IO_TYPE_READ ? "pread" : "pwrite");
46374640
PGOTO_ERROR(FAIL, "I/O operation failed\n");
4638-
} else {
4641+
}
4642+
else {
46394643
LOG_JUST_PRINT("io storage location: %s\n", region->storage_location[region_index]);
46404644
}
46414645

@@ -4644,7 +4648,8 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46444648
indices[d]++;
46454649
if (indices[d] < region_info->size[d]) {
46464650
break;
4647-
} else {
4651+
}
4652+
else {
46484653
indices[d] = 0;
46494654
}
46504655
}
@@ -4664,19 +4669,20 @@ PDC_Server_data_io_from_region_per_file(uint64_t obj_id, struct pdc_region_info
46644669
FUNC_LEAVE(ret_value);
46654670
}
46664671

4667-
46684672
perr_t
46694673
PDC_Server_data_write_out_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
46704674
size_t unit)
46714675
{
4672-
return PDC_Server_data_io_from_region_per_file(obj_id, region_info, buf, unit, REGION_PER_FILE_IO_TYPE_WRITE);
4676+
return PDC_Server_data_io_from_region_per_file(obj_id, region_info, buf, unit,
4677+
REGION_PER_FILE_IO_TYPE_WRITE);
46734678
}
46744679

46754680
perr_t
4676-
PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
4677-
size_t unit)
4681+
PDC_Server_data_read_from_region_per_file(uint64_t obj_id, struct pdc_region_info *region_info, void *buf,
4682+
size_t unit)
46784683
{
4679-
return PDC_Server_data_io_from_region_per_file(obj_id, region_info, buf, unit, REGION_PER_FILE_IO_TYPE_READ);
4684+
return PDC_Server_data_io_from_region_per_file(obj_id, region_info, buf, unit,
4685+
REGION_PER_FILE_IO_TYPE_READ);
46804686
}
46814687

46824688
perr_t

‎src/server/pdc_server_region/pdc_server_region_request_handler.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ transfer_request_all_bulk_transfer_read_cb(const struct hg_cb_info *info)
7979
for (i = 0; i < request_data.n_objs; ++i) {
8080
temp_ptrs[i] = PDC_Server_get_obj_region(request_data.obj_id[i]);
8181
// FIXME: Noah
82-
if(temp_ptrs[i]->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
82+
if (temp_ptrs[i]->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
8383
LOG_ERROR("GOING TO GENERATE INCORRECT REGION INDEXES\n");
8484
}
8585
PDC_Server_register_obj_region_by_pointer(&(temp_ptrs[i]), request_data.obj_id[i], 1, 0);
@@ -199,7 +199,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
199199
LOG_JUST_PRINT("\tobj ndim: %d\n", request_data.obj_ndim[i]);
200200
LOG_JUST_PRINT("\tobj unit: %d\n", request_data.unit[i]);
201201
LOG_JUST_PRINT("\tregion ndim[%d]=%d\n", i, request_data.remote_ndim[i]);
202-
for(int j = 0; j < request_data.remote_ndim[i]; j++) {
202+
for (int j = 0; j < request_data.remote_ndim[i]; j++) {
203203
LOG_JUST_PRINT("\tregion size[%d]=%d\n", j, request_data.remote_length[i][j]);
204204
LOG_JUST_PRINT("\tregion offset[%d]=%d\n", j, request_data.remote_offset[i][j]);
205205
}
@@ -214,7 +214,7 @@ transfer_request_all_bulk_transfer_write_cb(const struct hg_cb_info *info)
214214
num_elements *= request_data.remote_length[i][j];
215215
}
216216

217-
if(temp_ptrs[i]->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
217+
if (temp_ptrs[i]->region_size_elements == UNITIALIZED_DATA_SERVER_REGION_SIZE_ELEMENTS) {
218218
temp_ptrs[i]->region_size_elements = num_elements;
219219
}
220220

‎src/server/pdc_server_region/pdc_server_region_transfer.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -279,17 +279,17 @@ PDC_Server_transfer_request_io(uint64_t obj_id, int obj_ndim, const uint64_t *ob
279279

280280
FUNC_ENTER(NULL);
281281

282-
//if (io_by_region_g || obj_ndim == 0) {
283-
if (is_write) {
284-
// FIXME: (Noah) switching to region per file manually
285-
//PDC_Server_data_write_out(obj_id, region_info, buf, unit);
286-
PDC_Server_data_write_out_region_per_file(obj_id, region_info, buf, unit);
287-
}
288-
else {
289-
// PDC_Server_data_read_from(obj_id, region_info, buf, unit);
290-
PDC_Server_data_read_from_region_per_file(obj_id, region_info, buf, unit);
291-
}
292-
goto done;
282+
// if (io_by_region_g || obj_ndim == 0) {
283+
if (is_write) {
284+
// FIXME: (Noah) switching to region per file manually
285+
// PDC_Server_data_write_out(obj_id, region_info, buf, unit);
286+
PDC_Server_data_write_out_region_per_file(obj_id, region_info, buf, unit);
287+
}
288+
else {
289+
// PDC_Server_data_read_from(obj_id, region_info, buf, unit);
290+
PDC_Server_data_read_from_region_per_file(obj_id, region_info, buf, unit);
291+
}
292+
goto done;
293293
//}
294294

295295
if (obj_ndim != (int)region_info->ndim) {

0 commit comments

Comments
 (0)