Minor fixes for the ompi_bitmap class that were found while

investivating #817:

 * Remove use of legal_numbits member and always just use the full
   size of the array.  There was a corner case where legal_numbits was
   not an even multiple of the number of bits in the array where bits
   would not get freed properly, ususally causing wasted fortran
   MPI handles, or, as in the case of #817, wasted attribute keyvals
   (i.e., the user freed them, but the bitmap didn't reflect the
   free).
 * Re-order some error checks to ensure that we don't segv (we don't
   currently trigger this problem anywhere; I just noticed it while
   doing the other attribute keyval and legal_numbits work).

Since this change affects all Fortran MPI handles, I ran all the intel
and ibm tests and all still pass with this change.

This commit was SVN r13561.

ompi/class/ompi_bitmap.c

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -24,7 +25,7 @@
 #include "ompi/class/ompi_bitmap.h"
 
 
-#define SIZE_OF_CHAR (sizeof(char) * 8)
+#define SIZE_OF_CHAR ((int) (sizeof(char) * 8))
 
 static void ompi_bitmap_construct(ompi_bitmap_t *bm);
 static void ompi_bitmap_destruct(ompi_bitmap_t *bm);
@@ -36,7 +37,6 @@ OBJ_CLASS_INSTANCE(ompi_bitmap_t, opal_object_t,
 static void 
 ompi_bitmap_construct(ompi_bitmap_t *bm) 
 {
-    bm->legal_numbits = 0;
     bm->array_size = 0;
     bm->bitmap = NULL;
 }
@@ -60,16 +60,14 @@ ompi_bitmap_init(ompi_bitmap_t *bm, int size)
 	    return OMPI_ERR_BAD_PARAM;
     }
 
-    bm->legal_numbits = size;
     actual_size = size / SIZE_OF_CHAR;
-  
     actual_size += (size % SIZE_OF_CHAR == 0) ? 0 : 1;
+    bm->array_size = actual_size;
     bm->bitmap = (unsigned char *) malloc(actual_size);
     if (NULL == bm->bitmap) {
 	return OMPI_ERR_OUT_OF_RESOURCE;
     }
 
-    bm->array_size = actual_size;
     ompi_bitmap_clear_all_bits(bm);
     return OMPI_SUCCESS;
 }
@@ -97,7 +95,7 @@ ompi_bitmap_set_bit(ompi_bitmap_t *bm, int bit)
         }
 
 	/* We need to allocate more space for the bitmap, since we are
-	   out of range. We dont throw any error here, because this is
+	   out of range. We don't throw any error here, because this is
 	   valid and we simply expand the bitmap */
 
 	new_size_large = (index / bm->array_size + 1 ) * bm->array_size;
@@ -130,7 +128,6 @@ ompi_bitmap_set_bit(ompi_bitmap_t *bm, int bit)
 
 	/* Update the array_size */
 	bm->array_size = new_size;
-	bm->legal_numbits = bit + 1;
     }
     
     /* Now set the bit */
@@ -145,7 +142,7 @@ ompi_bitmap_clear_bit(ompi_bitmap_t *bm, int bit)
 {
     int index, offset;
 
-    if ((bit < 0) || (bit > bm->legal_numbits - 1) || (NULL == bm)) {
+    if ((bit < 0) || NULL == bm || (bit >= (bm->array_size * SIZE_OF_CHAR))) {
 	return OMPI_ERR_BAD_PARAM;
     }
 
@@ -166,7 +163,7 @@ ompi_bitmap_is_set_bit(ompi_bitmap_t *bm, int bit)
 {
     int index, offset;
   
-    if ((bit < 0) || (bit > bm->legal_numbits - 1) || (NULL == bm)) {
+    if ((bit < 0) || NULL == bm || (bit >= (bm->array_size * SIZE_OF_CHAR))) {
 	return OMPI_ERR_BAD_PARAM;
     }
 
@@ -224,7 +221,7 @@ ompi_bitmap_find_and_set_first_unset_bit(ompi_bitmap_t *bm, int *position)
 	return OMPI_ERR_BAD_PARAM;
     }
 
-    /* Neglect all which dont have an unset bit */
+    /* Neglect all which don't have an unset bit */
     *position = 0;
     while((i < bm->array_size) && (bm->bitmap[i] == all_ones)) {
 	++i;

ompi/class/ompi_bitmap.h

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -125,10 +126,6 @@ struct ompi_bitmap_t {
     opal_object_t super; /**< Subclass of opal_object_t */
     unsigned char *bitmap; /**< The actual bitmap array of characters */
     int array_size;  /**< The actual array size that maintains the bitmap */
-    int legal_numbits; /**< The number of bits which are legal (the
-			    actual bitmap may contain more bits, since
-			    it needs to be rounded to the nearest
-			    char  */
 };
 
 typedef struct ompi_bitmap_t ompi_bitmap_t;
@@ -226,7 +223,7 @@ OMPI_DECLSPEC int ompi_bitmap_set_all_bits(ompi_bitmap_t *bm);
  */
 static inline int ompi_bitmap_size(ompi_bitmap_t *bm)
 {
-    return (NULL == bm) ? 0 : bm->legal_numbits;
+    return (NULL == bm) ? 0 : (bm->array_size * ((int) (sizeof(char) * 8)));
 }
 
 #if defined(c_plusplus) || defined(__cplusplus)