Using OPAL_LIKELY for index checking in opal_pointer_array.

avilcheslopez · avilcheslopez · commit 21263199ef41 · 2015-07-20T12:47:27.000-07:00
diff --git a/opal/class/opal_pointer_array.c b/opal/class/opal_pointer_array.c
@@ -166,7 +166,7 @@ int opal_pointer_array_set_item(opal_pointer_array_t *table, int index,
 {
     assert(table != NULL);
 
-    if (0 > index) {
+    if (OPAL_UNLIKELY(0 > index)) {
         return OPAL_ERROR;
     }
 
diff --git a/opal/class/opal_pointer_array.h b/opal/class/opal_pointer_array.h
@@ -124,7 +124,7 @@ static inline void *opal_pointer_array_get_item(opal_pointer_array_t *table,
 {
     void *p;
 
-    if( 0 > element_index || table->size <= element_index ) {
+    if( OPAL_UNLIKELY(0 > element_index || table->size <= element_index) ) {
         return NULL;
     }
     OPAL_THREAD_LOCK(&(table->lock));

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ int opal_pointer_array_set_item(opal_pointer_array_t *table, int index,`
`166`	`166`	`{`
`167`	`167`	`assert(table != NULL);`
`168`	`168`
`169`		`- if (0 > index) {`
	`169`	`+ if (OPAL_UNLIKELY(0 > index)) {`
`170`	`170`	`return OPAL_ERROR;`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ static inline void opal_pointer_array_get_item(opal_pointer_array_t table,`
`124`	`124`	`{`
`125`	`125`	`void *p;`
`126`	`126`
`127`		`- if( 0 > element_index \|\| table->size <= element_index ) {`
	`127`	`+ if( OPAL_UNLIKELY(0 > element_index \|\| table->size <= element_index) ) {`
`128`	`128`	`return NULL;`
`129`	`129`	`}`
`130`	`130`	`OPAL_THREAD_LOCK(&(table->lock));`