Changeset 2e9b59b for libcfa/src/concurrency/kernel/startup.cfa
- Timestamp:
- Apr 19, 2022, 3:00:04 PM (3 years ago)
- Branches:
- ADT, ast-experimental, master, pthread-emulation, qualifiedEnum
- Children:
- 5b84a321
- Parents:
- ba897d21 (diff), bb7c77d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/concurrency/kernel/startup.cfa
rba897d21 r2e9b59b 32 32 33 33 // CFA Includes 34 #include "kernel_private.hfa" 34 #include "kernel/private.hfa" 35 #include "iofwd.hfa" 35 36 #include "startup.hfa" // STARTUP_PRIORITY_XXX 36 37 #include "limits.hfa" … … 97 98 extern void __kernel_alarm_startup(void); 98 99 extern void __kernel_alarm_shutdown(void); 100 extern void __cfa_io_start( processor * ); 101 extern void __cfa_io_stop ( processor * ); 99 102 100 103 //----------------------------------------------------------------------------- … … 111 114 KERNEL_STORAGE(__stack_t, mainThreadCtx); 112 115 KERNEL_STORAGE(__scheduler_RWLock_t, __scheduler_lock); 116 KERNEL_STORAGE(eventfd_t, mainIdleEventFd); 117 KERNEL_STORAGE(io_future_t, mainIdleFuture); 113 118 #if !defined(__CFA_NO_STATISTICS__) 114 119 KERNEL_STORAGE(__stats_t, mainProcStats); … … 224 229 (*mainProcessor){}; 225 230 231 mainProcessor->idle_wctx.rdbuf = &storage_mainIdleEventFd; 232 mainProcessor->idle_wctx.ftr = (io_future_t*)&storage_mainIdleFuture; 233 /* paranoid */ verify( sizeof(storage_mainIdleEventFd) == sizeof(eventfd_t) ); 234 235 __cfa_io_start( mainProcessor ); 226 236 register_tls( mainProcessor ); 227 237 … … 305 315 306 316 unregister_tls( mainProcessor ); 317 __cfa_io_stop( mainProcessor ); 307 318 308 319 // Destroy the main processor and its context in reverse order of construction … … 353 364 proc->local_data = &__cfaabi_tls; 354 365 366 __cfa_io_start( proc ); 355 367 register_tls( proc ); 368 369 // used for idle sleep when io_uring is present 370 io_future_t future; 371 eventfd_t idle_buf; 372 proc->idle_wctx.ftr = &future; 373 proc->idle_wctx.rdbuf = &idle_buf; 374 356 375 357 376 // SKULLDUGGERY: We want to create a context for the processor coroutine … … 395 414 396 415 unregister_tls( proc ); 416 __cfa_io_stop( proc ); 397 417 398 418 return 0p; … … 515 535 this.rdq.its = 0; 516 536 this.rdq.itr = 0; 517 this.rdq.id = MAX;537 this.rdq.id = 0; 518 538 this.rdq.target = MAX; 519 539 this.rdq.last = MAX; … … 532 552 this.local_data = 0p; 533 553 534 this.idle_fd = eventfd(0, 0);535 if (idle_ fd < 0) {554 idle_wctx.evfd = eventfd(0, 0); 555 if (idle_wctx.evfd < 0) { 536 556 abort("KERNEL ERROR: PROCESSOR EVENTFD - %s\n", strerror(errno)); 537 557 } 538 558 539 this.idle_wctx.fd = 0; 559 idle_wctx.sem = 0; 560 idle_wctx.wake__time = 0; 540 561 541 562 // I'm assuming these two are reserved for standard input and output 542 563 // so I'm using them as sentinels with idle_wctx. 543 /* paranoid */ verify( this.idle_fd != 0 );544 /* paranoid */ verify( this.idle_fd != 1 );564 /* paranoid */ verify( idle_wctx.evfd != 0 ); 565 /* paranoid */ verify( idle_wctx.evfd != 1 ); 545 566 546 567 #if !defined(__CFA_NO_STATISTICS__) … … 554 575 // Not a ctor, it just preps the destruction but should not destroy members 555 576 static void deinit(processor & this) { 556 close(this.idle_ fd);577 close(this.idle_wctx.evfd); 557 578 } 558 579 … … 605 626 this.name = name; 606 627 this.preemption_rate = preemption_rate; 607 ready_queue{}; 628 this.sched.readyQ.data = 0p; 629 this.sched.readyQ.tscs = 0p; 630 this.sched.readyQ.count = 0; 631 this.sched.io.tscs = 0p; 632 this.sched.io.data = 0p; 633 this.sched.caches = 0p; 608 634 609 635 #if !defined(__CFA_NO_STATISTICS__) … … 644 670 // Unlock the RWlock 645 671 ready_mutate_unlock( last_size ); 672 673 ready_queue_close( &this ); 674 /* paranoid */ verify( this.sched.readyQ.data == 0p ); 675 /* paranoid */ verify( this.sched.readyQ.tscs == 0p ); 676 /* paranoid */ verify( this.sched.readyQ.count == 0 ); 677 /* paranoid */ verify( this.sched.io.tscs == 0p ); 678 /* paranoid */ verify( this.sched.caches == 0p ); 679 646 680 enable_interrupts( false ); // Don't poll, could be in main cluster 681 647 682 648 683 #if !defined(__CFA_NO_STATISTICS__)
Note:
See TracChangeset
for help on using the changeset viewer.