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

Merge pull request #5038 from raafatfeki/pr/coverty-dynamic_gen2-fixes

Просмотр исходного кода 
fcoll/dynamic_gen2: Reduce number of realloc calls
Этот коммит содержится в:
Edgar Gabriel 2018-04-22 17:59:00 -05:00 коммит произвёл GitHub
родитель fc748b2922 91e028f7fd
Коммит d4fb877e7b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 46 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

68
ompi/mca/fcoll/dynamic_gen2/fcoll_dynamic_gen2_file_write_all.c
Просмотреть файл

@ -47,6 +47,7 @@ typedef struct mca_io_ompio_local_io_array{
typedef struct mca_io_ompio_aggregator_data { typedef struct mca_io_ompio_aggregator_data {
int *disp_index, *sorted, *fview_count, n; int *disp_index, *sorted, *fview_count, n;
int *max_disp_index;
int **blocklen_per_process; int **blocklen_per_process;
MPI_Aint **displs_per_process, total_bytes, bytes_per_cycle, total_bytes_written; MPI_Aint **displs_per_process, total_bytes, bytes_per_cycle, total_bytes_written;
MPI_Comm comm; MPI_Comm comm;
@ -499,6 +500,13 @@ int mca_fcoll_dynamic_gen2_file_write_all (mca_io_ompio_file_t *fh,
goto exit; goto exit;
} }
aggr_data[i]->max_disp_index = (int *)calloc (fh->f_procs_per_group, sizeof (int));
if (NULL == aggr_data[i]->max_disp_index) {
opal_output (1, "OUT OF MEMORY\n");
ret = OMPI_ERR_OUT_OF_RESOURCE;
goto exit;
}
aggr_data[i]->blocklen_per_process = (int **)calloc (fh->f_procs_per_group, sizeof (int*)); aggr_data[i]->blocklen_per_process = (int **)calloc (fh->f_procs_per_group, sizeof (int*));
if (NULL == aggr_data[i]->blocklen_per_process) { if (NULL == aggr_data[i]->blocklen_per_process) {
opal_output (1, "OUT OF MEMORY\n"); opal_output (1, "OUT OF MEMORY\n");
@ -679,6 +687,7 @@ exit :
} }
free (aggr_data[i]->disp_index); free (aggr_data[i]->disp_index);
free (aggr_data[i]->max_disp_index);
free (aggr_data[i]->global_buf); free (aggr_data[i]->global_buf);
free (aggr_data[i]->prev_global_buf); free (aggr_data[i]->prev_global_buf);
for(l=0;l<aggr_data[i]->procs_per_group;l++){ for(l=0;l<aggr_data[i]->procs_per_group;l++){
@ -791,16 +800,20 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
for(l=0;l<data->procs_per_group;l++){ for(l=0;l<data->procs_per_group;l++){
data->disp_index[l] = 1; data->disp_index[l] = 1;
free(data->blocklen_per_process[l]); if(data->max_disp_index[l] == 0) {
free(data->displs_per_process[l]); data->blocklen_per_process[l] = (int *) calloc (INIT_LEN, sizeof(int));
data->displs_per_process[l] = (MPI_Aint *) calloc (INIT_LEN, sizeof(MPI_Aint));
data->blocklen_per_process[l] = (int *) calloc (1, sizeof(int)); if (NULL == data->displs_per_process[l] || NULL == data->blocklen_per_process[l]){
data->displs_per_process[l] = (MPI_Aint *) calloc (1, sizeof(MPI_Aint)); opal_output (1, "OUT OF MEMORY for displs\n");
if (NULL == data->displs_per_process[l] || NULL == data->blocklen_per_process[l]){ ret = OMPI_ERR_OUT_OF_RESOURCE;
opal_output (1, "OUT OF MEMORY for displs\n"); goto exit;
ret = OMPI_ERR_OUT_OF_RESOURCE; }
goto exit; data->max_disp_index[l] = INIT_LEN;
}
else {
memset ( data->blocklen_per_process[l], 0, data->max_disp_index[l]*sizeof(int) );
memset ( data->displs_per_process[l], 0, data->max_disp_index[l]*sizeof(MPI_Aint) );
} }
} }
} /* (aggregator == rank */ } /* (aggregator == rank */
@ -871,15 +884,22 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
(data->global_iov_array[data->sorted[data->current_index]].iov_len (data->global_iov_array[data->sorted[data->current_index]].iov_len
- data->bytes_remaining); - data->bytes_remaining);
data->disp_index[data->n] += 1;
/* In this cases the length is consumed so allocating for /* In this cases the length is consumed so allocating for
next displacement and blocklength*/ next displacement and blocklength*/
data->blocklen_per_process[data->n] = (int *) realloc if ( data->disp_index[data->n] == data->max_disp_index[data->n] ) {
((void *)data->blocklen_per_process[data->n], (data->disp_index[data->n]+1)*sizeof(int)); data->max_disp_index[data->n] *= 2;
data->displs_per_process[data->n] = (MPI_Aint *) realloc data->blocklen_per_process[data->n] = (int *) realloc(
((void *)data->displs_per_process[data->n], (data->disp_index[data->n]+1)*sizeof(MPI_Aint)); (void *)data->blocklen_per_process[data->n],
(data->max_disp_index[data->n])*sizeof(int));
data->displs_per_process[data->n] = (MPI_Aint *) realloc(
(void *)data->displs_per_process[data->n],
(data->max_disp_index[data->n])*sizeof(MPI_Aint));
}
data->blocklen_per_process[data->n][data->disp_index[data->n]] = 0; data->blocklen_per_process[data->n][data->disp_index[data->n]] = 0;
data->displs_per_process[data->n][data->disp_index[data->n]] = 0; data->displs_per_process[data->n][data->disp_index[data->n]] = 0;
data->disp_index[data->n] += 1;
} }
if (data->procs_in_group[data->n] == rank) { if (data->procs_in_group[data->n] == rank) {
bytes_sent += data->bytes_remaining; bytes_sent += data->bytes_remaining;
@ -887,7 +907,6 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
data->current_index ++; data->current_index ++;
data->bytes_to_write_in_cycle -= data->bytes_remaining; data->bytes_to_write_in_cycle -= data->bytes_remaining;
data->bytes_remaining = 0; data->bytes_remaining = 0;
// continue;
} }
else { else {
/* the remaining data from the previous cycle is larger than the /* the remaining data from the previous cycle is larger than the
@ -935,16 +954,22 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
data->displs_per_process[data->n][data->disp_index[data->n] - 1] = (ptrdiff_t) data->displs_per_process[data->n][data->disp_index[data->n] - 1] = (ptrdiff_t)
data->global_iov_array[data->sorted[data->current_index]].iov_base; data->global_iov_array[data->sorted[data->current_index]].iov_base;
data->disp_index[data->n] += 1;
/*realloc for next blocklength /*realloc for next blocklength
and assign this displacement and check for next displs as and assign this displacement and check for next displs as
the total length of this entry has been consumed!*/ the total length of this entry has been consumed!*/
data->blocklen_per_process[data->n] = if ( data->disp_index[data->n] == data->max_disp_index[data->n] ) {
(int *) realloc ((void *)data->blocklen_per_process[data->n], (data->disp_index[data->n]+1)*sizeof(int)); data->max_disp_index[data->n] *= 2;
data->displs_per_process[data->n] = (MPI_Aint *)realloc data->blocklen_per_process[data->n] = (int *) realloc(
((void *)data->displs_per_process[data->n], (data->disp_index[data->n]+1)*sizeof(MPI_Aint)); (void *)data->blocklen_per_process[data->n],
(data->max_disp_index[data->n]*sizeof(int)));
data->displs_per_process[data->n] = (MPI_Aint *)realloc(
(void *)data->displs_per_process[data->n],
(data->max_disp_index[data->n]*sizeof(MPI_Aint)));
}
data->blocklen_per_process[data->n][data->disp_index[data->n]] = 0; data->blocklen_per_process[data->n][data->disp_index[data->n]] = 0;
data->displs_per_process[data->n][data->disp_index[data->n]] = 0; data->displs_per_process[data->n][data->disp_index[data->n]] = 0;
data->disp_index[data->n] += 1;
} }
if (data->procs_in_group[data->n] == rank) { if (data->procs_in_group[data->n] == rank) {
bytes_sent += data->global_iov_array[data->sorted[data->current_index]].iov_len; bytes_sent += data->global_iov_array[data->sorted[data->current_index]].iov_len;
@ -952,7 +977,6 @@ static int shuffle_init ( int index, int cycles, int aggregator, int rank, mca_i
data->bytes_to_write_in_cycle -= data->bytes_to_write_in_cycle -=
data->global_iov_array[data->sorted[data->current_index]].iov_len; data->global_iov_array[data->sorted[data->current_index]].iov_len;
data->current_index ++; data->current_index ++;
// continue;
} }
} }
} }