Changes in / [1155718:bd3d9e4]
- Location:
- src
- Files:
-
- 2 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Concurrency/Keywords.cc
r1155718 rbd3d9e4 196 196 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* ); 197 197 void validate( DeclarationWithType * ); 198 void addDtorStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);199 198 void addStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &); 200 199 … … 207 206 StructDecl* monitor_decl = nullptr; 208 207 StructDecl* guard_decl = nullptr; 209 StructDecl* dtor_guard_decl = nullptr;210 208 211 209 static std::unique_ptr< Type > generic_func; … … 231 229 232 230 void postvisit( FunctionDecl * decl ); 233 void previsit ( StructDecl * decl );234 231 235 232 void addStartStatement( FunctionDecl * decl, DeclarationWithType * param ); … … 239 236 acceptAll( translationUnit, impl ); 240 237 } 241 242 private :243 bool thread_ctor_seen = false;244 StructDecl * thread_decl = nullptr;245 238 }; 246 239 … … 410 403 if( mutexArgs.empty() ) return; 411 404 412 if( CodeGen::isConstructor(decl->name) ) throw SemanticError( "constructors cannot have mutex parameters", decl );413 414 bool isDtor = CodeGen::isDestructor( decl->name );415 416 if( isDtor && mutexArgs.size() != 1 ) throw SemanticError( "destructors can only have 1 mutex argument", decl );417 418 405 for(auto arg : mutexArgs) { 419 406 validate( arg ); … … 425 412 if( !monitor_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl ); 426 413 if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl ); 427 if( !dtor_guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl ); 428 429 if( isDtor ) { 430 addDtorStatments( decl, body, mutexArgs ); 431 } 432 else { 433 addStatments( decl, body, mutexArgs ); 434 } 414 415 addStatments( decl, body, mutexArgs ); 435 416 } 436 417 … … 444 425 assert( !guard_decl ); 445 426 guard_decl = decl; 446 }447 else if( decl->name == "monitor_dtor_guard_t" ) {448 assert( !dtor_guard_decl );449 dtor_guard_decl = decl;450 427 } 451 428 } … … 480 457 //Make sure that typed isn't mutex 481 458 if( base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg ); 482 }483 484 void MutexKeyword::addDtorStatments( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {485 Type * arg_type = args.front()->get_type()->clone();486 arg_type->set_mutex( false );487 488 ObjectDecl * monitors = new ObjectDecl(489 "__monitor",490 noStorage,491 LinkageSpec::Cforall,492 nullptr,493 new PointerType(494 noQualifiers,495 new StructInstType(496 noQualifiers,497 monitor_decl498 )499 ),500 new SingleInit( new UntypedExpr(501 new NameExpr( "get_monitor" ),502 { new CastExpr( new VariableExpr( args.front() ), arg_type ) }503 ))504 );505 506 assert(generic_func);507 508 //in reverse order :509 // monitor_guard_t __guard = { __monitors, #, func };510 body->push_front(511 new DeclStmt( noLabels, new ObjectDecl(512 "__guard",513 noStorage,514 LinkageSpec::Cforall,515 nullptr,516 new StructInstType(517 noQualifiers,518 dtor_guard_decl519 ),520 new ListInit(521 {522 new SingleInit( new AddressExpr( new VariableExpr( monitors ) ) ),523 new SingleInit( new CastExpr( new VariableExpr( func ), generic_func->clone() ) )524 },525 noDesignators,526 true527 )528 ))529 );530 531 //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };532 body->push_front( new DeclStmt( noLabels, monitors) );533 459 } 534 460 … … 597 523 // General entry routine 598 524 //============================================================================================= 599 void ThreadStarter::previsit( StructDecl * decl ) {600 if( decl->name == "thread_desc" && decl->body ) {601 assert( !thread_decl );602 thread_decl = decl;603 }604 }605 606 525 void ThreadStarter::postvisit(FunctionDecl * decl) { 607 526 if( ! CodeGen::isConstructor(decl->name) ) return; 608 609 Type * typeof_this = InitTweak::getTypeofThis(decl->type);610 StructInstType * ctored_type = dynamic_cast< StructInstType * >( typeof_this );611 if( ctored_type && ctored_type->baseStruct == thread_decl ) {612 thread_ctor_seen = true;613 }614 527 615 528 DeclarationWithType * param = decl->get_functionType()->get_parameters().front(); 616 529 auto type = dynamic_cast< StructInstType * >( InitTweak::getPointerBase( param->get_type() ) ); 617 530 if( type && type->get_baseStruct()->is_thread() ) { 618 if( !thread_decl || !thread_ctor_seen ) {619 throw SemanticError("thread keyword requires threads to be in scope, add #include <thread>");620 }621 622 531 addStartStatement( decl, param ); 623 532 } -
src/InitTweak/InitTweak.cc
r1155718 rbd3d9e4 270 270 } 271 271 272 Type * getT ypeofThis( FunctionType * ftype ) {273 assertf( ftype, "getT ypeofThis: nullptr ftype" );274 ObjectDecl * thisParam = get ParamThis( ftype );272 Type * getThisType( FunctionType * ftype ) { 273 assertf( ftype, "getThisType: nullptr ftype" ); 274 ObjectDecl * thisParam = getThisParam( ftype ); 275 275 ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( thisParam->type ); 276 276 return refType->base; 277 277 } 278 278 279 ObjectDecl * get ParamThis( FunctionType * ftype ) {280 assertf( ftype, "get ParamThis: nullptr ftype" );279 ObjectDecl * getThisParam( FunctionType * ftype ) { 280 assertf( ftype, "getThisParam: nullptr ftype" ); 281 281 auto & params = ftype->parameters; 282 assertf( ! params.empty(), "get ParamThis: ftype with 0 parameters: %s", toString( ftype ).c_str() );282 assertf( ! params.empty(), "getThisParam: ftype with 0 parameters: %s", toString( ftype ).c_str() ); 283 283 return strict_dynamic_cast< ObjectDecl * >( params.front() ); 284 284 } -
src/InitTweak/InitTweak.h
r1155718 rbd3d9e4 31 31 32 32 /// returns the base type of the first parameter to a constructor/destructor/assignment function 33 Type * getT ypeofThis( FunctionType * ftype );33 Type * getThisType( FunctionType * ftype ); 34 34 35 35 /// returns the first parameter of a constructor/destructor/assignment function 36 ObjectDecl * get ParamThis( FunctionType * ftype );36 ObjectDecl * getThisParam( FunctionType * ftype ); 37 37 38 38 /// transform Initializer into an argument list that can be passed to a call expression -
src/libcfa/concurrency/invoke.h
r1155718 rbd3d9e4 96 96 struct __condition_stack_t signal_stack; // stack of conditions to run next once we exit the monitor 97 97 unsigned int recursion; // monitor routines can be called recursively, we need to keep track of that 98 struct __waitfor_mask_t mask; // mask used to know if some thread is waiting for something while holding the monitor 99 struct __condition_node_t * dtor_node; // node used to signal the dtor in a waitfor dtor 98 struct __waitfor_mask_t mask; // mask used to know if some thread is waiting for something while holding the monitor 100 99 }; 101 100 -
src/libcfa/concurrency/monitor
r1155718 rbd3d9e4 29 29 static inline void ?{}(monitor_desc & this) { 30 30 (this.lock){}; 31 this.owner = NULL; 31 32 (this.entry_queue){}; 32 33 (this.signal_stack){}; 33 this.owner = NULL; 34 this.recursion = 0; 34 this.recursion = 0; 35 35 this.mask.accepted = NULL; 36 36 this.mask.clauses = NULL; 37 37 this.mask.size = 0; 38 this.dtor_node = NULL;39 38 } 40 41 // static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {42 // return ((intptr_t)lhs) < ((intptr_t)rhs);43 // }44 39 45 40 struct monitor_guard_t { … … 51 46 }; 52 47 48 static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) { 49 return ((intptr_t)lhs) < ((intptr_t)rhs); 50 } 51 53 52 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() ); 54 53 void ^?{}( monitor_guard_t & this ); 55 56 57 struct monitor_dtor_guard_t {58 monitor_desc * m;59 monitor_desc ** prev_mntrs;60 unsigned short prev_count;61 fptr_t prev_func;62 };63 64 void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, void (*func)() );65 void ^?{}( monitor_dtor_guard_t & this );66 54 67 55 //----------------------------------------------------------------------------- -
src/libcfa/concurrency/monitor.c
r1155718 rbd3d9e4 94 94 } 95 95 else if( this->owner == thrd) { 96 // We already have the monitor, just not ehow many times we took it96 // We already have the monitor, just not how many times we took it 97 97 verify( this->recursion > 0 ); 98 98 this->recursion += 1; … … 127 127 unlock( &this->lock ); 128 128 return; 129 }130 131 static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {132 // Lock the monitor spinlock, lock_yield to reduce contention133 lock_yield( &this->lock DEBUG_CTX2 );134 thread_desc * thrd = this_thread;135 136 LIB_DEBUG_PRINT_SAFE("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);137 138 139 if( !this->owner ) {140 LIB_DEBUG_PRINT_SAFE("Kernel : Destroying free mon %p\n", this);141 142 // No one has the monitor, just take it143 set_owner( this, thrd );144 145 unlock( &this->lock );146 return;147 }148 else if( this->owner == thrd) {149 // We already have the monitor... but where about to destroy it so the nesting will fail150 // Abort!151 abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");152 }153 154 int count = 1;155 monitor_desc ** monitors = &this;156 __monitor_group_t group = { &this, 1, func };157 if( is_accepted( this, group) ) {158 LIB_DEBUG_PRINT_SAFE("Kernel : mon accepts dtor, block and signal it \n");159 160 // Wake the thread that is waiting for this161 __condition_criterion_t * urgent = pop( &this->signal_stack );162 verify( urgent );163 164 // Reset mask165 reset_mask( this );166 167 // Create the node specific to this wait operation168 wait_ctx_primed( this_thread, 0 )169 170 // Some one else has the monitor, wait for him to finish and then run171 BlockInternal( &this->lock, urgent->owner->waiting_thread );172 173 // Some one was waiting for us, enter174 set_owner( this, thrd );175 }176 else {177 LIB_DEBUG_PRINT_SAFE("Kernel : blocking \n");178 179 wait_ctx( this_thread, 0 )180 this->dtor_node = &waiter;181 182 // Some one else has the monitor, wait in line for it183 append( &this->entry_queue, thrd );184 BlockInternal( &this->lock );185 186 // BlockInternal will unlock spinlock, no need to unlock ourselves187 return;188 }189 190 LIB_DEBUG_PRINT_SAFE("Kernel : Destroying %p\n", this);191 192 129 } 193 130 … … 221 158 } 222 159 223 // Leave single monitor for the last time224 void __leave_dtor_monitor_desc( monitor_desc * this ) {225 LIB_DEBUG_DO(226 if( this_thread != this->owner ) {227 abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);228 }229 if( this->recursion != 1 ) {230 abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);231 }232 )233 }234 235 160 // Leave the thread monitor 236 161 // last routine called by a thread. … … 285 210 // Ctor for monitor guard 286 211 // Sorts monitors before entering 287 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, fptr_t func) {212 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() ) { 288 213 // Store current array 289 214 this.m = m; … … 321 246 322 247 // LIB_DEBUG_PRINT_SAFE("MGUARD : left\n"); 323 324 // Restore thread context325 this_thread->monitors.list = this.prev_mntrs;326 this_thread->monitors.size = this.prev_count;327 this_thread->monitors.func = this.prev_func;328 }329 330 331 // Ctor for monitor guard332 // Sorts monitors before entering333 void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, fptr_t func ) {334 // Store current array335 this.m = *m;336 337 // Save previous thread context338 this.prev_mntrs = this_thread->monitors.list;339 this.prev_count = this_thread->monitors.size;340 this.prev_func = this_thread->monitors.func;341 342 // Update thread context (needed for conditions)343 this_thread->monitors.list = m;344 this_thread->monitors.size = 1;345 this_thread->monitors.func = func;346 347 __enter_monitor_dtor( this.m, func );348 }349 350 351 // Dtor for monitor guard352 void ^?{}( monitor_dtor_guard_t & this ) {353 // Leave the monitors in order354 __leave_dtor_monitor_desc( this.m );355 248 356 249 // Restore thread context … … 555 448 *mask.accepted = index; 556 449 if( mask.clauses[index].is_dtor ) { 557 LIB_DEBUG_PRINT_SAFE("Kernel : dtor already there\n"); 558 verifyf( mask.clauses[index].size == 1 , "ERROR: Accepted dtor has more than 1 mutex parameter." ); 559 560 monitor_desc * mon2dtor = mask.clauses[index].list[0]; 561 verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." ); 562 563 __condition_criterion_t * dtor_crit = mon2dtor->dtor_node->criteria; 564 push( &mon2dtor->signal_stack, dtor_crit ); 565 566 unlock_all( locks, count ); 450 #warning case not implemented 567 451 } 568 452 else { -
src/tests/Makefile.am
r1155718 rbd3d9e4 22 22 concurrent = yes 23 23 quick_test += coroutine thread monitor 24 concurrent_test = \ 25 coroutine \ 26 thread \ 27 monitor \ 28 multi-monitor \ 29 preempt \ 30 sched-int-block \ 31 sched-int-disjoint \ 32 sched-int-wait \ 33 sched-ext-barge \ 34 sched-ext-dtor \ 35 sched-ext-else \ 36 sched-ext-parse \ 37 sched-ext-recurse \ 38 sched-ext-statment \ 39 sched-ext-when 40 24 concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt 41 25 else 42 26 concurrent=no -
src/tests/Makefile.in
r1155718 rbd3d9e4 320 320 @BUILD_CONCURRENCY_TRUE@concurrent = yes 321 321 @BUILD_CONCURRENCY_FALSE@concurrent_test = 322 @BUILD_CONCURRENCY_TRUE@concurrent_test = \ 323 @BUILD_CONCURRENCY_TRUE@ coroutine \ 324 @BUILD_CONCURRENCY_TRUE@ thread \ 325 @BUILD_CONCURRENCY_TRUE@ monitor \ 326 @BUILD_CONCURRENCY_TRUE@ multi-monitor \ 327 @BUILD_CONCURRENCY_TRUE@ preempt \ 328 @BUILD_CONCURRENCY_TRUE@ sched-int-block \ 329 @BUILD_CONCURRENCY_TRUE@ sched-int-disjoint \ 330 @BUILD_CONCURRENCY_TRUE@ sched-int-wait \ 331 @BUILD_CONCURRENCY_TRUE@ sched-ext-barge \ 332 @BUILD_CONCURRENCY_TRUE@ sched-ext-dtor \ 333 @BUILD_CONCURRENCY_TRUE@ sched-ext-else \ 334 @BUILD_CONCURRENCY_TRUE@ sched-ext-parse \ 335 @BUILD_CONCURRENCY_TRUE@ sched-ext-recurse \ 336 @BUILD_CONCURRENCY_TRUE@ sched-ext-statment \ 337 @BUILD_CONCURRENCY_TRUE@ sched-ext-when 338 322 @BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt 339 323 340 324 # applies to both programs
Note: See TracChangeset
for help on using the changeset viewer.