1
1
- fixed incorrect allocation of slot information (can't take the size
  of the fifo until after it has been created!)

This commit was SVN r5001.
Этот коммит содержится в:
Jeff Squyres 2005-03-23 18:46:29 +00:00
родитель 997dac244e
Коммит ee6b23f2fb

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

@ -50,7 +50,7 @@ int main(int argc, char **argv) {
int i,j,size_of_fifo,lazy_free,return_status,error_cnt,loop_cnt;
void *ptr;
cb_slot_t *slot_data;
size_t cnt, r_offset;
size_t cnt;
#if 0
/* get queue size */
@ -114,17 +114,6 @@ int main(int argc, char **argv) {
test_failure(" ompi_fifo_free \n");
}
/*
* test slot reservation
*/
cnt=sizeof(cb_slot_t)*loop_cnt;
cnt*=fifo.head->cb_fifo.size;
slot_data=malloc(cnt);
if( !slot_data ) {
test_failure(" can't allocate memory for slot_data");
goto ERRORS;
}
/* init fifo */
return_status=ompi_fifo_init(size_of_fifo,lazy_free,0,0,0,&fifo,
&pool);
@ -135,13 +124,23 @@ int main(int argc, char **argv) {
test_failure(" ompi_fifo_init \n");
}
/*
* test slot reservation
*/
cnt = sizeof(cb_slot_t) * loop_cnt * fifo.head->cb_fifo.size;
slot_data=malloc(cnt);
if( !slot_data ) {
test_failure(" can't allocate memory for slot_data");
goto ERRORS;
}
/* reserve slot fifo */
error_cnt=0;
for( i=0 ; i < loop_cnt*ompi_cb_fifo_size( (ompi_cb_fifo_t *)
&(fifo.head->cb_fifo)); i++ ) {
slot_data[i]=ompi_fifo_get_slot((ompi_fifo_t *)&(fifo),
slot_data[i]=ompi_fifo_get_slot(&fifo,
&pool, (size_t)pool.mpool_base());
if( 0 > slot_data[i].index ) {
if( slot_data[i].index < 0 ) {
test_failure(" ompi_fifo_get_slot \n");
error_cnt++;
}