Changeset 7ff6115 in rtems
- Timestamp:
- 11/20/08 20:01:13 (15 years ago)
- Branches:
- 4.10, 4.11, 5, master
- Children:
- db03bcc1
- Parents:
- bd59b348
- Location:
- cpukit
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/ChangeLog
rbd59b348 r7ff6115 1 2008-11-20 Joel Sherrill <joel.sherrill@oarcorp.com> 2 3 * score/include/rtems/score/heap.h, 4 score/include/rtems/score/protectedheap.h, 5 score/include/rtems/score/wkspace.h, score/src/heap.c, 6 score/src/heapallocate.c, score/src/heapallocatealigned.c, 7 score/src/heapextend.c, score/src/heapresizeblock.c, 8 score/src/heapsizeofuserarea.c, score/src/pheapgetblocksize.c, 9 score/src/wkspace.c: Revert use of ssize_t. This type is not 10 guaranteed to be able to represent a positive number greater than the 11 size of a single allocatable object. We needed a type that is able to 12 represent the size of a pool of multiple allocatable objects or 13 potentially nearly all memory. 14 1 15 2008-11-20 Joel Sherrill <joel.sherrill@oarcorp.com> 2 16 -
cpukit/score/include/rtems/score/heap.h
rbd59b348 r7ff6115 31 31 #ifndef _RTEMS_SCORE_HEAP_H 32 32 #define _RTEMS_SCORE_HEAP_H 33 34 #include <sys/types.h>35 33 36 34 /** … … 265 263 Heap_Control *the_heap, 266 264 void *starting_address, 267 s size_tsize,265 size_t size, 268 266 uint32_t page_size 269 267 ); … … 284 282 Heap_Control *the_heap, 285 283 void *starting_address, 286 s size_tsize,284 size_t size, 287 285 uint32_t *amount_extended 288 286 ); … … 299 297 void *_Heap_Allocate( 300 298 Heap_Control *the_heap, 301 s size_tsize299 size_t size 302 300 ); 303 301 … … 318 316 void *_Heap_Allocate_aligned( 319 317 Heap_Control *the_heap, 320 s size_tsize,318 size_t size, 321 319 uint32_t alignment 322 320 ); … … 339 337 Heap_Control *the_heap, 340 338 void *starting_address, 341 s size_t*size339 size_t *size 342 340 ); 343 341 … … 367 365 Heap_Control *the_heap, 368 366 void *starting_address, 369 s size_tsize,367 size_t size, 370 368 uint32_t *old_mem_size, 371 369 uint32_t *avail_mem_size … … 452 450 * @return This method returns block size on success, 0 if overflow occured. 453 451 */ 454 extern s size_t _Heap_Calc_block_size(455 s size_tsize,452 extern size_t _Heap_Calc_block_size( 453 size_t size, 456 454 uint32_t page_size, 457 455 uint32_t min_size -
cpukit/score/include/rtems/score/protectedheap.h
rbd59b348 r7ff6115 55 55 Heap_Control *the_heap, 56 56 void *starting_address, 57 s size_tsize,57 size_t size, 58 58 uint32_t page_size 59 59 ) … … 129 129 Heap_Control *the_heap, 130 130 void *starting_address, 131 s size_t*size131 size_t *size 132 132 ); 133 133 -
cpukit/score/include/rtems/score/wkspace.h
rbd59b348 r7ff6115 53 53 void _Workspace_Handler_initialization( 54 54 void *starting_address, 55 s size_tsize55 size_t size 56 56 ); 57 57 … … 67 67 */ 68 68 void *_Workspace_Allocate( 69 s size_t size69 size_t size 70 70 ); 71 71 … … 95 95 */ 96 96 void *_Workspace_Allocate_or_fatal_error( 97 s size_t size97 size_t size 98 98 ); 99 99 -
cpukit/score/src/heap.c
rbd59b348 r7ff6115 112 112 * 113 113 */ 114 114 115 uint32_t _Heap_Initialize( 115 116 Heap_Control *the_heap, 116 117 void *starting_address, 117 s size_tsize,118 size_t size, 118 119 uint32_t page_size 119 120 ) … … 207 208 * Return block size on success, 0 if overflow occured 208 209 */ 209 s size_t _Heap_Calc_block_size(210 s size_t size,211 uint32_t 212 uint32_t 210 size_t _Heap_Calc_block_size( 211 size_t size, 212 uint32_t page_size, 213 uint32_t min_size) 213 214 { 214 215 uint32_t block_size = size + HEAP_BLOCK_USED_OVERHEAD; -
cpukit/score/src/heapallocate.c
rbd59b348 r7ff6115 37 37 void *_Heap_Allocate( 38 38 Heap_Control *the_heap, 39 s size_tsize39 size_t size 40 40 ) 41 41 { -
cpukit/score/src/heapallocatealigned.c
rbd59b348 r7ff6115 132 132 void *_Heap_Allocate_aligned( 133 133 Heap_Control *the_heap, 134 s size_tsize,134 size_t size, 135 135 uint32_t alignment 136 136 ) -
cpukit/score/src/heapextend.c
rbd59b348 r7ff6115 39 39 Heap_Control *the_heap, 40 40 void *starting_address, 41 s size_tsize,41 size_t size, 42 42 uint32_t *amount_extended 43 43 ) -
cpukit/score/src/heapresizeblock.c
rbd59b348 r7ff6115 48 48 Heap_Control *the_heap, 49 49 void *starting_address, 50 s size_tsize,50 size_t size, 51 51 uint32_t *old_mem_size, 52 52 uint32_t *avail_mem_size -
cpukit/score/src/heapsizeofuserarea.c
rbd59b348 r7ff6115 43 43 Heap_Control *the_heap, 44 44 void *starting_address, 45 s size_t*size45 size_t *size 46 46 ) 47 47 { -
cpukit/score/src/pheapgetblocksize.c
rbd59b348 r7ff6115 20 20 Heap_Control *the_heap, 21 21 void *starting_address, 22 s size_t*size22 size_t *size 23 23 ) 24 24 { -
cpukit/score/src/wkspace.c
rbd59b348 r7ff6115 28 28 void _Workspace_Handler_initialization( 29 29 void *starting_address, 30 s size_tsize30 size_t size 31 31 ) 32 32 { … … 62 62 */ 63 63 void *_Workspace_Allocate( 64 s size_t size64 size_t size 65 65 ) 66 66 { … … 82 82 */ 83 83 void *_Workspace_Allocate_or_fatal_error( 84 s size_t size84 size_t size 85 85 ) 86 86 {
Note: See TracChangeset
for help on using the changeset viewer.