Changeset 40dcafa in rtems

Timestamp:

08/02/14 14:22:31 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

60fe374

Parents:

b767683a

git-author:

Sebastian Huber <sebastian.huber@…> (08/02/14 14:22:31)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/05/14 07:30:33)

Message:

Add and use RTEMS_CONTAINER_OF()

Files:

• cpukit/libblock/src/bdbuf.c (modified) (1 diff)
• cpukit/posix/include/rtems/posix/keyimpl.h (modified) (1 diff)
• cpukit/posix/src/key.c (modified) (1 diff)
• cpukit/posix/src/keyfreememory.c (modified) (3 diffs)
• cpukit/posix/src/keygetspecific.c (modified) (1 diff)
• cpukit/posix/src/keysetspecific.c (modified) (1 diff)
• cpukit/sapi/include/rtems/rbheap.h (modified) (1 diff)
• cpukit/sapi/include/rtems/rbtree.h (modified) (1 diff)
• cpukit/score/include/rtems/score/basedefs.h (modified) (1 diff)
• cpukit/score/include/rtems/score/mrspimpl.h (modified) (1 diff)
• cpukit/score/include/rtems/score/rbtree.h (modified) (1 diff)
• cpukit/score/include/rtems/score/scheduleredfimpl.h (modified) (1 diff)
• cpukit/score/include/rtems/score/schedulerimpl.h (modified) (1 diff)
• cpukit/score/include/rtems/score/threadimpl.h (modified) (2 diffs)
• cpukit/score/src/resourceiterate.c (modified) (1 diff)
• cpukit/score/src/schedulerchangeroot.c (modified) (1 diff)
• cpukit/score/src/scheduleredf.c (modified) (1 diff)
• cpukit/score/src/threadq.c (modified) (2 diffs)
• cpukit/score/src/threadqdequeue.c (modified) (1 diff)
• cpukit/score/src/threadqfirst.c (modified) (2 diffs)
• testsuites/sptests/sprbtree01/init.c (modified) (20 diffs)

cpukit/libblock/src/bdbuf.c

