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

io/ompio: fix misc memory leaks

Просмотр исходного кода 
as reported by Coverity with CIDs 72147-72149,72187,72188,731274,731275,741356,
1269889,1269893,1271535 and 1269872
Этот коммит содержится в:
Gilles Gouaillardet 2015-05-20 17:19:39 +09:00
родитель dd28b1f680
Коммит b6c67e051d
2 изменённых файлов: 64 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -279,6 +279,7 @@ int ompi_io_ompio_generate_current_file_view (struct mca_io_ompio_file_t *fh,
} }
displs = (int *) malloc (fh->f_size * sizeof(int)); displs = (int *) malloc (fh->f_size * sizeof(int));
if (NULL == displs){ if (NULL == displs){
free(recvcounts);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
@ -296,6 +297,8 @@ int ompi_io_ompio_generate_current_file_view (struct mca_io_ompio_file_t *fh,
malloc (k * sizeof(mca_io_ompio_offlen_array_t)); malloc (k * sizeof(mca_io_ompio_offlen_array_t));
if (NULL == per_process){ if (NULL == per_process){
opal_output(1,"Error while allocating per process!\n"); opal_output(1,"Error while allocating per process!\n");
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
for (i=0;i<k;i++){ for (i=0;i<k;i++){
@ -335,6 +338,9 @@ int ompi_io_ompio_generate_current_file_view (struct mca_io_ompio_file_t *fh,
malloc (tot_entries * sizeof(mca_io_ompio_offlen_array_t)); malloc (tot_entries * sizeof(mca_io_ompio_offlen_array_t));
if (NULL == all_process){ if (NULL == all_process){
opal_output(1,"Error while allocating per process!\n"); opal_output(1,"Error while allocating per process!\n");
free(per_process);
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
@ -342,11 +348,24 @@ int ompi_io_ompio_generate_current_file_view (struct mca_io_ompio_file_t *fh,
(tot_entries * sizeof(int)); (tot_entries * sizeof(int));
if (NULL == sorted){ if (NULL == sorted){
opal_output(1,"Error while allocating per process!\n"); opal_output(1,"Error while allocating per process!\n");
free(all_process);
free(per_process);
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
adj_matrix = (int **) malloc (fh->f_size * adj_matrix = (int **) malloc (fh->f_size *
sizeof(int *)); sizeof(int *));
if (NULL == adj_matrix) {
opal_output(1,"Error while allocating per process!\n");
free(sorted);
free(all_process);
free(per_process);
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE;
}
for (i=0;i<fh->f_size;i++){ for (i=0;i<fh->f_size;i++){
adj_matrix[i] = (int *) malloc (fh->f_size * adj_matrix[i] = (int *) malloc (fh->f_size *
sizeof (int )); sizeof (int ));
@ -399,13 +418,23 @@ int ompi_io_ompio_generate_current_file_view (struct mca_io_ompio_file_t *fh,
if (NULL == column_list){ if (NULL == column_list){
opal_output(1,"Error while allocating column list\n"); opal_output(1,"Error while allocating column list\n");
fclose(fp); fclose(fp);
free(sorted);
free(all_process);
free(per_process);
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
values = (int *) malloc ( m * sizeof(int)); values = (int *) malloc ( m * sizeof(int));
if (NULL == values){ if (NULL == values){
opal_output(1,"Error while allocating values list\n"); opal_output(1,"Error while allocating values list\n");
free(column_list);
fclose(fp); fclose(fp);
free(column_list);
free(sorted);
free(all_process);
free(per_process);
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
@ -413,9 +442,14 @@ int ompi_io_ompio_generate_current_file_view (struct mca_io_ompio_file_t *fh,
sizeof(int)); sizeof(int));
if (NULL == row_index){ if (NULL == row_index){
opal_output(1,"Error while allocating row_index list\n"); opal_output(1,"Error while allocating row_index list\n");
fclose(fp);
free(values); free(values);
free(column_list); free(column_list);
fclose(fp); free(sorted);
free(all_process);
free(per_process);
free(recvcounts);
free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
fprintf(fp,"%d %d\n", m, fh->f_size+1); fprintf(fp,"%d %d\n", m, fh->f_size+1);
@ -1237,6 +1271,7 @@ int ompi_io_ompio_distribute_file_view (mca_io_ompio_file_t *fh,
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
free(num_entries); free(num_entries);
free(broken_index); free(broken_index);
free(fview_cnt);
free(displs); free(displs);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
@ -1264,6 +1299,9 @@ int ompi_io_ompio_distribute_file_view (mca_io_ompio_file_t *fh,
for (j=0; j<i; j++) { for (j=0; j<i; j++) {
free(broken[j]); free(broken[j]);
} }
free(fview_cnt);
free(displs);
free(global_fview);
free(broken); free(broken);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
@ -1416,7 +1454,7 @@ int ompi_io_ompio_gather_data (mca_io_ompio_file_t *fh,
{ {
void **sbuf = NULL; void **sbuf = NULL;
size_t bytes_remaining; size_t bytes_remaining;
size_t *temp_position = NULL; size_t *temp_position;
size_t part; size_t part;
int current; int current;
int temp = 0; int temp = 0;
@ -1448,6 +1486,8 @@ int ompi_io_ompio_gather_data (mca_io_ompio_file_t *fh,
sbuf[i] = (void *) malloc (bytes_sent[i]); sbuf[i] = (void *) malloc (bytes_sent[i]);
if (NULL == sbuf[i]) { if (NULL == sbuf[i]) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
free(sbuf);
free(temp_position);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
} }
@ -1586,23 +1626,16 @@ int ompi_io_ompio_gather_data (mca_io_ompio_file_t *fh,
for (i=0 ; i<num_aggregators ; i++) { for (i=0 ; i<num_aggregators ; i++) {
if (NULL != sbuf[i]) { if (NULL != sbuf[i]) {
free (sbuf[i]); free (sbuf[i]);
sbuf[i] = NULL;
} }
} }
free (sbuf);
if (NULL != req) { if (NULL != req) {
free (req); free (req);
} }
if (NULL != sendreq) { if (NULL != sendreq) {
free (sendreq); free (sendreq);
} }
if (NULL != sbuf) { free (temp_position);
free (sbuf);
sbuf = NULL;
}
if (NULL != temp_position) {
free (temp_position);
temp_position = NULL;
}
return rc; return rc;
} }
@ -2198,7 +2231,6 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
OMPI_MPI_OFFSET_TYPE sum_bytes = 0; OMPI_MPI_OFFSET_TYPE sum_bytes = 0;
MPI_Request *sendreq = NULL; MPI_Request *sendreq = NULL;
MPI_Request *req = NULL;
int start = 0; int start = 0;
int end = 0; int end = 0;
@ -2309,6 +2341,13 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
if (NULL == sendreq) { if (NULL == sendreq) {
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
fh->f_procs_in_group = (int*)malloc (fh->f_procs_per_group * sizeof(int));
if (NULL == fh->f_procs_in_group) {
opal_output (1, "OUT OF MEMORY\n");
free(sendreq);
return OMPI_ERR_OUT_OF_RESOURCE;
}
//Communicate grouping info //Communicate grouping info
for( j = 0 ; j < fh->f_procs_per_group; j++){ for( j = 0 ; j < fh->f_procs_per_group; j++){
//new aggregator sends new procs_per_group to all its members //new aggregator sends new procs_per_group to all its members
@ -2334,10 +2373,6 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
} }
//All non aggregators //All non aggregators
req = (MPI_Request *)malloc (2* sizeof(MPI_Request));
if (NULL == req) {
return OMPI_ERR_OUT_OF_RESOURCE;
}
//All processes receive initial process distribution from aggregators //All processes receive initial process distribution from aggregators
MCA_PML_CALL(recv(&fh->f_procs_per_group, MCA_PML_CALL(recv(&fh->f_procs_per_group,
1, 1,
@ -2347,13 +2382,6 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
fh->f_comm, fh->f_comm,
MPI_STATUS_IGNORE)); MPI_STATUS_IGNORE));
fh->f_procs_in_group = (int*)malloc (fh->f_procs_per_group * sizeof(int));
if (NULL == fh->f_procs_in_group) {
opal_output (1, "OUT OF MEMORY\n");
free(req);
return OMPI_ERR_OUT_OF_RESOURCE;
}
MCA_PML_CALL(recv(fh->f_procs_in_group, MCA_PML_CALL(recv(fh->f_procs_in_group,
fh->f_procs_per_group, fh->f_procs_per_group,
MPI_INT, MPI_INT,
@ -2362,19 +2390,11 @@ int mca_io_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
fh->f_comm, fh->f_comm,
MPI_STATUS_IGNORE)); MPI_STATUS_IGNORE));
if(NULL != req){ if(is_new_aggregator) {
free (req); ompi_request_wait_all (r, sendreq, MPI_STATUSES_IGNORE);
req = NULL; free (sendreq);
}
if(is_new_aggregator) {
ompi_request_wait_all (r, sendreq, MPI_STATUSES_IGNORE);
if (NULL != sendreq) {
free (sendreq);
sendreq = NULL;
}
} }
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -2809,6 +2829,7 @@ int mca_io_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
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);
free(start_offsets_lens_tmp); free(start_offsets_lens_tmp);
free(end_offsets_tmp); free(end_offsets_tmp);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;

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

@ -49,7 +49,7 @@ int mca_io_ompio_set_view_internal(mca_io_ompio_file_t *fh,
{ {
size_t max_data = 0; size_t max_data = 0;
int i = 0; int i;
int num_groups = 0; int num_groups = 0;
contg *contg_groups; contg *contg_groups;
@ -95,7 +95,12 @@ int mca_io_ompio_set_view_internal(mca_io_ompio_file_t *fh,
for( i = 0; i < fh->f_size; i++){ for( i = 0; i < fh->f_size; i++){
contg_groups[i].procs_in_contg_group = (int*)calloc (1,fh->f_size * sizeof(int)); contg_groups[i].procs_in_contg_group = (int*)calloc (1,fh->f_size * sizeof(int));
if(NULL == contg_groups[i].procs_in_contg_group){ if(NULL == contg_groups[i].procs_in_contg_group){
int j;
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
for(j=0; j<i; j++) {
free(contg_groups[j].procs_in_contg_group);
}
free(contg_groups);
return OMPI_ERR_OUT_OF_RESOURCE; return OMPI_ERR_OUT_OF_RESOURCE;
} }
} }
@ -103,6 +108,7 @@ int mca_io_ompio_set_view_internal(mca_io_ompio_file_t *fh,
&num_groups, &num_groups,
contg_groups)){ contg_groups)){
opal_output(1, "mca_io_ompio_fview_based_grouping() failed\n"); opal_output(1, "mca_io_ompio_fview_based_grouping() failed\n");
free(contg_groups);
return OMPI_ERROR; return OMPI_ERROR;
} }
if( !( (fh->f_comm->c_flags & OMPI_COMM_CART) && if( !( (fh->f_comm->c_flags & OMPI_COMM_CART) &&