1
1
This commit was SVN r16087.
Этот коммит содержится в:
Shiqing Fan 2007-09-11 11:28:43 +00:00
родитель dcee7e4229
Коммит c1065d8262
7 изменённых файлов: 13 добавлений и 13 удалений

Просмотреть файл

@ -66,7 +66,7 @@ get_print_name_buffer(void)
if (NULL == ptr) {
ptr = (orte_print_args_buffers_t*)malloc(sizeof(orte_print_args_buffers_t));
for (i=0; i < ORTE_PRINT_NAME_ARG_NUM_BUFS; i++) {
ptr->buffers[i] = (void*) malloc((ORTE_PRINT_NAME_ARGS_MAX_SIZE+1) * sizeof(char));
ptr->buffers[i] = (char *) malloc((ORTE_PRINT_NAME_ARGS_MAX_SIZE+1) * sizeof(char));
}
ptr->cntr = 0;
ret = opal_tsd_setspecific(print_args_tsd_key, (void*)ptr);

Просмотреть файл

@ -1046,7 +1046,7 @@ static int orte_odls_process_launch_local_procs(orte_gpr_notify_data_t *data)
* processor affinity be used - the paffinity subsystem will make that final determination. All
* we do here is indicate that we should do the definitions just in case paffinity is active
*/
if (OPAL_SUCCESS != opal_get_num_processors(&num_processors)) {
if (OPAL_SUCCESS != opal_get_num_processors( (int *) &num_processors)) {
/* if we cannot find the number of local processors, then default to conservative
* settings
*/

Просмотреть файл

@ -1233,7 +1233,7 @@ int mca_oob_tcp_process_name_compare(const orte_process_name_t* n1, const orte_p
char* mca_oob_tcp_get_addr(void)
{
char *contact_info = malloc(opal_list_get_size(&mca_oob_tcp_component.tcp_available_devices) * 128);
char *contact_info = (char *) malloc(opal_list_get_size(&mca_oob_tcp_component.tcp_available_devices) * 128);
char *ptr = contact_info;
opal_list_item_t *item;
*ptr = 0;

Просмотреть файл

@ -550,11 +550,11 @@ int mca_oob_tcp_msg_copy(mca_oob_tcp_msg_t* msg, struct iovec* iov, int count)
for (i = 0 ; i < count ; i++) {
if ((msg->msg_flags & ORTE_RML_ALLOC) && (i == count - 1)) {
if (i == 0) {
iov[i].iov_base = src_ptr;
iov[i].iov_base = (char *) src_ptr;
iov[i].iov_len = src_len;
msg->msg_rwbuf = NULL;
} else {
iov[i].iov_base = malloc(src_len);
iov[i].iov_base = (char *) malloc(src_len);
iov[i].iov_len = src_len;
memcpy(iov[i].iov_base, src_ptr, src_len);
}

Просмотреть файл

@ -279,7 +279,7 @@ mca_oob_tcp_peer_create_socket(mca_oob_tcp_peer_t* peer,
} else if (peer->peer_sd > 0) {
int state = peer->peer_state;
mca_oob_tcp_peer_shutdown(peer);
peer->peer_state = state;
peer->peer_state = (mca_oob_tcp_state_t) state;
}
peer->peer_sd = socket(af_family, SOCK_STREAM, 0);

Просмотреть файл

@ -74,7 +74,7 @@ orte_rml_oob_recv(orte_process_name_t* peer,
msg->msg_type = ORTE_RML_BLOCKING_RECV;
flags |= ORTE_RML_FLAG_RECURSIVE_CALLBACK;
msg->msg_data = malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data[0].iov_base = (ompi_iov_base_ptr_t)&msg->msg_header;
msg->msg_data[0].iov_len = sizeof(orte_rml_oob_msg_header_t);
for (i = 0 ; i < count ; ++i) {
@ -123,7 +123,7 @@ orte_rml_oob_recv_nb(orte_process_name_t* peer,
msg->msg_cbfunc.iov = cbfunc;
msg->msg_cbdata = cbdata;
msg->msg_data = malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data[0].iov_base = (ompi_iov_base_ptr_t)&msg->msg_header;
msg->msg_data[0].iov_len = sizeof(orte_rml_oob_msg_header_t);
for (i = 0 ; i < count ; ++i) {
@ -153,7 +153,7 @@ orte_rml_oob_recv_buffer(orte_process_name_t* peer,
msg->msg_type = ORTE_RML_BLOCKING_RECV;
flags |= (ORTE_RML_FLAG_RECURSIVE_CALLBACK | ORTE_RML_ALLOC);
msg->msg_data = malloc(sizeof(struct iovec) * 2);
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * 2);
msg->msg_data[0].iov_base = (ompi_iov_base_ptr_t)&msg->msg_header;
msg->msg_data[0].iov_len = sizeof(orte_rml_oob_msg_header_t);
@ -198,7 +198,7 @@ orte_rml_oob_recv_buffer_nb(orte_process_name_t* peer,
orte_rml_oob_msg_t *msg = OBJ_NEW(orte_rml_oob_msg_t);
int ret;
msg->msg_data = malloc(sizeof(struct iovec) * 2);
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * 2);
msg->msg_data[0].iov_base = (ompi_iov_base_ptr_t)&msg->msg_header;
msg->msg_data[0].iov_len = sizeof(orte_rml_oob_msg_header_t);

Просмотреть файл

@ -85,7 +85,7 @@ orte_rml_oob_send(orte_process_name_t* peer,
ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN);
return ORTE_ERR_ADDRESSEE_UNKNOWN;
}
msg->msg_data = malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data[0].iov_base = (ompi_iov_base_ptr_t)&msg->msg_header;
msg->msg_data[0].iov_len = sizeof(orte_rml_oob_msg_header_t);
bytes += msg->msg_data[0].iov_len;
@ -155,7 +155,7 @@ orte_rml_oob_send_nb(orte_process_name_t* peer,
return ORTE_ERR_ADDRESSEE_UNKNOWN;
}
msg->msg_data = malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1));
msg->msg_data[0].iov_base = (ompi_iov_base_ptr_t)&msg->msg_header;
msg->msg_data[0].iov_len = sizeof(orte_rml_oob_msg_header_t);
@ -242,7 +242,7 @@ orte_rml_oob_send_buffer_nb(orte_process_name_t* peer,
msg->msg_cbdata = cbdata;
msg->user_buffer = buffer;
msg->msg_data = malloc(sizeof(struct iovec) * 2);
msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * 2);
next = orte_routed.get_route(peer);
if (next.vpid == ORTE_VPID_INVALID) {