Changeset 4f971343 in rtems for cpukit/libblock
- Timestamp:
- 09/01/08 07:44:48 (16 years ago)
- Branches:
- 4.10, 4.11, 4.9, 5, master
- Children:
- 36a150e9
- Parents:
- 48c5660
- Location:
- cpukit/libblock
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/libblock/include/rtems/bdbuf.h
r48c5660 r4f971343 19 19 #define _RTEMS_BDBUF_H 20 20 21 #include <rtems.h> 22 #include <rtems/libio.h> 23 #include <rtems/chain.h> 24 25 #include "rtems/blkdev.h" 26 #include "rtems/diskdevs.h" 27 21 28 #ifdef __cplusplus 22 29 extern "C" { 23 30 #endif 24 31 25 #include <rtems.h>26 #include <rtems/libio.h>27 #include <rtems/chain.h>28 29 #include "rtems/blkdev.h"30 #include "rtems/diskdevs.h"31 32 32 33 /** … … 95 96 * all BDs. */ 96 97 rtems_id sync_lock; /*< Sync calls lock writes. */ 97 bool eansync_active; /*< True if a sync is active. */98 bool sync_active; /*< True if a sync is active. */ 98 99 rtems_id sync_requester; /*< The sync requester. */ 99 100 dev_t sync_device; /*< The device to sync */ -
cpukit/libblock/src/bdbuf.c
r48c5660 r4f971343 118 118 int npools; /*< Number of entries in pool table */ 119 119 rtems_id swapout; /*< Swapout task ID */ 120 bool eanswapout_enabled;120 bool swapout_enabled; 121 121 } rtems_bdbuf_context; 122 122 … … 192 192 */ 193 193 #if RTEMS_BDBUF_TRACE 194 bool eanrtems_bdbuf_tracer;194 bool rtems_bdbuf_tracer; 195 195 static void 196 196 rtems_bdbuf_printf (const char *format, ...) … … 269 269 rtems_bdbuf_buffer** buf_prev = buf_stack; 270 270 271 bool ean modified = FALSE;271 bool modified = false; 272 272 273 273 if (p == NULL) … … 316 316 q->avl.left = q->avl.right = NULL; 317 317 q->avl.bal = 0; 318 modified = TRUE;318 modified = true; 319 319 buf_prev--; 320 320 … … 327 327 case 1: 328 328 p->avl.bal = 0; 329 modified = FALSE;329 modified = false; 330 330 break; 331 331 … … 355 355 } 356 356 p->avl.bal = 0; 357 modified = FALSE;357 modified = false; 358 358 break; 359 359 … … 368 368 case -1: 369 369 p->avl.bal = 0; 370 modified = FALSE;370 modified = false; 371 371 break; 372 372 … … 396 396 } 397 397 p->avl.bal = 0; 398 modified = FALSE;398 modified = false; 399 399 break; 400 400 … … 452 452 rtems_bdbuf_buffer** buf_prev = buf_stack; 453 453 454 bool ean modified = FALSE;454 bool modified = false; 455 455 456 456 memset (buf_stack, 0, sizeof(buf_stack)); … … 556 556 } 557 557 558 modified = TRUE;558 modified = true; 559 559 560 560 while (modified) … … 579 579 case 0: 580 580 p->avl.bal = 1; 581 modified = FALSE;581 modified = false; 582 582 break; 583 583 … … 593 593 { 594 594 p1->avl.bal = -1; 595 modified = FALSE;595 modified = false; 596 596 } 597 597 else … … 634 634 case 0: 635 635 p->avl.bal = -1; 636 modified = FALSE;636 modified = false; 637 637 break; 638 638 … … 647 647 { 648 648 p1->avl.bal = 1; 649 modified = FALSE;649 modified = false; 650 650 } 651 651 else … … 935 935 pool->nblks = config->num; 936 936 pool->flags = 0; 937 pool->sync_active = FALSE;937 pool->sync_active = false; 938 938 pool->sync_device = -1; 939 939 pool->sync_requester = 0; … … 1136 1136 */ 1137 1137 1138 rtems_bdbuf_ctx.swapout_enabled = TRUE;1138 rtems_bdbuf_ctx.swapout_enabled = true; 1139 1139 1140 1140 sc = rtems_task_create (rtems_build_name('B', 'S', 'W', 'P'), … … 1222 1222 rtems_bdbuf_pool* pool, 1223 1223 rtems_blkdev_bnum block, 1224 bool eanread_ahead)1224 bool read_ahead) 1225 1225 { 1226 1226 dev_t device = pdd->dev; 1227 1227 rtems_bdbuf_buffer* bd; 1228 bool eanavailable;1228 bool available; 1229 1229 1230 1230 /* … … 1364 1364 * the access or transfer state then wait until it is not. 1365 1365 */ 1366 available = FALSE;1366 available = false; 1367 1367 while (!available) 1368 1368 { … … 1372 1372 case RTEMS_BDBUF_STATE_MODIFIED: 1373 1373 case RTEMS_BDBUF_STATE_READ_AHEAD: 1374 available = TRUE;1374 available = true; 1375 1375 break; 1376 1376 … … 1458 1458 #endif 1459 1459 1460 bd = rtems_bdbuf_get_buffer (dd->phys_dev, pool, block, FALSE);1460 bd = rtems_bdbuf_get_buffer (dd->phys_dev, pool, block, false); 1461 1461 1462 1462 if (bd->state == RTEMS_BDBUF_STATE_MODIFIED) … … 1589 1589 bd = rtems_bdbuf_get_buffer (dd->phys_dev, pool, 1590 1590 block + req->bufnum, 1591 req->bufnum == 0 ? FALSE : TRUE);1591 req->bufnum == 0 ? false : true); 1592 1592 1593 1593 /* … … 1839 1839 { 1840 1840 rtems_bdbuf_pool* pool; 1841 bool eanavailable;1841 bool available; 1842 1842 1843 1843 #if RTEMS_BDBUF_TRACE … … 1858 1858 rtems_bdbuf_wake_swapper (); 1859 1859 1860 available = FALSE;1860 available = false; 1861 1861 while (!available) 1862 1862 { … … 1868 1868 case RTEMS_BDBUF_STATE_ACCESS: 1869 1869 case RTEMS_BDBUF_STATE_ACCESS_MODIFIED: 1870 available = TRUE;1870 available = true; 1871 1871 break; 1872 1872 … … 1937 1937 * for the device are held on the modified for sync queues. 1938 1938 */ 1939 pool->sync_active = TRUE;1939 pool->sync_active = true; 1940 1940 pool->sync_requester = rtems_task_self (); 1941 1941 pool->sync_device = dev; … … 1986 1986 * @param chain The modified chain to process. 1987 1987 * @param transfer The chain to append buffers to be written too. 1988 * @param sync_active If TRUEthis is a sync operation so expire all timers.1989 * @param update_timers If TRUEupdate the timers.1990 * @param timer_delta It update_timers is TRUEupdate the timers by this1988 * @param sync_active If true this is a sync operation so expire all timers. 1989 * @param update_timers If true update the timers. 1990 * @param timer_delta It update_timers is true update the timers by this 1991 1991 * amount. 1992 1992 */ … … 1996 1996 rtems_chain_control* chain, 1997 1997 rtems_chain_control* transfer, 1998 bool eansync_active,1999 bool eanupdate_timers,1998 bool sync_active, 1999 bool update_timers, 2000 2000 uint32_t timer_delta) 2001 2001 { … … 2100 2100 * 2101 2101 * @param pid The pool id to process modified buffers on. 2102 * @param timer_delta It update_timers is TRUEupdate the timers by this2102 * @param timer_delta It update_timers is true update the timers by this 2103 2103 * amount. 2104 * @param update_timers If TRUEupdate the timers.2104 * @param update_timers If true update the timers. 2105 2105 * @param write_req The write request structure. There is only one. 2106 2106 * 2107 * @retval TRUEBuffers where written to disk so scan again.2108 * @retval FALSENo buffers where written to disk.2109 */ 2110 static bool ean2107 * @retval true Buffers where written to disk so scan again. 2108 * @retval false No buffers where written to disk. 2109 */ 2110 static bool 2111 2111 rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid, 2112 2112 unsigned long timer_delta, 2113 bool eanupdate_timers,2113 bool update_timers, 2114 2114 rtems_blkdev_request* write_req) 2115 2115 { … … 2118 2118 dev_t dev = -1; 2119 2119 rtems_disk_device* dd; 2120 bool ean transfered_buffers = TRUE;2120 bool transfered_buffers = true; 2121 2121 2122 2122 rtems_chain_initialize_empty (&transfer); … … 2138 2138 rtems_bdbuf_swapout_modified_processing (pid, &dev, 2139 2139 &pool->sync, &transfer, 2140 TRUE, FALSE,2140 true, false, 2141 2141 timer_delta); 2142 2142 … … 2161 2161 */ 2162 2162 if (rtems_chain_is_empty (&transfer)) 2163 transfered_buffers = FALSE;2163 transfered_buffers = false; 2164 2164 else 2165 2165 { … … 2170 2170 dd = rtems_disk_obtain (dev); 2171 2171 if (dd == NULL) 2172 transfered_buffers = FALSE;2172 transfered_buffers = false; 2173 2173 else 2174 2174 { … … 2198 2198 (rtems_bdbuf_buffer*) rtems_chain_get (&transfer); 2199 2199 2200 bool ean write = FALSE;2200 bool write = true; 2201 2201 2202 2202 /* … … 2212 2212 { 2213 2213 rtems_chain_prepend (&transfer, &bd->link); 2214 write = TRUE;2214 write = true; 2215 2215 } 2216 2216 else … … 2231 2231 if (rtems_chain_is_empty (&transfer) || 2232 2232 (write_req->bufnum >= rtems_bdbuf_configuration.max_write_blocks)) 2233 write = TRUE;2233 write = true; 2234 2234 2235 2235 if (write) … … 2311 2311 { 2312 2312 rtems_id sync_requester = pool->sync_requester; 2313 pool->sync_active = FALSE;2313 pool->sync_active = false; 2314 2314 pool->sync_requester = 0; 2315 2315 if (sync_requester) … … 2368 2368 * Only update the timers once in the processing cycle. 2369 2369 */ 2370 bool ean update_timers = TRUE;2370 bool update_timers = true; 2371 2371 2372 2372 /* … … 2375 2375 * buffers modified waiting to be written. 2376 2376 */ 2377 bool eantransfered_buffers;2377 bool transfered_buffers; 2378 2378 2379 2379 do … … 2381 2381 rtems_bdpool_id pid; 2382 2382 2383 transfered_buffers = FALSE;2383 transfered_buffers = false; 2384 2384 2385 2385 /* … … 2395 2395 write_req)) 2396 2396 { 2397 transfered_buffers = TRUE;2397 transfered_buffers = true; 2398 2398 } 2399 2399 } … … 2402 2402 * Only update the timers once. 2403 2403 */ 2404 update_timers = FALSE;2404 update_timers = false; 2405 2405 } 2406 2406 while (transfered_buffers); … … 2441 2441 rtems_bdpool_id i; 2442 2442 rtems_bdpool_id curid = -1; 2443 bool found = FALSE;2443 bool found = false; 2444 2444 uint32_t cursize = UINT_MAX; 2445 2445 int j; … … 2457 2457 curid = i; 2458 2458 cursize = p->blksize; 2459 found = TRUE;2459 found = true; 2460 2460 } 2461 2461 } -
cpukit/libblock/src/diskdevs.c
r48c5660 r4f971343 39 39 40 40 /* Flag meaning that disk I/O, buffering etc. already has been initialized. */ 41 static bool ean disk_io_initialized = FALSE;41 static bool disk_io_initialized = false; 42 42 43 43 /* diskdevs data structures protection flag. … … 258 258 if (rc != RTEMS_SUCCESSFUL) 259 259 return rc; 260 diskdevs_protected = TRUE;260 diskdevs_protected = true; 261 261 262 262 rc = rtems_bdbuf_find_pool(block_size, &pool); 263 263 if (rc != RTEMS_SUCCESSFUL) 264 264 { 265 diskdevs_protected = FALSE;265 diskdevs_protected = false; 266 266 rtems_semaphore_release(diskdevs_mutex); 267 267 return rc; … … 271 271 if (rc != RTEMS_SUCCESSFUL) 272 272 { 273 diskdevs_protected = FALSE;273 diskdevs_protected = false; 274 274 rtems_semaphore_release(diskdevs_mutex); 275 275 return rc; … … 292 292 dd->capabilities = 0; 293 293 294 diskdevs_protected = FALSE;294 diskdevs_protected = false; 295 295 rtems_semaphore_release(diskdevs_mutex); 296 296 … … 336 336 if (rc != RTEMS_SUCCESSFUL) 337 337 return rc; 338 diskdevs_protected = TRUE;338 diskdevs_protected = true; 339 339 340 340 pdd = get_disk_entry(phys); 341 341 if (pdd == NULL) 342 342 { 343 diskdevs_protected = FALSE;343 diskdevs_protected = false; 344 344 rtems_semaphore_release(diskdevs_mutex); 345 345 return RTEMS_INVALID_NUMBER; … … 349 349 if (rc != RTEMS_SUCCESSFUL) 350 350 { 351 diskdevs_protected = FALSE;351 diskdevs_protected = false; 352 352 rtems_semaphore_release(diskdevs_mutex); 353 353 return rc; … … 364 364 rc = rtems_io_register_name(name, major, minor); 365 365 366 diskdevs_protected = FALSE;366 diskdevs_protected = false; 367 367 rc = rtems_semaphore_release(diskdevs_mutex); 368 368 … … 395 395 if (rc != RTEMS_SUCCESSFUL) 396 396 return rc; 397 diskdevs_protected = TRUE;397 diskdevs_protected = true; 398 398 399 399 /* Check if this device is in use -- calculate usage counter */ … … 415 415 if (used != 0) 416 416 { 417 diskdevs_protected = FALSE;417 diskdevs_protected = false; 418 418 rtems_semaphore_release(diskdevs_mutex); 419 419 return RTEMS_RESOURCE_IN_USE; … … 440 440 } 441 441 442 diskdevs_protected = FALSE;442 diskdevs_protected = false; 443 443 rc = rtems_semaphore_release(diskdevs_mutex); 444 444 return rc; … … 470 470 if (rc != RTEMS_SUCCESSFUL) 471 471 return NULL; 472 diskdevs_protected = TRUE;472 diskdevs_protected = true; 473 473 dd = get_disk_entry(dev); 474 474 dd->uses++; 475 diskdevs_protected = FALSE;475 diskdevs_protected = false; 476 476 rtems_semaphore_release(diskdevs_mutex); 477 477 return dd; … … 532 532 533 533 dtab = disktab + major; 534 while ( TRUE)534 while (true) 535 535 { 536 536 if ((dtab == NULL) || (minor > dtab->size)) … … 574 574 return RTEMS_NO_MEMORY; 575 575 576 diskdevs_protected = FALSE;576 diskdevs_protected = false; 577 577 rc = rtems_semaphore_create( 578 578 rtems_build_name('D', 'D', 'E', 'V'), 1, -
cpukit/libblock/src/ide_part_table.c
r48c5660 r4f971343 90 90 * 91 91 * RETURNS: 92 * TRUE if sector has msdos signature, FALSEotherwise92 * true if sector has msdos signature, false otherwise 93 93 */ 94 94 static bool … … 110 110 * 111 111 * RETURNS: 112 * TRUE if partition type is extended, FALSEotherwise112 * true if partition type is extended, false otherwise 113 113 */ 114 114 static bool … … 126 126 * 127 127 * RETURNS: 128 * TRUE if partition type is extended, FALSEotherwise128 * true if partition type is extended, false otherwise 129 129 */ 130 130 static bool -
cpukit/libblock/src/ramdisk.c
r48c5660 r4f971343 249 249 if (c->location == NULL) 250 250 { 251 r->malloced = TRUE;251 r->malloced = true; 252 252 r->area = malloc(r->block_size * r->block_num); 253 253 if (r->area == NULL) /* No enough memory for this disk */ 254 254 { 255 r->initialized = FALSE;255 r->initialized = false; 256 256 continue; 257 257 } 258 258 else 259 259 { 260 r->initialized = TRUE;260 r->initialized = true; 261 261 } 262 262 } 263 263 else 264 264 { 265 r->malloced = FALSE;266 r->initialized = TRUE;265 r->malloced = false; 266 r->initialized = true; 267 267 r->area = c->location; 268 268 } … … 275 275 free(r->area); 276 276 } 277 r->initialized = FALSE;277 r->initialized = false; 278 278 } 279 279 } -
cpukit/libblock/src/show_bdbuf.c
r48c5660 r4f971343 49 49 50 50 typedef struct { 51 bool eanbdbuf_modified;52 bool eanbdbuf_in_progress;53 bool eanbdbuf_actual;54 bool eanbdbuf_used;55 bool eanbdbuf_all;51 bool bdbuf_modified; 52 bool bdbuf_in_progress; 53 bool bdbuf_actual; 54 bool bdbuf_used; 55 bool bdbuf_all; 56 56 rtems_bdpool_id pool_id; 57 57 } show_bdbuf_filter_t; 58 58 59 59 typedef struct { 60 bool eanshow_all;61 bool eanshow_node_chain;62 bool eanshow_dev;63 bool eanshow_blocknum;64 bool eanshow_error;65 bool eanshow_state;66 bool eanshow_use_count;67 bool eanshow_pool_id;68 bool eanshow_sema;60 bool show_all; 61 bool show_node_chain; 62 bool show_dev; 63 bool show_blocknum; 64 bool show_error; 65 bool show_state; 66 bool show_use_count; 67 bool show_pool_id; 68 bool show_sema; 69 69 } show_bdbuf_selector_t; 70 70 … … 82 82 rtems_status_code status; 83 83 int error; 84 bool eanmodified;85 bool eanin_progress;86 bool eanactual;84 bool modified; 85 bool in_progress; 86 bool actual; 87 87 int use_count; 88 88 const CORE_mutex_Control *sema; … … 123 123 rtems_status_code rc = RTEMS_SUCCESSFUL; 124 124 preemption_key_t preempt_key; 125 bool ean preempt_disabled = FALSE;125 bool preempt_disabled = false; 126 126 /* 127 127 * disable preemption … … 227 227 */ 228 228 memset(filter,0,sizeof(*filter)); 229 filter->bdbuf_all = TRUE;229 filter->bdbuf_all = true; 230 230 memset(selector,0,sizeof(*selector)); 231 selector->show_all = TRUE;231 selector->show_all = true; 232 232 233 233 /* … … 246 246 */ 247 247 case 'm': /* only show bdbufs modified */ 248 filter->bdbuf_modified = TRUE;249 filter->bdbuf_all = FALSE;248 filter->bdbuf_modified = true ; 249 filter->bdbuf_all = false; 250 250 break; 251 251 case 'i': /* only show bdbufs in progress*/ 252 filter->bdbuf_in_progress = TRUE;253 filter->bdbuf_all = FALSE;252 filter->bdbuf_in_progress = true ; 253 filter->bdbuf_all = false; 254 254 break; 255 255 case 'v': /* only show bdbufs, which have valid data*/ 256 filter->bdbuf_actual = TRUE;257 filter->bdbuf_all = FALSE;256 filter->bdbuf_actual = true ; 257 filter->bdbuf_all = false; 258 258 break; 259 259 case 'u': /* only show bdbufs, which are in use */ 260 filter->bdbuf_used = TRUE;261 filter->bdbuf_all = FALSE;260 filter->bdbuf_used = true ; 261 filter->bdbuf_all = false; 262 262 break; 263 263 case 'p': /* only show bdbufs, which belong to pool <n> */ … … 266 266 arg_error = i; 267 267 } 268 filter->bdbuf_all = FALSE;268 filter->bdbuf_all = false; 269 269 break; 270 270 /* … … 272 272 */ 273 273 case 'n': /* show bdbuf node_chain */ 274 selector->show_node_chain = TRUE;275 selector->show_all = FALSE;274 selector->show_node_chain = true ; 275 selector->show_all = false; 276 276 break; 277 277 case 'd': /* show device */ 278 selector->show_dev = TRUE;279 selector->show_all = FALSE;278 selector->show_dev = true ; 279 selector->show_all = false; 280 280 break; 281 281 case 'b': /* show blocknum */ 282 selector->show_blocknum = TRUE;283 selector->show_all = FALSE;282 selector->show_blocknum = true ; 283 selector->show_all = false; 284 284 break; 285 285 case 'e': /* show bdbuf error status */ 286 selector->show_error = TRUE;287 selector->show_all = FALSE;286 selector->show_error = true ; 287 selector->show_all = false; 288 288 break; 289 289 case 's': /* show bdbuf state */ 290 selector->show_state = TRUE;291 selector->show_all = FALSE;290 selector->show_state = true ; 291 selector->show_all = false; 292 292 break; 293 293 case 'c': /* show bdbuf use count */ 294 selector->show_use_count = TRUE;295 selector->show_all = FALSE;294 selector->show_use_count = true ; 295 selector->show_all = false; 296 296 break; 297 297 case 'l': /* show bdbuf pool id */ 298 selector->show_pool_id = TRUE;299 selector->show_all = FALSE;298 selector->show_pool_id = true ; 299 selector->show_all = false; 300 300 break; 301 301 case 't': /* show bdbuf transfer sema */ 302 selector->show_sema = TRUE;302 selector->show_sema = true ; 303 303 break; 304 304 default: … … 497 497 const show_bdbuf_bdbuf_info_t *bdbuf_info, /* struct to store info of bdbuf */ 498 498 const show_bdbuf_filter_t *filter, 499 bool ean*is_match499 bool *is_match 500 500 ) 501 501 /*-------------------------------------------------------------------------*\ … … 506 506 507 507 rtems_status_code rc = RTEMS_SUCCESSFUL; 508 bool ean unmatch = FALSE;508 bool unmatch = false; 509 509 510 510 if (rc == RTEMS_SUCCESSFUL) { 511 511 if (filter->bdbuf_all) { 512 unmatch = FALSE;512 unmatch = false; 513 513 } 514 514 else { … … 595 595 const show_bdbuf_bdbuf_info_t *bdbuf_info, /* info of bdbuf */ 596 596 show_bdbuf_selector_t * selector, /* selector, what to show */ 597 bool ean print_header /* TRUE: print header, not info */597 bool print_header /* true: print header, not info */ 598 598 ) 599 599 /*-------------------------------------------------------------------------*\ … … 749 749 char **argv, 750 750 rtems_monitor_command_arg_t* command_arg, 751 bool eanverbose751 bool verbose 752 752 ) 753 753 /*-------------------------------------------------------------------------*\ … … 764 764 int pool_cnt,pool_idx; 765 765 int bdbuf_idx; 766 bool eanbdbuf_matches;766 bool bdbuf_matches; 767 767 int matched_cnt,un_matched_cnt; 768 768 … … 807 807 if (rc == RTEMS_SUCCESSFUL) { 808 808 rc = rtems_show_bdbuf_print(NULL,&selector, 809 TRUE);809 true); 810 810 } 811 811 /* … … 839 839 if (bdbuf_matches) { 840 840 rc = rtems_show_bdbuf_print(&bdbuf_info,&selector, 841 FALSE);841 false); 842 842 if ((rc == RTEMS_SUCCESSFUL) && 843 843 selector.show_sema) {
Note: See TracChangeset
for help on using the changeset viewer.