Changeset 848439f

Timestamp:

Oct 7, 2020, 4:39:16 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

391c065, 41b8ea4

Parents:

c76bd34

Message:

Fixed newlines and tabs in concurrency/locks

File:

• libcfa/src/concurrency/locks.cfa (modified) (8 diffs)

libcfa/src/concurrency/locks.cfa

@@ -77 +77 @@
         if ( owner == kernelTLS.this_thread && !multi_acquisition) {
                 fprintf(stderr, "A single acquisition lock holder attempted to reacquire the lock resulting in a deadlock."); // Possibly throw instead
-        exit(EXIT_FAILURE);
+                exit(EXIT_FAILURE);
         } else if ( owner != 0p && owner != kernelTLS.this_thread ) {
                 append( blocked_threads, kernelTLS.this_thread );
@@ -111 +111 @@
         lock( lock __cfaabi_dbg_ctx2 );
         if ( owner == 0p ){ // no owner implies lock isn't held
-                fprintf( stderr, "There was an attempt to release a lock that isn't held" ); 
+                fprintf( stderr, "There was an attempt to release a lock that isn't held" );
                 return;
         } else if ( strict_owner && owner != kernelTLS.this_thread ) {
-                fprintf( stderr, "A thread other than the owner attempted to release an owner lock" ); 
+                fprintf( stderr, "A thread other than the owner attempted to release an owner lock" );
                 return;
         }
@@ -158 +158 @@
     lock( lock __cfaabi_dbg_ctx2 );
         if ( owner == 0p ){ // no owner implies lock isn't held
-                fprintf( stderr, "A lock that is not held was passed to a synchronization lock" ); 
+                fprintf( stderr, "A lock that is not held was passed to a synchronization lock" );
         } else if ( strict_owner && owner != kernelTLS.this_thread ) {
-                fprintf( stderr, "A thread other than the owner of a lock passed it to a synchronization lock" ); 
+                fprintf( stderr, "A thread other than the owner of a lock passed it to a synchronization lock" );
         } else {
                 $thread * thrd = pop_head( blocked_threads );
@@ -264 +264 @@
                 info_thread(L) * popped = pop_head( blocked_threads );
                 if(popped != 0p) {
-                        if( reacquire_after_signal ){ 
+                        if( reacquire_after_signal ){
                                 add_(*popped->lock, popped->t);
                         } else {
@@ -282 +282 @@
                         info_thread(L) * popped = pop_head( blocked_threads );
                         if(popped != 0p){
-                                if( reacquire_after_signal ){ 
+                                if( reacquire_after_signal ){
                                         add_(*popped->lock, popped->t);
                                 } else {
@@ -332 +332 @@
         }
 
-        bool wait( synchronization_lock(L) & this, uintptr_t info, Duration duration ) with(this) { 
+        bool wait( synchronization_lock(L) & this, uintptr_t info, Duration duration ) with(this) {
                 // TODO: ADD INFO
                 return wait( this, duration );
@@ -368 +368 @@
                 queue_info_thread_unlock( this, l, i );
         }
-        
+
         bool wait( synchronization_lock(L) & this, L & l, Duration duration ) with(this) {
                 timeval tv = { time(0) };
@@ -374 +374 @@
                 return wait( this, l, t + duration );
         }
-        
+
         bool wait( synchronization_lock(L) & this, L & l, uintptr_t info, Duration duration ) with(this) {
                 // TODO: ADD INFO
                 return wait( this, l, duration );
         }
-        
+
         bool wait( synchronization_lock(L) & this, L & l, Time time ) with(this) {
                 return false; //default
         }
-        
+
         bool wait( synchronization_lock(L) & this, L & l, uintptr_t info, Time time ) with(this) {
                 // TODO: ADD INFO