Changeset 61361688 in rtems

Timestamp:

08/22/95 13:56:54 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

b2c491a0

Parents:

2a0b721

Message:

Modified object name to id translation loop to make it easier to
incorporate variable length object names. Previously the algorithm
scanned an array of 4-byte names for a match. Now it scans the
object table, grabs a pointer to the name, and then compares it
if the object is active and has a name.

Files:

• c/src/exec/score/src/object.c (modified) (1 diff)
• cpukit/score/src/object.c (modified) (1 diff)

c/src/exec/score/src/object.c

@@ -162 +162 @@
 )
 {
-  Objects_Name *names;
-  unsigned32    index;
+  boolean           search_local_node;
+  Objects_Control **objects;
+  Objects_Control  *the_object;
+  unsigned32        index;
 
   if ( name == 0 )
     return( RTEMS_INVALID_NAME );
 
-  if ( (information->maximum != 0) &&
-       (node == RTEMS_SEARCH_ALL_NODES ||
-        node == RTEMS_SEARCH_LOCAL_NODE ||
-        _Objects_Is_local_node( node )) ) {
-    for ( names = information->name_table, index = 1;
-          index <= information->maximum;
-          index++
-         )
-      if ( name == names[ index ] ) {
-        *id = _Objects_Build_id(
-          information->the_class,
-          _Objects_Local_node,
-          index
-        );
+  search_local_node = FALSE;
+
+  if ( information->maximum != 0 &&
+      (node == RTEMS_SEARCH_ALL_NODES || node == RTEMS_SEARCH_LOCAL_NODE ||
+      _Objects_Is_local_node( node ) ) )
+   search_local_node = TRUE;
+
+  if ( search_local_node ) {
+    objects = information->local_table;
+
+    for ( index = 1; index <= information->maximum; index++ ) {
+
+      the_object = objects[ index ];
+
+      if ( !the_object || !the_object->name )
+        continue;
+
+      if ( name == *the_object->name ) {
+        *id = the_object->id;
         return( RTEMS_SUCCESSFUL );
       }
+    }
   }
 

cpukit/score/src/object.c

@@ -162 +162 @@
 )
 {
-  Objects_Name *names;
-  unsigned32    index;
+  boolean           search_local_node;
+  Objects_Control **objects;
+  Objects_Control  *the_object;
+  unsigned32        index;
 
   if ( name == 0 )
     return( RTEMS_INVALID_NAME );
 
-  if ( (information->maximum != 0) &&
-       (node == RTEMS_SEARCH_ALL_NODES ||
-        node == RTEMS_SEARCH_LOCAL_NODE ||
-        _Objects_Is_local_node( node )) ) {
-    for ( names = information->name_table, index = 1;
-          index <= information->maximum;
-          index++
-         )
-      if ( name == names[ index ] ) {
-        *id = _Objects_Build_id(
-          information->the_class,
-          _Objects_Local_node,
-          index
-        );
+  search_local_node = FALSE;
+
+  if ( information->maximum != 0 &&
+      (node == RTEMS_SEARCH_ALL_NODES || node == RTEMS_SEARCH_LOCAL_NODE ||
+      _Objects_Is_local_node( node ) ) )
+   search_local_node = TRUE;
+
+  if ( search_local_node ) {
+    objects = information->local_table;
+
+    for ( index = 1; index <= information->maximum; index++ ) {
+
+      the_object = objects[ index ];
+
+      if ( !the_object || !the_object->name )
+        continue;
+
+      if ( name == *the_object->name ) {
+        *id = the_object->id;
         return( RTEMS_SUCCESSFUL );
       }
+    }
   }