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

io/ompio: plug memory leaks

Просмотр исходного кода 
as reported by Coverity with CIDs 1369022 and 1369023
Этот коммит содержится в:
Gilles Gouaillardet 2016-09-05 13:11:03 +09:00
родитель c09899f6af
Коммит 213a981041
1 изменённых файлов: 67 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

121
ompi/mca/io/ompio/io_ompio_aggregators.c
Просмотреть файл

@ -13,7 +13,7 @@
* Copyright (c) 2008-2016 University of Houston. All rights reserved. * Copyright (c) 2008-2016 University of Houston. All rights reserved.
* Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012-2013 Inria. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -122,13 +122,14 @@ int mca_io_ompio_fview_based_grouping(mca_io_ompio_file_t *fh,
start_offsets_lens = (OMPI_MPI_OFFSET_TYPE* )malloc (3 * fh->f_size * sizeof(OMPI_MPI_OFFSET_TYPE)); start_offsets_lens = (OMPI_MPI_OFFSET_TYPE* )malloc (3 * fh->f_size * sizeof(OMPI_MPI_OFFSET_TYPE));
if (NULL == start_offsets_lens) { if (NULL == start_offsets_lens) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
return OMPI_ERR_OUT_OF_RESOURCE; ret = OMPI_ERR_OUT_OF_RESOURCE;
goto exit;
} }
end_offsets = (OMPI_MPI_OFFSET_TYPE* )malloc (fh->f_size * sizeof(OMPI_MPI_OFFSET_TYPE)); end_offsets = (OMPI_MPI_OFFSET_TYPE* )malloc (fh->f_size * sizeof(OMPI_MPI_OFFSET_TYPE));
if (NULL == end_offsets) { if (NULL == end_offsets) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
free(start_offsets_lens); ret = OMPI_ERR_OUT_OF_RESOURCE;
return OMPI_ERR_OUT_OF_RESOURCE; goto exit;
} }
//Allgather start offsets across processes in a group on aggregator //Allgather start offsets across processes in a group on aggregator
@ -141,9 +142,7 @@ int mca_io_ompio_fview_based_grouping(mca_io_ompio_file_t *fh,
fh->f_comm, fh->f_comm,
fh->f_comm->c_coll.coll_allgather_module); fh->f_comm->c_coll.coll_allgather_module);
if ( OMPI_SUCCESS != ret ) { if ( OMPI_SUCCESS != ret ) {
free (start_offsets_lens); goto exit;
free (end_offsets);
return ret;
} }
@ -180,10 +179,17 @@ int mca_io_ompio_fview_based_grouping(mca_io_ompio_file_t *fh,
} }
*num_groups = p+1; *num_groups = p+1;
free (start_offsets_lens); ret = OMPI_SUCCESS;
free (end_offsets);
return OMPI_SUCCESS; exit:
if (NULL != start_offsets_lens) {
free (start_offsets_lens);
}
if (NULL != end_offsets) {
free(end_offsets);
}
return ret;
} }
int mca_io_ompio_cart_based_grouping(mca_io_ompio_file_t *ompio_fh) int mca_io_ompio_cart_based_grouping(mca_io_ompio_file_t *ompio_fh)
@ -499,19 +505,15 @@ exit:
if (NULL != start_offsets_lens) { if (NULL != start_offsets_lens) {
free (start_offsets_lens); free (start_offsets_lens);
start_offsets_lens = NULL;
} }
if (NULL != end_offsets) { if (NULL != end_offsets) {
free (end_offsets); free (end_offsets);
end_offsets = NULL;
} }
if(NULL != aggr_bytes_per_group){ if(NULL != aggr_bytes_per_group){
free(aggr_bytes_per_group); free(aggr_bytes_per_group);
aggr_bytes_per_group = NULL;
} }
if( NULL != decision_list){ if( NULL != decision_list){
free(decision_list); free(decision_list);
decision_list = NULL;
} }
@ -524,7 +526,7 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
int is_aggregator){ int is_aggregator){
OMPI_MPI_OFFSET_TYPE sum_bytes = 0; OMPI_MPI_OFFSET_TYPE sum_bytes = 0;
MPI_Request *sendreq = NULL; MPI_Request *sendreqs = NULL;
int start = 0; int start = 0;
int end = 0; int end = 0;
@ -633,8 +635,8 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
//New aggregators communicate new grouping info to the groups //New aggregators communicate new grouping info to the groups
if(is_new_aggregator){ if(is_new_aggregator){
sendreq = (MPI_Request *)malloc ( 2 *fh->f_procs_per_group * sizeof(MPI_Request)); sendreqs = (MPI_Request *)malloc ( 2 *fh->f_procs_per_group * sizeof(MPI_Request));
if (NULL == sendreq) { if (NULL == sendreqs) {
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
//Communicate grouping info //Communicate grouping info
@ -650,11 +652,10 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
OMPIO_PROCS_PER_GROUP_TAG, OMPIO_PROCS_PER_GROUP_TAG,
MCA_PML_BASE_SEND_STANDARD, MCA_PML_BASE_SEND_STANDARD,
fh->f_comm, fh->f_comm,
&sendreq[r++])); sendreqs + r++));
if ( OMPI_SUCCESS != ret ) { if ( OMPI_SUCCESS != ret ) {
opal_output (1, "mca_io_ompio_merge_initial_groups: error in Isend\n"); opal_output (1, "mca_io_ompio_merge_initial_groups: error in Isend\n");
free ( sendreq ); goto exit;
return ret;
} }
//new aggregator sends distribution of process to all its new members //new aggregator sends distribution of process to all its new members
ret = MCA_PML_CALL(isend(fh->f_procs_in_group, ret = MCA_PML_CALL(isend(fh->f_procs_in_group,
@ -664,11 +665,10 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
OMPIO_PROCS_IN_GROUP_TAG, OMPIO_PROCS_IN_GROUP_TAG,
MCA_PML_BASE_SEND_STANDARD, MCA_PML_BASE_SEND_STANDARD,
fh->f_comm, fh->f_comm,
&sendreq[r++])); sendreqs + r++));
if ( OMPI_SUCCESS != ret ) { if ( OMPI_SUCCESS != ret ) {
opal_output (1, "mca_io_ompio_merge_initial_groups: error in Isend 2\n"); opal_output (1, "mca_io_ompio_merge_initial_groups: error in Isend 2\n");
free ( sendreq ); goto exit;
return ret;
} }
} }
@ -709,8 +709,12 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
} }
if(is_new_aggregator) { if(is_new_aggregator) {
ret = ompi_request_wait_all (r, sendreq, MPI_STATUSES_IGNORE); ret = ompi_request_wait_all (r, sendreqs, MPI_STATUSES_IGNORE);
free (sendreq); }
exit:
if (NULL != sendreqs) {
free(sendreqs);
} }
return ret; return ret;
@ -883,15 +887,15 @@ int mca_io_ompio_merge_groups(mca_io_ompio_file_t *fh,
sizes_old_group = (int*)malloc(num_merge_aggrs * sizeof(int)); sizes_old_group = (int*)malloc(num_merge_aggrs * sizeof(int));
if (NULL == sizes_old_group) { if (NULL == sizes_old_group) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
return OMPI_ERR_OUT_OF_RESOURCE; goto exit;
} }
displs = (int*)malloc(num_merge_aggrs * sizeof(int)); displs = (int*)malloc(num_merge_aggrs * sizeof(int));
if (NULL == displs) { if (NULL == displs) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
free(sizes_old_group); ret = OMPI_ERR_OUT_OF_RESOURCE;
return OMPI_ERR_OUT_OF_RESOURCE; goto exit;
} }
@ -909,9 +913,7 @@ int mca_io_ompio_merge_groups(mca_io_ompio_file_t *fh,
fh->f_comm); fh->f_comm);
if ( OMPI_SUCCESS != ret ) { if ( OMPI_SUCCESS != ret ) {
free (displs); goto exit;
free (sizes_old_group);
return ret;
} }
fh->f_procs_per_group = 0; fh->f_procs_per_group = 0;
@ -928,9 +930,8 @@ int mca_io_ompio_merge_groups(mca_io_ompio_file_t *fh,
fh->f_procs_in_group = (int*)malloc (fh->f_procs_per_group * sizeof(int)); fh->f_procs_in_group = (int*)malloc (fh->f_procs_per_group * sizeof(int));
if (NULL == fh->f_procs_in_group) { if (NULL == fh->f_procs_in_group) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
free(sizes_old_group); ret = OMPI_ERR_OUT_OF_RESOURCE;
free(displs); goto exit;
return OMPI_ERR_OUT_OF_RESOURCE;
} }
//New aggregator also collects the grouping distribution //New aggregator also collects the grouping distribution
@ -948,8 +949,13 @@ int mca_io_ompio_merge_groups(mca_io_ompio_file_t *fh,
num_merge_aggrs, num_merge_aggrs,
fh->f_comm); fh->f_comm);
free (displs); exit:
free (sizes_old_group); if (NULL != displs) {
free (displs);
}
if (NULL != sizes_old_group) {
free (sizes_old_group);
}
return ret; return ret;
@ -1013,11 +1019,8 @@ int mca_io_ompio_split_a_group(mca_io_ompio_file_t *fh,
*min_cci = cci[i]; *min_cci = cci[i];
} }
} }
//if cci is not needed anymore
if (NULL != cci) { free (cci);
free (cci);
cci = NULL;
}
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -1115,12 +1118,6 @@ int mca_io_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
end_offsets_tmp = (OMPI_MPI_OFFSET_TYPE* )malloc (fh->f_init_procs_per_group * sizeof(OMPI_MPI_OFFSET_TYPE));
if (NULL == end_offsets_tmp) {
opal_output (1, "OUT OF MEMORY\n");
free(start_offsets_lens_tmp);
return OMPI_ERR_OUT_OF_RESOURCE;
}
//Gather start offsets across processes in a group on aggregator //Gather start offsets across processes in a group on aggregator
ret = fcoll_base_coll_allgather_array (start_offset_len, ret = fcoll_base_coll_allgather_array (start_offset_len,
@ -1135,7 +1132,12 @@ int mca_io_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
fh->f_comm); fh->f_comm);
if ( OMPI_SUCCESS != ret ) { if ( OMPI_SUCCESS != ret ) {
opal_output (1, "mca_io_ompio_prepare_to_grou[: error in fcoll_base_coll_allgather_array\n"); opal_output (1, "mca_io_ompio_prepare_to_grou[: error in fcoll_base_coll_allgather_array\n");
return ret; goto exit;
}
end_offsets_tmp = (OMPI_MPI_OFFSET_TYPE* )malloc (fh->f_init_procs_per_group * sizeof(OMPI_MPI_OFFSET_TYPE));
if (NULL == end_offsets_tmp) {
opal_output (1, "OUT OF MEMORY\n");
goto exit;
} }
for( k = 0 ; k < fh->f_init_procs_per_group; k++){ for( k = 0 ; k < fh->f_init_procs_per_group; k++){
end_offsets_tmp[k] = start_offsets_lens_tmp[3*k] + start_offsets_lens_tmp[3*k+1]; end_offsets_tmp[k] = start_offsets_lens_tmp[3*k] + start_offsets_lens_tmp[3*k+1];
@ -1159,15 +1161,14 @@ int mca_io_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
aggr_bytes_per_group_tmp = (OMPI_MPI_OFFSET_TYPE*)malloc (fh->f_init_num_aggrs * sizeof(OMPI_MPI_OFFSET_TYPE)); aggr_bytes_per_group_tmp = (OMPI_MPI_OFFSET_TYPE*)malloc (fh->f_init_num_aggrs * sizeof(OMPI_MPI_OFFSET_TYPE));
if (NULL == aggr_bytes_per_group_tmp) { if (NULL == aggr_bytes_per_group_tmp) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
return OMPI_ERR_OUT_OF_RESOURCE; ret = OMPI_ERR_OUT_OF_RESOURCE;
goto exit;
} }
decision_list_tmp = (int* )malloc (fh->f_init_num_aggrs * sizeof(int)); decision_list_tmp = (int* )malloc (fh->f_init_num_aggrs * sizeof(int));
if (NULL == decision_list_tmp) { if (NULL == decision_list_tmp) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
free(aggr_bytes_per_group_tmp); ret = OMPI_ERR_OUT_OF_RESOURCE;
free(start_offsets_lens_tmp); goto exit;
free(end_offsets_tmp);
return OMPI_ERR_OUT_OF_RESOURCE;
} }
//Communicate bytes per group between all aggregators //Communicate bytes per group between all aggregators
ret = fcoll_base_coll_allgather_array (bytes_per_group, ret = fcoll_base_coll_allgather_array (bytes_per_group,
@ -1182,7 +1183,8 @@ int mca_io_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
fh->f_comm); fh->f_comm);
if ( OMPI_SUCCESS != ret ) { if ( OMPI_SUCCESS != ret ) {
opal_output (1, "mca_io_ompio_prepare_to_grou[: error in fcoll_base_coll_allgather_array 2\n"); opal_output (1, "mca_io_ompio_prepare_to_grou[: error in fcoll_base_coll_allgather_array 2\n");
return ret; free(decision_list_tmp);
goto exit;
} }
for( i = 0; i < fh->f_init_num_aggrs; i++){ for( i = 0; i < fh->f_init_num_aggrs; i++){
@ -1262,6 +1264,17 @@ int mca_io_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
fh->f_init_procs_per_group, fh->f_init_procs_per_group,
fh->f_comm); fh->f_comm);
exit:
if (NULL != aggr_bytes_per_group_tmp) {
free(aggr_bytes_per_group_tmp);
}
if (NULL != start_offsets_lens_tmp) {
free(start_offsets_lens_tmp);
}
if (NULL != end_offsets_tmp) {
free(end_offsets_tmp);
}
return ret; return ret;
} }