ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

osc/pt2pt: Insert breaks in long lines

Просмотр исходного кода
Этот коммит содержится в:
KAWASHIMA Takahiro 2016-04-11 19:06:01 +09:00
родитель 5ac95df9dc
Коммит 28a0577364
2 изменённых файлов: 49 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
ompi/mca/osc/pt2pt/osc_pt2pt_comm.c
Просмотреть файл

@ -363,9 +363,9 @@ static inline int ompi_osc_pt2pt_put_w_req (const void *origin_addr, int origin_
OBJ_RETAIN(target_dt);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE, target,
tag_to_target(tag), module->comm, ompi_osc_pt2pt_dt_send_complete,
target_dt);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE,
target, tag_to_target(tag), module->comm,
ompi_osc_pt2pt_dt_send_complete, target_dt);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
break;
}
@ -394,8 +394,8 @@ static inline int ompi_osc_pt2pt_put_w_req (const void *origin_addr, int origin_
header->tag = tag;
osc_pt2pt_hton(header, proc);
ret = ompi_osc_pt2pt_data_isend (module,origin_addr, origin_count, origin_dt, target, tag_to_target(tag),
request);
ret = ompi_osc_pt2pt_data_isend (module,origin_addr, origin_count, origin_dt,
target, tag_to_target(tag), request);
}
} while (0);
@ -519,9 +519,9 @@ ompi_osc_pt2pt_accumulate_w_req (const void *origin_addr, int origin_count,
OBJ_RETAIN(target_dt);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE, target,
tag_to_target(tag), module->comm, ompi_osc_pt2pt_dt_send_complete,
target_dt);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE,
target, tag_to_target(tag), module->comm,
ompi_osc_pt2pt_dt_send_complete, target_dt);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
break;
}
@ -553,8 +553,8 @@ ompi_osc_pt2pt_accumulate_w_req (const void *origin_addr, int origin_count,
OPAL_OUTPUT_VERBOSE((25, ompi_osc_base_framework.framework_output,
"acc: starting long accumulate with tag %d", tag));
ret = ompi_osc_pt2pt_data_isend (module, origin_addr, origin_count, origin_dt, target, tag_to_target(tag),
request);
ret = ompi_osc_pt2pt_data_isend (module, origin_addr, origin_count, origin_dt,
target, tag_to_target(tag), request);
}
} while (0);
@ -663,7 +663,8 @@ int ompi_osc_pt2pt_compare_and_swap (const void *origin_addr, const void *compar
osc_pt2pt_copy_for_send (ptr, dt->super.size, compare_addr, proc, 1, dt);
request->outstanding_requests = 1;
ret = ompi_osc_pt2pt_irecv_w_cb (result_addr, 1, dt, target, tag_to_origin(tag), module->comm,
ret = ompi_osc_pt2pt_irecv_w_cb (result_addr, 1, dt,
target, tag_to_origin(tag), module->comm,
NULL, ompi_osc_pt2pt_req_comm_complete, request);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
return ret;
@ -827,9 +828,9 @@ static inline int ompi_osc_pt2pt_rget_internal (void *origin_addr, int origin_co
OBJ_RETAIN(target_dt);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE, target,
tag_to_target(tag), module->comm, ompi_osc_pt2pt_dt_send_complete,
target_dt);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE,
target, tag_to_target(tag), module->comm,
ompi_osc_pt2pt_dt_send_complete, target_dt);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
break;
}
@ -843,8 +844,9 @@ static inline int ompi_osc_pt2pt_rget_internal (void *origin_addr, int origin_co
/* TODO -- store the request somewhere so we can cancel it on error */
pt2pt_request->outstanding_requests = 1;
ret = ompi_osc_pt2pt_irecv_w_cb (origin_addr, origin_count, origin_dt, target, tag_to_origin(tag),
module->comm, NULL, ompi_osc_pt2pt_req_comm_complete, pt2pt_request);
ret = ompi_osc_pt2pt_irecv_w_cb (origin_addr, origin_count, origin_dt,
target, tag_to_origin(tag), module->comm,
NULL, ompi_osc_pt2pt_req_comm_complete, pt2pt_request);
} while (0);
if (OMPI_SUCCESS == ret) {
@ -1045,9 +1047,9 @@ int ompi_osc_pt2pt_rget_accumulate_internal (const void *origin_addr, int origin
OBJ_RETAIN(target_datatype);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE, target_rank,
tag_to_target(tag), module->comm, ompi_osc_pt2pt_dt_send_complete,
target_datatype);
ret = ompi_osc_pt2pt_isend_w_cb ((void *) packed_ddt, ddt_len, MPI_BYTE,
target_rank, tag_to_target(tag), module->comm,
ompi_osc_pt2pt_dt_send_complete, target_datatype);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
break;
}
@ -1059,8 +1061,9 @@ int ompi_osc_pt2pt_rget_accumulate_internal (const void *origin_addr, int origin
ptr += ddt_len;
}
ret = ompi_osc_pt2pt_irecv_w_cb (result_addr, result_count, result_datatype, target_rank, tag_to_origin(tag),
module->comm, NULL, ompi_osc_pt2pt_req_comm_complete, pt2pt_request);
ret = ompi_osc_pt2pt_irecv_w_cb (result_addr, result_count, result_datatype,
target_rank, tag_to_origin(tag), module->comm,
NULL, ompi_osc_pt2pt_req_comm_complete, pt2pt_request);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
break;
}
@ -1077,8 +1080,9 @@ int ompi_osc_pt2pt_rget_accumulate_internal (const void *origin_addr, int origin
header->base.type = OMPI_OSC_PT2PT_HDR_TYPE_GET_ACC_LONG;
osc_pt2pt_hton(header, proc);
ret = ompi_osc_pt2pt_isend_w_cb (origin_addr, origin_count, origin_datatype, target_rank,
tag_to_target(tag), module->comm, ompi_osc_pt2pt_req_comm_complete, pt2pt_request);
ret = ompi_osc_pt2pt_isend_w_cb (origin_addr, origin_count, origin_datatype,
target_rank, tag_to_target(tag), module->comm,
ompi_osc_pt2pt_req_comm_complete, pt2pt_request);
}
} while (0);