@@ -3179 +3179 @@
     while ((node = rtems_chain_get_unprotected (chain)) != NULL)
     {
-      rtems_disk_device *dd = (rtems_disk_device *)
-        ((char *) node - offsetof (rtems_disk_device, read_ahead.node));
+      rtems_disk_device *dd =
+        RTEMS_CONTAINER_OF (node, rtems_disk_device, read_ahead.node);
       rtems_blkdev_bnum block = dd->read_ahead.next;
       rtems_blkdev_bnum media_block = 0;

cpukit/posix/include/rtems/posix/keyimpl.h

@@ -49 +49 @@
  */
 POSIX_EXTERN Freechain_Control _POSIX_Keys_Keypool;
+
+#define POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( node ) \
+  RTEMS_CONTAINER_OF( node, POSIX_Keys_Key_value_pair, Key_value_lookup_node )
 
 /**

cpukit/posix/src/key.c

@@ -55 +55 @@
   int diff;
 
-  n1 = _RBTree_Container_of( node1, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
-  n2 = _RBTree_Container_of( node2, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
+  n1 = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( node1 );
+  n2 = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( node2 );
 
   diff = n1->key - n2->key;

cpukit/posix/src/keyfreememory.c

@@ -40 +40 @@
    */
   next = _RBTree_Next( iter, RBT_LEFT );
-  p = _RBTree_Container_of( next, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
+  p = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( next );
   while ( next != NULL && p->key == key_id) {
     iter = next;
     next = _RBTree_Next( iter, RBT_LEFT );
-    p = _RBTree_Container_of( next, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
+    p = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( next );
   }
 
@@ -50 +50 @@
    * delete all nodes belongs to the_key from the rbtree and chain.
    */
-  p = _RBTree_Container_of( iter, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
+  p = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( iter );
   while ( iter != NULL && p->key == key_id ) {
     next = _RBTree_Next( iter, RBT_RIGHT );
@@ -58 +58 @@
 
     iter = next;
-    p = _RBTree_Container_of( iter, POSIX_Keys_Key_value_pair, Key_value_lookup_node );
+    p = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( iter );
   }
 }

cpukit/posix/src/keygetspecific.c

@@ -52 +52 @@
       p = _POSIX_Keys_Find( key, _Thread_Executing->Object.id, &search_node );
       if ( p != NULL ) {
-        value_pair_p = _RBTree_Container_of( p,
-                                          POSIX_Keys_Key_value_pair,
-                                          Key_value_lookup_node );
+        value_pair_p = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( p );
         key_data = value_pair_p->value;
       } else {

cpukit/posix/src/keysetspecific.c

@@ -47 +47 @@
       p = _POSIX_Keys_Find( key, _Thread_Executing->Object.id, &search_node );
       if ( p != NULL ) {
-        value_pair_ptr = _RBTree_Container_of( p,
-                                          POSIX_Keys_Key_value_pair,
-                                          Key_value_lookup_node );
-
+        value_pair_ptr = POSIX_KEYS_RBTREE_NODE_TO_KEY_VALUE_PAIR( p );
         value_pair_ptr->value = value;
       } else {

cpukit/sapi/include/rtems/rbheap.h

@@ -255 +255 @@
 
 #define rtems_rbheap_chunk_of_node(node) \
-  rtems_rbtree_container_of(node, rtems_rbheap_chunk, tree_node)
+  RTEMS_CONTAINER_OF(node, rtems_rbheap_chunk, tree_node)
 
 static inline bool rtems_rbheap_is_chunk_free(const rtems_rbheap_chunk *chunk)

cpukit/sapi/include/rtems/rbtree.h

@@ -75 +75 @@
 
 /**
-  * @brief macro to return the structure containing the @a node.
-  *
-  * This macro returns a pointer of type @a object_type that points 
-  * to the structure containing @a node, where @a object_member is the 
-  * field name of the rtems_rbtree_node structure in objects of @a object_type.
-  */
-#define rtems_rbtree_container_of(node,object_type, object_member) \
-  _RBTree_Container_of(node,object_type,object_member)
-
-/**
  * @brief Initialize a RBTree header.
  *

cpukit/score/include/rtems/score/basedefs.h

@@ -218 +218 @@
 #define RTEMS_ZERO_LENGTH_ARRAY 0
 
+/**
+ * @brief Returns a pointer to the container of a specified member pointer.
+ *
+ * @param[in] _m The pointer to a member of the container.
+ * @param[in] _type The type of the container.
+ * @param[in] _member_name The designator name of the container member.
+ */
+#define RTEMS_CONTAINER_OF( _m, _type, _member_name ) \
+  ( (_type *) ( (uintptr_t) ( _m ) - offsetof( _type, _member_name ) ) )
+
 #ifndef ASM
   #ifdef RTEMS_DEPRECATED_TYPES

cpukit/score/include/rtems/score/mrspimpl.h

@@ -182 +182 @@
   _Scheduler_Thread_change_resource_root(
     executing,
-    _Thread_Resource_node_to_thread( _Resource_Node_get_root( owner ) )
+    THREAD_RESOURCE_NODE_TO_THREAD( _Resource_Node_get_root( owner ) )
   );
 

cpukit/score/include/rtems/score/rbtree.h

@@ -83 +83 @@
 
 /**
- * @brief Macro to return the structure containing the @a node.
- *
- * This macro returns a pointer of type @a container_type that points
- * to the structure containing @a node, where @a node_field_name is the
- * field name of the RBTree_Node structure in @a container_type.
- *
- */
-#define _RBTree_Container_of(node, container_type, node_field_name) \
-( \
-  (container_type*) \
-    ( (uintptr_t)(node) - offsetof(container_type, node_field_name) ) \
-)
-
-/**
  *  This type indicates the direction.
  */

cpukit/score/include/rtems/score/scheduleredfimpl.h

@@ -90 +90 @@
   RBTree_Node *first = _RBTree_First( &context->Ready, RBT_LEFT );
   Scheduler_EDF_Node *node =
-    _RBTree_Container_of(first, Scheduler_EDF_Node, Node);
+    RTEMS_CONTAINER_OF( first, Scheduler_EDF_Node, Node );
   Thread_Control *heir = node->thread;
 

cpukit/score/include/rtems/score/schedulerimpl.h

@@ -165 +165 @@
   Thread_Control *next_needs_help;
   Thread_Control *offers_help =
-    _Thread_Resource_node_to_thread( resource_node );
+    THREAD_RESOURCE_NODE_TO_THREAD( resource_node );
   const Scheduler_Control *scheduler = _Scheduler_Get_own( offers_help );
 

cpukit/score/include/rtems/score/threadimpl.h

@@ -75 +75 @@
  */
 SCORE_EXTERN struct _reent **_Thread_libc_reent;
+#endif
+
+#define THREAD_RBTREE_NODE_TO_THREAD( node ) \
+  RTEMS_CONTAINER_OF( node, Thread_Control, RBNode )
+
+#if defined(RTEMS_SMP)
+#define THREAD_RESOURCE_NODE_TO_THREAD( node ) \
+  RTEMS_CONTAINER_OF( node, Thread_Control, Resource_node )
 #endif
 
@@ -847 +855 @@
 }
 
-#if defined(RTEMS_SMP)
-RTEMS_INLINE_ROUTINE Thread_Control *_Thread_Resource_node_to_thread(
-  Resource_Node *node
-)
-{
-  return (Thread_Control *)
-    ( (char *) node - offsetof( Thread_Control, Resource_node ) );
-}
-#endif
-
 RTEMS_INLINE_ROUTINE void _Thread_Debug_set_real_processor(
   Thread_Control  *the_thread,

cpukit/score/src/resourceiterate.c

@@ -17 +17 @@
 static Resource_Control *_Resource_Rival_head_to_resource( Chain_Node *head )
 {
-  return (Resource_Control *)
-    ( (char *) head - offsetof( Resource_Control, Rivals.Head.Node ) );
+  return RTEMS_CONTAINER_OF( head, Resource_Control, Rivals.Head.Node );
 }
 
 static Resource_Node *_Resource_Resource_tail_to_rival( Chain_Node *tail )
 {
-  return (Resource_Node *)
-    ( (char *) tail - offsetof( Resource_Node, Resources.Tail.Node ) );
+  return RTEMS_CONTAINER_OF( tail, Resource_Node, Resources.Tail.Node );
 }
 

cpukit/score/src/schedulerchangeroot.c

@@ -33 +33 @@
   Thread_Control *needs_help = root;
   Thread_Control *offers_help =
-    _Thread_Resource_node_to_thread( resource_node );
+    THREAD_RESOURCE_NODE_TO_THREAD( resource_node );
   const Scheduler_Control *scheduler = _Scheduler_Get_own( offers_help );
   Thread_Control *needs_help_too;

cpukit/score/src/scheduleredf.c

@@ -26 +26 @@
 )
 {
-  Priority_Control value1 = _RBTree_Container_of
-    (n1,Scheduler_EDF_Node,Node)->thread->current_priority;
-  Priority_Control value2 = _RBTree_Container_of
-    (n2,Scheduler_EDF_Node,Node)->thread->current_priority;
+  Scheduler_EDF_Node *edf1 =
+    RTEMS_CONTAINER_OF( n1, Scheduler_EDF_Node, Node );
+  Scheduler_EDF_Node *edf2 =
+    RTEMS_CONTAINER_OF( n2, Scheduler_EDF_Node, Node );
+  Priority_Control value1 = edf1->thread->current_priority;
+  Priority_Control value2 = edf2->thread->current_priority;
 
   /*

cpukit/score/src/threadq.c

@@ -21 +21 @@
 #include <rtems/score/threadqimpl.h>
 #include <rtems/score/chainimpl.h>
+#include <rtems/score/rbtreeimpl.h>
 #include <rtems/score/scheduler.h>
-
-#include <rtems/score/rbtreeimpl.h>
+#include <rtems/score/threadimpl.h>
 
 int _Thread_queue_Compare_priority(
@@ -30 +30 @@
 )
 {
-  Priority_Control left_priority = _RBTree_Container_of
-    (left,Thread_Control,RBNode)->current_priority;
-  Priority_Control right_priority = _RBTree_Container_of
-    (right,Thread_Control,RBNode)->current_priority;
+  Priority_Control left_priority =
+    THREAD_RBTREE_NODE_TO_THREAD( left )->current_priority;
+  Priority_Control right_priority =
+    THREAD_RBTREE_NODE_TO_THREAD( right )->current_priority;
 
   /*

cpukit/score/src/threadqdequeue.c

@@ -51 +51 @@
     first = _RBTree_Get( &the_thread_queue->Queues.Priority, RBT_LEFT );
     if ( first ) {
-      the_thread = _RBTree_Container_of( first, Thread_Control, RBNode );
+      the_thread = THREAD_RBTREE_NODE_TO_THREAD( first );
     }
   }

cpukit/score/src/threadqfirst.c

@@ -19 +19 @@
 #endif
 
+#include <rtems/score/threadqimpl.h>
 #include <rtems/score/chainimpl.h>
 #include <rtems/score/isrlevel.h>
-#include <rtems/score/threadqimpl.h>
+#include <rtems/score/threadimpl.h>
 
 Thread_Control *_Thread_queue_First(
@@ -42 +43 @@
     first = _RBTree_First( &the_thread_queue->Queues.Priority, RBT_LEFT );
     if ( first )
-      thread = _RBTree_Container_of( first, Thread_Control, RBNode );
+      thread = THREAD_RBTREE_NODE_TO_THREAD( first );
   }
 

testsuites/sptests/sprbtree01/init.c

@@ -39 +39 @@
 )
 {
-  int key1 = rtems_rbtree_container_of( n1, test_node, Node )->key;
-  int key2 = rtems_rbtree_container_of( n2, test_node, Node )->key;
+  int key1 = RTEMS_CONTAINER_OF( n1, test_node, Node )->key;
+  int key2 = RTEMS_CONTAINER_OF( n2, test_node, Node )->key;
 
   return key1 - key2;
@@ -263 +263 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 1 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 2 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -291 +291 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 1 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 1 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -346 +346 @@
 
   puts( "INIT - Verify rtems_rbtree_peek_max/min, rtems_rbtree_extract" );
-  test_node *t1 = rtems_rbtree_container_of(rtems_rbtree_peek_max(&rbtree1),
+  test_node *t1 = RTEMS_CONTAINER_OF(rtems_rbtree_peek_max(&rbtree1),
          test_node,Node);
-  test_node *t2 = rtems_rbtree_container_of(rtems_rbtree_peek_min(&rbtree1),
+  test_node *t2 = RTEMS_CONTAINER_OF(rtems_rbtree_peek_min(&rbtree1),
          test_node,Node);
   if (t1->key - t2->key != 1) {
@@ -356 +356 @@
   p = rtems_rbtree_peek_max(&rbtree1);
   rtems_rbtree_extract(&rbtree1, p);
-  t1 = rtems_rbtree_container_of(p,test_node,Node);
+  t1 = RTEMS_CONTAINER_OF(p,test_node,Node);
   if (t1->key != 2) {
     puts( "INIT - rtems_rbtree_extract failed");
@@ -366 +366 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 1 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 2 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -391 +391 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 99 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -424 +424 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 99 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -468 +468 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0, i = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p, test_node, Node);
+    test_node *t = RTEMS_CONTAINER_OF(p, test_node, Node);
 
     while ( id == numbers_sorted[i] ) {
@@ -530 +530 @@
   for ( p = rtems_rbtree_get_max(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_max(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 99 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -562 +562 @@
   search_node.key = 30;
   p = rb_find_unique(&rbtree1, &search_node.Node);
-  if(rtems_rbtree_container_of(p,test_node,Node)->id != 30) {
+  if(RTEMS_CONTAINER_OF(p,test_node,Node)->id != 30) {
     puts ("INIT - ERROR ON RBTREE ID MISMATCH");
     rtems_test_exit(0);
@@ -569 +569 @@
   puts( "INIT - Verify rtems_rbtree_predecessor/successor");
   p = rtems_rbtree_predecessor(p);
-  if(p && rtems_rbtree_container_of(p,test_node,Node)->id != 29) {
+  if(p && RTEMS_CONTAINER_OF(p,test_node,Node)->id != 29) {
     puts ("INIT - ERROR ON RBTREE ID MISMATCH");
     rtems_test_exit(0);
@@ -575 +575 @@
   p = rb_find_unique(&rbtree1, &search_node.Node);
   p = rtems_rbtree_successor(p);
-  if(p && rtems_rbtree_container_of(p,test_node,Node)->id != 31) {
+  if(p && RTEMS_CONTAINER_OF(p,test_node,Node)->id != 31) {
     puts ("INIT - ERROR ON RBTREE ID MISMATCH");
     rtems_test_exit(0);
@@ -602 +602 @@
   for ( p = rtems_rbtree_get_max(&rbtree1), id = 99 ; p ;
       p = rtems_rbtree_get_max(&rbtree1) , id-- ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id < 0 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -635 +635 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 19 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -667 +667 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 99 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -704 +704 @@
   search_node.key = 2;
   p = rb_find_multi(&rbtree1, &search_node.Node);
-  if(rtems_rbtree_container_of(p,test_node,Node)->id != 2) {
+  if(RTEMS_CONTAINER_OF(p,test_node,Node)->id != 2) {
     puts ("INIT - ERROR ON RBTREE ID MISMATCH");
     rtems_test_exit(0);
@@ -713 +713 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 99 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );
@@ -745 +745 @@
   search_node.key = 2;
   p = rb_find_multi(&rbtree1, &search_node.Node);
-  if(rtems_rbtree_container_of(p,test_node,Node)->id != 97) {
+  if(RTEMS_CONTAINER_OF(p,test_node,Node)->id != 97) {
     puts ("INIT - ERROR ON RBTREE ID MISMATCH");
     rtems_test_exit(0);
@@ -754 +754 @@
   for ( p = rtems_rbtree_get_min(&rbtree1), id = 0 ; p ;
       p = rtems_rbtree_get_min(&rbtree1) , id++ ) {
-    test_node *t = rtems_rbtree_container_of(p,test_node,Node);
+    test_node *t = RTEMS_CONTAINER_OF(p,test_node,Node);
     if ( id > 99 ) {
       puts( "INIT - TOO MANY NODES ON RBTREE" );