Merge pull request open-mpi#754 from hjelmn/v2.x_opal_flist_fix

hppritcha · hppritcha · commit 7fb2b071e501 · 2015-11-30T11:49:20.000-07:00
opal_free_list: fix strange size check
diff --git a/opal/class/opal_free_list.c b/opal/class/opal_free_list.c
@@ -121,6 +121,10 @@ int opal_free_list_init (opal_free_list_t *flist, size_t frag_size, size_t frag_
             return OPAL_ERROR;
     }
 
+    if (frag_class && frag_size < frag_class->cls_sizeof) {
+        frag_size = frag_class->cls_sizeof;
+    }
+
     if (frag_size > flist->fl_frag_size) {
         flist->fl_frag_size = frag_size;
     }
@@ -164,9 +168,7 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements)
         return OPAL_ERR_TEMP_OUT_OF_RESOURCE;
     }
 
-    head_size = (NULL == flist->fl_mpool) ? flist->fl_frag_size:
-        flist->fl_frag_class->cls_sizeof;
-    head_size = OPAL_ALIGN(head_size, flist->fl_frag_alignment, size_t);
+    head_size = OPAL_ALIGN(flist->fl_frag_size, flist->fl_frag_alignment, size_t);
 
     /* calculate head allocation size */
     alloc_size = num_elements * head_size + sizeof(opal_free_list_memory_t) +

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ int opal_free_list_init (opal_free_list_t *flist, size_t frag_size, size_t frag_`
`121`	`121`	`return OPAL_ERROR;`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ if (frag_class && frag_size < frag_class->cls_sizeof) {`
	`125`	`+ frag_size = frag_class->cls_sizeof;`
	`126`	`+ }`
	`127`	`+`
`124`	`128`	`if (frag_size > flist->fl_frag_size) {`
`125`	`129`	`flist->fl_frag_size = frag_size;`
`126`	`130`	`}`
`@@ -164,9 +168,7 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements)`
`164`	`168`	`return OPAL_ERR_TEMP_OUT_OF_RESOURCE;`
`165`	`169`	`}`
`166`	`170`
`167`		`- head_size = (NULL == flist->fl_mpool) ? flist->fl_frag_size:`
`168`		`- flist->fl_frag_class->cls_sizeof;`
`169`		`- head_size = OPAL_ALIGN(head_size, flist->fl_frag_alignment, size_t);`
	`171`	`+ head_size = OPAL_ALIGN(flist->fl_frag_size, flist->fl_frag_alignment, size_t);`
`170`	`172`
`171`	`173`	`/* calculate head allocation size */`
`172`	`174`	`alloc_size = num_elements * head_size + sizeof(opal_free_list_memory_t) +`