38
ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c
Просмотреть файл

@ -534,7 +534,8 @@ static inline int process_get (ompi_osc_pt2pt_module_t* module, int target,
}
/* send get data */
ret = osc_pt2pt_get_post_send (module, source, get_header->count, datatype, target, tag_to_origin(get_header->tag));
ret = osc_pt2pt_get_post_send (module, source, get_header->count, datatype,
target, tag_to_origin(get_header->tag));
OBJ_RELEASE(datatype);
@ -847,9 +848,9 @@ static int ompi_osc_pt2pt_acc_long_start (ompi_osc_pt2pt_module_t *module, int s
do {
if (op == &ompi_mpi_op_replace.op) {
ret = ompi_osc_pt2pt_irecv_w_cb (target, acc_header->count, datatype, source,
tag_to_target(acc_header->tag), module->comm, NULL,
replace_cb, module);
ret = ompi_osc_pt2pt_irecv_w_cb (target, acc_header->count, datatype,
source, tag_to_target(acc_header->tag), module->comm,
NULL, replace_cb, module);
break;
}
@ -876,8 +877,9 @@ static int ompi_osc_pt2pt_acc_long_start (ompi_osc_pt2pt_module_t *module, int s
break;
}
ret = ompi_osc_pt2pt_irecv_w_cb (buffer, primitive_count, primitive_datatype, source,
tag_to_target(acc_header->tag), module->comm, NULL, accumulate_cb, acc_data);
ret = ompi_osc_pt2pt_irecv_w_cb (buffer, primitive_count, primitive_datatype,
source, tag_to_target(acc_header->tag), module->comm,
NULL, accumulate_cb, acc_data);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
OBJ_RELEASE(acc_data);
}
@ -925,8 +927,9 @@ static int ompi_osc_pt2pt_gacc_start (ompi_osc_pt2pt_module_t *module, int sourc
break;
}
ret = ompi_osc_pt2pt_isend_w_cb (target, acc_header->count, datatype, source, tag_to_origin(acc_header->tag),
module->comm, accumulate_cb, acc_data);
ret = ompi_osc_pt2pt_isend_w_cb (target, acc_header->count, datatype,
source, tag_to_origin(acc_header->tag), module->comm,
accumulate_cb, acc_data);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
OBJ_RELEASE(acc_data);
}
@ -994,15 +997,17 @@ static int ompi_osc_gacc_long_start (ompi_osc_pt2pt_module_t *module, int source
break;
}
ret = ompi_osc_pt2pt_irecv_w_cb (buffer, acc_header->count, datatype, source, tag_to_target(acc_header->tag),
module->comm, &recv_request, accumulate_cb, acc_data);
ret = ompi_osc_pt2pt_irecv_w_cb (buffer, acc_header->count, datatype,
source, tag_to_target(acc_header->tag), module->comm,
&recv_request, accumulate_cb, acc_data);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
OBJ_RELEASE(acc_data);
break;
}
ret = ompi_osc_pt2pt_isend_w_cb (target, primitive_count, primitive_datatype, source, tag_to_origin(acc_header->tag),
module->comm, accumulate_cb, acc_data);
ret = ompi_osc_pt2pt_isend_w_cb (target, primitive_count, primitive_datatype,
source, tag_to_origin(acc_header->tag), module->comm,
accumulate_cb, acc_data);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
/* cancel the receive and free the accumulate data */
ompi_request_cancel (recv_request);
@ -1054,8 +1059,8 @@ static int ompi_osc_pt2pt_cswap_start (ompi_osc_pt2pt_module_t *module, int sour
do {
/* no reason to do a non-blocking send here */
ret = MCA_PML_CALL(send(target, 1, datatype, source, tag_to_origin(cswap_header->tag), MCA_PML_BASE_SEND_STANDARD,
module->comm));
ret = MCA_PML_CALL(send(target, 1, datatype, source, tag_to_origin(cswap_header->tag),
MCA_PML_BASE_SEND_STANDARD, module->comm));
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
break;
}
@ -1503,8 +1508,9 @@ static int process_large_datatype_request (ompi_osc_pt2pt_module_t *module, int
memcpy (ddt_buffer->header, header, header_len);
ret = ompi_osc_pt2pt_irecv_w_cb ((void *)((uintptr_t) ddt_buffer->header + header_len),
ddt_len, MPI_BYTE, source, tag_to_target(tag), module->comm, NULL,
process_large_datatype_request_cb, ddt_buffer);
ddt_len, MPI_BYTE,
source, tag_to_target(tag), module->comm,
NULL, process_large_datatype_request_cb, ddt_buffer);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
OBJ_RELEASE(ddt_buffer);
return ret;