Skip to content

Commit 91914b4

Browse files
TheAssembler1github-actions[bot]jeanbez
authored
Fix multithreading compilation (#259)
* fix multhreading compilation * Committing clang-format changes --------- Co-authored-by: github-actions <github-actions[bot]@users.noreply.github.com> Co-authored-by: Jean Luca Bez <[email protected]>
1 parent c42b749 commit 91914b4

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

src/server/pdc_client_server_common.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,16 +2013,16 @@ pdc_region_write_out_progress(void *arg)
20132013
remote_reg_info->offset = (uint64_t *)malloc(remote_reg_info->ndim * sizeof(uint64_t));
20142014
remote_reg_info->size = (uint64_t *)malloc(remote_reg_info->ndim * sizeof(uint64_t));
20152015
if (remote_reg_info->ndim >= 1) {
2016-
(remote_reg_info->offset)[0] = (bulk_args->remote_region_nounit).start_0;
2017-
(remote_reg_info->size)[0] = (bulk_args->remote_region_nounit).count_0;
2016+
(remote_reg_info->offset)[0] = (bulk_args->remote_region_nounit).start[0];
2017+
(remote_reg_info->size)[0] = (bulk_args->remote_region_nounit).count[0];
20182018
}
20192019
if (remote_reg_info->ndim >= 2) {
2020-
(remote_reg_info->offset)[1] = (bulk_args->remote_region_nounit).start_1;
2021-
(remote_reg_info->size)[1] = (bulk_args->remote_region_nounit).count_1;
2020+
(remote_reg_info->offset)[1] = (bulk_args->remote_region_nounit).start[1];
2021+
(remote_reg_info->size)[1] = (bulk_args->remote_region_nounit).count[1];
20222022
}
20232023
if (remote_reg_info->ndim >= 3) {
2024-
(remote_reg_info->offset)[2] = (bulk_args->remote_region_nounit).start_2;
2025-
(remote_reg_info->size)[2] = (bulk_args->remote_region_nounit).count_2;
2024+
(remote_reg_info->offset)[2] = (bulk_args->remote_region_nounit).start[2];
2025+
(remote_reg_info->size)[2] = (bulk_args->remote_region_nounit).count[2];
20262026
}
20272027

20282028
PDC_Server_data_write_out(bulk_args->remote_obj_id, remote_reg_info, bulk_args->data_buf,
@@ -2281,12 +2281,12 @@ transform_and_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_inf
22812281
target_reg = PDC_Server_get_obj_region(bulk_args->remote_obj_id);
22822282
DL_FOREACH(target_reg->region_buf_map_head, elt)
22832283
{
2284-
if ((bulk_args->remote_region).start_0 == elt->remote_region_unit.start_0 &&
2285-
(bulk_args->remote_region).count_0 == elt->remote_region_unit.count_0) {
2284+
if ((bulk_args->remote_region).start[0] == elt->remote_region_unit.start[0] &&
2285+
(bulk_args->remote_region).count[0] == elt->remote_region_unit.count[0]) {
22862286
// replace the count_0 value with the transform_size
22872287
if (use_transform_size) {
2288-
(bulk_args->remote_region).count_0 = transform_size;
2289-
(bulk_args->remote_region).ndim = 1;
2288+
(bulk_args->remote_region).count[0] = transform_size;
2289+
(bulk_args->remote_region).ndim = 1;
22902290
}
22912291
elt->bulk_args = (struct buf_map_release_bulk_args *)bulk_args;
22922292
}
@@ -2531,7 +2531,8 @@ buf_map_region_release_bulk_transfer_cb(const struct hg_cb_info *hg_cb_info)
25312531
target_reg = PDC_Server_get_obj_region(bulk_args->remote_obj_id);
25322532
DL_FOREACH(target_reg->region_buf_map_head, elt)
25332533
{
2534-
if (PDC_region_info_transfer_t_is_equal(bulk_args->remote_region_unit, elt->remote_region_unit)) {
2534+
if (PDC_region_info_transfer_t_is_equal(&(bulk_args->remote_region_unit),
2535+
&(elt->remote_region_unit))) {
25352536
elt->bulk_args = bulk_args;
25362537
}
25372538
}

src/server/pdc_server_region/pdc_server_data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ PDC_Data_Server_check_unmap()
873873
DL_FOREACH_SAFE(target_obj->region_buf_map_head, elt, tmp)
874874
{
875875
if (remote_obj_id == elt->remote_obj_id &&
876-
PDC_region_is_identical(elt1->unmap_region, elt->remote_region_unit)) {
876+
PDC_region_info_transfer_t_is_equal(&(elt1->unmap_region), &(elt->remote_region_unit))) {
877877
hg_thread_mutex_lock(&(elt->bulk_args->work_mutex));
878878
if (!elt->bulk_args->work_completed)
879879
// wait for 100ms for work completed

0 commit comments

Comments
 (0)