Changeset 4ea97d24 in rtems for cpukit/sapi
- Timestamp:
- 11/19/13 15:21:54 (10 years ago)
- Branches:
- 4.11, 5, master
- Children:
- bb81e04
- Parents:
- 833dd90
- git-author:
- Sebastian Huber <sebastian.huber@…> (11/19/13 15:21:54)
- git-committer:
- Sebastian Huber <sebastian.huber@…> (11/21/13 11:58:46)
- Location:
- cpukit/sapi
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/sapi/include/rtems/rbtree.h
r833dd90 r4ea97d24 28 28 29 29 /** 30 * @defgroup ClassicRBTrees Red-Black Trees 31 * 32 * @ingroup ClassicRTEMS 33 * 34 * @brief A Red-Black Tree container. 35 * 36 * The red-black tree container offers no internal protection against 37 * concurrent access. The user must ensure that at most one thread at once can 38 * access a red-black tree instance. 39 * 40 * @{ 41 */ 42 43 /** 30 44 * @typedef rtems_rbtree_node 31 45 * … … 300 314 301 315 /** 302 * @copydoc _RBTree_Find _unprotected()303 */ 304 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_find _unprotected(316 * @copydoc _RBTree_Find() 317 */ 318 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_find( 305 319 const rtems_rbtree_control *the_rbtree, 306 320 const rtems_rbtree_node *the_node 307 321 ) 308 322 { 309 return _RBTree_Find _unprotected( the_rbtree, the_node );310 } 311 312 /** 313 * @copydoc _RBTree_Predecessor _unprotected()314 */ 315 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_predecessor _unprotected(323 return _RBTree_Find( the_rbtree, the_node ); 324 } 325 326 /** 327 * @copydoc _RBTree_Predecessor() 328 */ 329 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_predecessor( 316 330 const rtems_rbtree_node *node 317 331 ) 318 332 { 319 return _RBTree_Predecessor _unprotected( node );320 } 321 322 /** 323 * @copydoc _RBTree_Successor _unprotected()324 */ 325 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_successor _unprotected(333 return _RBTree_Predecessor( node ); 334 } 335 336 /** 337 * @copydoc _RBTree_Successor() 338 */ 339 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_successor( 326 340 const rtems_rbtree_node *node 327 341 ) 328 342 { 329 return _RBTree_Successor _unprotected( node );330 } 331 332 /** 333 * @copydoc _RBTree_Extract _unprotected()334 */ 335 RTEMS_INLINE_ROUTINE void rtems_rbtree_extract _unprotected(343 return _RBTree_Successor( node ); 344 } 345 346 /** 347 * @copydoc _RBTree_Extract() 348 */ 349 RTEMS_INLINE_ROUTINE void rtems_rbtree_extract( 336 350 rtems_rbtree_control *the_rbtree, 337 351 rtems_rbtree_node *the_node 338 352 ) 339 353 { 340 _RBTree_Extract _unprotected( the_rbtree, the_node );354 _RBTree_Extract( the_rbtree, the_node ); 341 355 } 342 356 … … 348 362 */ 349 363 350 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_get_min _unprotected(364 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_get_min( 351 365 rtems_rbtree_control *the_rbtree 352 366 ) 353 367 { 354 return _RBTree_Get _unprotected( the_rbtree, RBT_LEFT );368 return _RBTree_Get( the_rbtree, RBT_LEFT ); 355 369 } 356 370 … … 362 376 */ 363 377 364 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_get_max _unprotected(378 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_get_max( 365 379 rtems_rbtree_control *the_rbtree 366 380 ) 367 381 { 368 return _RBTree_Get _unprotected( the_rbtree, RBT_RIGHT );382 return _RBTree_Get( the_rbtree, RBT_RIGHT ); 369 383 } 370 384 … … 398 412 399 413 /** 400 * @copydoc _RBTree_Find_header _unprotected()401 */ 402 RTEMS_INLINE_ROUTINE rtems_rbtree_control *rtems_rbtree_find_header _unprotected(414 * @copydoc _RBTree_Find_header() 415 */ 416 RTEMS_INLINE_ROUTINE rtems_rbtree_control *rtems_rbtree_find_header( 403 417 rtems_rbtree_node *the_node 404 418 ) 405 419 { 406 return _RBTree_Find_header _unprotected( the_node );407 } 408 409 /** 410 * @copydoc _RBTree_Insert _unprotected()411 */ 412 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_insert _unprotected(420 return _RBTree_Find_header( the_node ); 421 } 422 423 /** 424 * @copydoc _RBTree_Insert() 425 */ 426 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_insert( 413 427 rtems_rbtree_control *the_rbtree, 414 428 rtems_rbtree_node *the_node 415 429 ) 416 430 { 417 return _RBTree_Insert _unprotected( the_rbtree, the_node );431 return _RBTree_Insert( the_rbtree, the_node ); 418 432 } 419 433 … … 428 442 } 429 443 444 /** @} */ 445 430 446 #ifdef __cplusplus 431 447 } -
cpukit/sapi/src/rbheap.c
r833dd90 r4ea97d24 81 81 ) 82 82 { 83 _RBTree_Insert _unprotected(tree, &chunk->tree_node);83 _RBTree_Insert(tree, &chunk->tree_node); 84 84 } 85 85 … … 199 199 200 200 return rtems_rbheap_chunk_of_node( 201 _RBTree_Find _unprotected(chunk_tree, &chunk.tree_node)201 _RBTree_Find(chunk_tree, &chunk.tree_node) 202 202 ); 203 203 } … … 209 209 { 210 210 return rtems_rbheap_chunk_of_node( 211 _RBTree_Next _unprotected(&chunk->tree_node, dir)211 _RBTree_Next(&chunk->tree_node, dir) 212 212 ); 213 213 } … … 231 231 rtems_chain_extract_unprotected(&b->chain_node); 232 232 add_to_chain(free_chain, b); 233 _RBTree_Extract _unprotected(chunk_tree, &b->tree_node);233 _RBTree_Extract(chunk_tree, &b->tree_node); 234 234 } 235 235 }
Note: See TracChangeset
for help on using the changeset viewer.