Changes in / [fa35958:ee0bfa9]


Ignore:
Location:
libcfa/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/alarm.cfa

    rfa35958 ree0bfa9  
    1010// Created On       : Fri Jun 2 11:31:25 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Dec  3 22:47:24 2019
    13 // Update Count     : 68
     12// Last Modified On : Fri May 25 06:25:47 2018
     13// Update Count     : 67
    1414//
    1515
    … …  
    4040void __kernel_set_timer( Duration alarm ) {
    4141        verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%jins)", alarm.tv);
    42         setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p );
     42        setitimer( ITIMER_REAL, &(itimerval){ alarm }, NULL );
    4343}
    4444
    … …  
    113113                        this->tail = &this->head;
    114114                }
    115                 head->next = 0p;
     115                head->next = NULL;
    116116        }
    117117        verify( validate( this ) );
    … …  
    127127                this->tail = it;
    128128        }
    129         n->next = 0p;
     129        n->next = NULL;
    130130
    131131        verify( validate( this ) );

  • libcfa/src/concurrency/coroutine.hfa

    rfa35958 ree0bfa9  
    1010// Created On       : Mon Nov 28 12:27:26 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Dec  3 22:47:58 2019
    13 // Update Count     : 10
     12// Last Modified On : Fri Jun 21 17:49:39 2019
     13// Update Count     : 9
    1414//
    1515
    … …  
    3838void ^?{}( coroutine_desc & this );
    3939
    40 static inline void ?{}( coroutine_desc & this)                                       { this{ "Anonymous Coroutine", 0p, 0 }; }
    41 static inline void ?{}( coroutine_desc & this, size_t stackSize)                     { this{ "Anonymous Coroutine", 0p, stackSize }; }
     40static inline void ?{}( coroutine_desc & this)                                       { this{ "Anonymous Coroutine", NULL, 0 }; }
     41static inline void ?{}( coroutine_desc & this, size_t stackSize)                     { this{ "Anonymous Coroutine", NULL, stackSize }; }
    4242static inline void ?{}( coroutine_desc & this, void * storage, size_t storageSize )  { this{ "Anonymous Coroutine", storage, storageSize }; }
    43 static inline void ?{}( coroutine_desc & this, const char * name)                    { this{ name, 0p, 0 }; }
    44 static inline void ?{}( coroutine_desc & this, const char * name, size_t stackSize ) { this{ name, 0p, stackSize }; }
     43static inline void ?{}( coroutine_desc & this, const char * name)                    { this{ name, NULL, 0 }; }
     44static inline void ?{}( coroutine_desc & this, const char * name, size_t stackSize ) { this{ name, NULL, stackSize }; }
    4545
    4646//-----------------------------------------------------------------------------
    … …  
    8989        src->state = Active;
    9090
    91         if( unlikely(src->cancellation != 0p) ) {
     91        if( unlikely(src->cancellation != NULL) ) {
    9292                _CtxCoroutine_Unwind(src->cancellation, src);
    9393        }
    … …  
    128128        coroutine_desc * dst = get_coroutine(cor);
    129129
    130         if( unlikely(dst->context.SP == 0p) ) {
     130        if( unlikely(dst->context.SP == NULL) ) {
    131131                __stack_prepare(&dst->stack, 65000);
    132132                CtxStart(&cor, CtxInvokeCoroutine);

  • libcfa/src/concurrency/invoke.h

    rfa35958 ree0bfa9  
    1010// Created On       : Tue Jan 17 12:27:26 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  4 08:05:32 2019
    13 // Update Count     : 43
     12// Last Modified On : Thu Nov 28 22:34:07 2019
     13// Update Count     : 41
    1414//
    1515
    … …  
    208208
    209209                static inline void ?{}(__monitor_group_t & this) {
    210                         (this.data){0p};
     210                        (this.data){NULL};
    211211                        (this.size){0};
    212212                        (this.func){NULL};

  • libcfa/src/concurrency/kernel.cfa

    rfa35958 ree0bfa9  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Dec  3 21:46:54 2019
    13 // Update Count     : 49
     12// Last Modified On : Sun Dec  1 17:52:57 2019
     13// Update Count     : 45
    1414//
    1515
    … …  
    2727#include <unistd.h>
    2828#include <limits.h>                                                                             // PTHREAD_STACK_MIN
    29 #include <sys/mman.h>                                                                   // mprotect
    3029}
    3130
    … …  
    282281
    283282                thread_desc * readyThread = 0p;
    284                 for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ ) {
     283                for( unsigned int spin_count = 0; ! __atomic_load_n(&this->do_terminate, __ATOMIC_SEQ_CST); spin_count++ )
     284                {
    285285                        readyThread = nextThread( this->cltr );
    286286
    287                         if(readyThread) {
     287                        if(readyThread)
     288                        {
    288289                                verify( ! kernelTLS.preemption_state.enabled );
    289290
    … …  
    296297
    297298                                spin_count = 0;
    298                         } else {
     299                        }
     300                        else
     301                        {
    299302                                // spin(this, &spin_count);
    300303                                halt(this);
    … …  
    442445
    443446static void Abort( int ret, const char * func ) {
    444         if ( ret ) {                                                                            // pthread routines return errno values
     447        if ( ret ) {
    445448                abort( "%s : internal error, error(%d) %s.", func, ret, strerror( ret ) );
    446449        } // if
    … …  
    452455        Abort( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
    453456
     457#ifdef __CFA_DEBUG__
     458        size_t guardsize;
     459        Abort( pthread_attr_getguardsize( &attr, &guardsize ), "pthread_attr_getguardsize" );
     460        Abort( pthread_attr_setguardsize( &attr, guardsize ), "pthread_attr_setguardsize" );
     461#endif
     462
    454463        size_t stacksize;
    455          // default stack size, normally defined by shell limit
    456         Abort( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
     464        Abort( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" ); // default stack size, normally defined by shell limit
    457465        assert( stacksize >= PTHREAD_STACK_MIN );
    458 
    459 #ifdef __CFA_DEBUG__
    460         void * stack = memalign( __page_size, stacksize + __page_size );
    461         // pthread has no mechanism to create the guard page in user supplied stack.
    462         if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
    463                 abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
    464         } // if
    465 #else
    466466        void * stack = malloc( stacksize );
    467 #endif
    468 
    469467        Abort( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
    470468

  • libcfa/src/concurrency/kernel.hfa

    rfa35958 ree0bfa9  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  4 07:54:51 2019
    13 // Update Count     : 18
     12// Last Modified On : Thu Nov 28 21:24:12 2019
     13// Update Count     : 17
    1414//
    1515
    … …  
    8989static inline void ?{}(FinishAction & this) {
    9090        this.action_code = No_Action;
    91         this.thrd = 0p;
    92         this.lock = 0p;
     91        this.thrd = NULL;
     92        this.lock = NULL;
    9393}
    9494static inline void ^?{}(FinishAction &) {}

  • libcfa/src/concurrency/monitor.cfa

    rfa35958 ree0bfa9  
    1010// Created On       : Thd Feb 23 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  4 07:55:14 2019
    13 // Update Count     : 10
     12// Last Modified On : Fri Mar 30 14:30:26 2018
     13// Update Count     : 9
    1414//
    1515
    … …  
    363363        this.waiting_thread = waiting_thread;
    364364        this.count = count;
    365         this.next = 0p;
     365        this.next = NULL;
    366366        this.user_info = user_info;
    367367}
    … …  
    369369void ?{}(__condition_criterion_t & this ) with( this ) {
    370370        ready  = false;
    371         target = 0p;
    372         owner  = 0p;
    373         next   = 0p;
     371        target = NULL;
     372        owner  = NULL;
     373        next   = NULL;
    374374}
    375375
    … …  
    378378        this.target = target;
    379379        this.owner  = &owner;
    380         this.next   = 0p;
     380        this.next   = NULL;
    381381}
    382382
    … …  
    387387
    388388        // Check that everything is as expected
    389         assertf( this.monitors != 0p, "Waiting with no monitors (%p)", this.monitors );
     389        assertf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
    390390        verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
    391391        verifyf( this.monitor_count < 32u, "Excessive monitor count (%"PRIiFAST16")", this.monitor_count );
    … …  
    449449
    450450        // Lock all monitors
    451         lock_all( this.monitors, 0p, count );
     451        lock_all( this.monitors, NULL, count );
    452452
    453453        //Pop the head of the waiting queue
    … …  
    471471
    472472        //Check that everything is as expected
    473         verifyf( this.monitors != 0p, "Waiting with no monitors (%p)", this.monitors );
     473        verifyf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
    474474        verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
    475475
    … …  
    674674
    675675static inline void reset_mask( monitor_desc * this ) {
    676         this->mask.accepted = 0p;
    677         this->mask.data = 0p;
     676        this->mask.accepted = NULL;
     677        this->mask.data = NULL;
    678678        this->mask.size = 0;
    679679}
    … …  
    816816        }
    817817
    818         __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : 0p );
    819         return ready2run ? node->waiting_thread : 0p;
     818        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : NULL );
     819        return ready2run ? node->waiting_thread : NULL;
    820820}
    821821
    … …  
    824824        if( !this.monitors ) {
    825825                // __cfaabi_dbg_print_safe( "Branding\n" );
    826                 assertf( thrd->monitors.data != 0p, "No current monitor to brand condition %p", thrd->monitors.data );
     826                assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data );
    827827                this.monitor_count = thrd->monitors.size;
    828828

  • libcfa/src/concurrency/monitor.hfa

    rfa35958 ree0bfa9  
    1010// Created On       : Thd Feb 23 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  4 07:55:32 2019
    13 // Update Count     : 11
     12// Last Modified On : Sat Oct  7 18:06:45 2017
     13// Update Count     : 10
    1414//
    1515
    … …  
    3131        entry_queue{};
    3232        signal_stack{};
    33         owner         = 0p;
     33        owner         = NULL;
    3434        recursion     = 0;
    35         mask.accepted = 0p;
    36         mask.data     = 0p;
     35        mask.accepted = NULL;
     36        mask.data     = NULL;
    3737        mask.size     = 0;
    38         dtor_node     = 0p;
     38        dtor_node     = NULL;
    3939}
    4040
    … …  
    122122
    123123static inline void ?{}( condition & this ) {
    124         this.monitors = 0p;
     124        this.monitors = NULL;
    125125        this.monitor_count = 0;
    126126}

  • libcfa/src/concurrency/mutex.cfa

    rfa35958 ree0bfa9  
    1111// Author           : Thierry Delisle
    1212// Created On       : Fri May 25 01:37:11 2018
    13 // Last Modified By : Peter A. Buhr
    14 // Last Modified On : Wed Dec  4 09:16:39 2019
    15 // Update Count     : 1
     13// Last Modified By : Thierry Delisle
     14// Last Modified On : Fri May 25 01:37:51 2018
     15// Update Count     : 0
    1616//
    1717
    … …  
    7373        this.lock{};
    7474        this.blocked_threads{};
    75         this.owner = 0p;
     75        this.owner = NULL;
    7676        this.recursion_count = 0;
    7777}
    … …  
    8383void lock(recursive_mutex_lock & this) with(this) {
    8484        lock( lock __cfaabi_dbg_ctx2 );
    85         if( owner == 0p ) {
     85        if( owner == NULL ) {
    8686                owner = kernelTLS.this_thread;
    8787                recursion_count = 1;
    … …  
    101101        bool ret = false;
    102102        lock( lock __cfaabi_dbg_ctx2 );
    103         if( owner == 0p ) {
     103        if( owner == NULL ) {
    104104                owner = kernelTLS.this_thread;
    105105                recursion_count = 1;

  • libcfa/src/concurrency/mutex.hfa

    rfa35958 ree0bfa9  
    1111// Author           : Thierry Delisle
    1212// Created On       : Fri May 25 01:24:09 2018
    13 // Last Modified By : Peter A. Buhr
    14 // Last Modified On : Wed Dec  4 09:16:53 2019
    15 // Update Count     : 1
     13// Last Modified By : Thierry Delisle
     14// Last Modified On : Fri May 25 01:24:12 2018
     15// Update Count     : 0
    1616//
    1717
    … …  
    110110
    111111        static inline void ?{}(lock_scope(L) & this) {
    112                 this.locks = 0p;
     112                this.locks = NULL;
    113113                this.count = 0;
    114114        }

  • libcfa/src/concurrency/thread.cfa

    rfa35958 ree0bfa9  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  4 09:17:49 2019
    13 // Update Count     : 9
     12// Last Modified On : Fri Mar 30 17:19:52 2018
     13// Update Count     : 8
    1414//
    1515
    … …  
    3333// Thread ctors and dtors
    3434void ?{}(thread_desc & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
    35         context{ 0p, 0p };
     35        context{ NULL, NULL };
    3636        self_cor{ name, storage, storageSize };
    3737        state = Start;
    … …  
    4141        self_mon_p = &self_mon;
    4242        curr_cluster = &cl;
    43         next = 0p;
     43        next = NULL;
    4444
    45         node.next = 0p;
    46         node.prev = 0p;
     45        node.next = NULL;
     46        node.prev = NULL;
    4747        doregister(curr_cluster, this);
    4848

  • libcfa/src/concurrency/thread.hfa

    rfa35958 ree0bfa9  
    1010// Created On       : Tue Jan 17 12:27:26 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Dec  4 09:18:14 2019
    13 // Update Count     : 6
     12// Last Modified On : Fri Jun 21 17:51:33 2019
     13// Update Count     : 5
    1414//
    1515
    … …  
    6161void ^?{}(thread_desc & this);
    6262
    63 static inline void ?{}(thread_desc & this)                                                                  { this{ "Anonymous Thread", *mainCluster, 0p, 65000 }; }
    64 static inline void ?{}(thread_desc & this, size_t stackSize )                                               { this{ "Anonymous Thread", *mainCluster, 0p, stackSize }; }
     63static inline void ?{}(thread_desc & this)                                                                  { this{ "Anonymous Thread", *mainCluster, NULL, 65000 }; }
     64static inline void ?{}(thread_desc & this, size_t stackSize )                                               { this{ "Anonymous Thread", *mainCluster, NULL, stackSize }; }
    6565static inline void ?{}(thread_desc & this, void * storage, size_t storageSize )                             { this{ "Anonymous Thread", *mainCluster, storage, storageSize }; }
    66 static inline void ?{}(thread_desc & this, struct cluster & cl )                                            { this{ "Anonymous Thread", cl, 0p, 65000 }; }
    67 static inline void ?{}(thread_desc & this, struct cluster & cl, size_t stackSize )                          { this{ "Anonymous Thread", cl, 0p, stackSize }; }
     66static inline void ?{}(thread_desc & this, struct cluster & cl )                                            { this{ "Anonymous Thread", cl, NULL, 65000 }; }
     67static inline void ?{}(thread_desc & this, struct cluster & cl, size_t stackSize )                          { this{ "Anonymous Thread", cl, NULL, stackSize }; }
    6868static inline void ?{}(thread_desc & this, struct cluster & cl, void * storage, size_t storageSize )        { this{ "Anonymous Thread", cl, storage, storageSize }; }
    69 static inline void ?{}(thread_desc & this, const char * const name)                                         { this{ name, *mainCluster, 0p, 65000 }; }
    70 static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl )                   { this{ name, cl, 0p, 65000 }; }
    71 static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl, size_t stackSize ) { this{ name, cl, 0p, stackSize }; }
     69static inline void ?{}(thread_desc & this, const char * const name)                                         { this{ name, *mainCluster, NULL, 65000 }; }
     70static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl )                   { this{ name, cl, NULL, 65000 }; }
     71static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl, size_t stackSize ) { this{ name, cl, NULL, stackSize }; }
    7272
    7373//-----------------------------------------------------------------------------

  • libcfa/src/heap.cfa

    rfa35958 ree0bfa9  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Dec  3 13:58:44 2019
    13 // Update Count     : 642
     12// Last Modified On : Fri Nov 29 17:33:58 2019
     13// Update Count     : 641
    1414//
    1515
    … …  
    855855                #endif // __STATISTICS__
    856856
    857                 // If size is equal to 0, either NULL or a pointer suitable to be passed to free() is returned.
    858           if ( unlikely( size == 0 ) ) { free( oaddr ); return mallocNoStats( size ); } // special cases
     857          if ( unlikely( size == 0 ) ) { free( oaddr ); return 0p; } // special cases
    859858          if ( unlikely( oaddr == 0p ) ) return mallocNoStats( size );
    860859
    … …  
    10831082        #endif // __STATISTICS__
    10841083
    1085         // If size is equal to 0, either NULL or a pointer suitable to be passed to free() is returned.
    1086   if ( unlikely( size == 0 ) ) { free( oaddr ); return mallocNoStats( size ); } // special cases
     1084  if ( unlikely( size == 0 ) ) { free( oaddr ); return 0p; } // special cases
    10871085  if ( unlikely( oaddr == 0p ) ) return mallocNoStats( size );
    10881086
Note: See TracChangeset for help on using the changeset viewer.