Changeset 121be3e for libcfa/src/concurrency

Timestamp:

Dec 4, 2019, 11:25:00 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

1a3040c

Parents:

1d60da8

Message:

change NULL to 0p

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (4 diffs)
• coroutine.hfa (modified) (4 diffs)
• invoke.h (modified) (2 diffs)
• kernel.hfa (modified) (2 diffs)
• monitor.cfa (modified) (10 diffs)
• monitor.hfa (modified) (3 diffs)
• mutex.cfa (modified) (4 diffs)
• mutex.hfa (modified) (2 diffs)
• thread.cfa (modified) (3 diffs)
• thread.hfa (modified) (2 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May 25 06:25:47 2018
-// Update Count     : 67
+// Last Modified On : Tue Dec  3 22:47:24 2019
+// Update Count     : 68
 //
 
@@ -40 +40 @@
 void __kernel_set_timer( Duration alarm ) {
         verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%jins)", alarm.tv);
-        setitimer( ITIMER_REAL, &(itimerval){ alarm }, NULL );
+        setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p );
 }
 
@@ -113 +113 @@
                         this->tail = &this->head;
                 }
-                head->next = NULL;
+                head->next = 0p;
         }
         verify( validate( this ) );
@@ -127 +127 @@
                 this->tail = it;
         }
-        n->next = NULL;
+        n->next = 0p;
 
         verify( validate( this ) );

libcfa/src/concurrency/coroutine.hfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 17:49:39 2019
-// Update Count     : 9
+// Last Modified On : Tue Dec  3 22:47:58 2019
+// Update Count     : 10
 //
 
@@ -38 +38 @@
 void ^?{}( coroutine_desc & this );
 
-static inline void ?{}( coroutine_desc & this)                                       { this{ "Anonymous Coroutine", NULL, 0 }; }
-static inline void ?{}( coroutine_desc & this, size_t stackSize)                     { this{ "Anonymous Coroutine", NULL, stackSize }; }
+static inline void ?{}( coroutine_desc & this)                                       { this{ "Anonymous Coroutine", 0p, 0 }; }
+static inline void ?{}( coroutine_desc & this, size_t stackSize)                     { this{ "Anonymous Coroutine", 0p, stackSize }; }
 static inline void ?{}( coroutine_desc & this, void * storage, size_t storageSize )  { this{ "Anonymous Coroutine", storage, storageSize }; }
-static inline void ?{}( coroutine_desc & this, const char * name)                    { this{ name, NULL, 0 }; }
-static inline void ?{}( coroutine_desc & this, const char * name, size_t stackSize ) { this{ name, NULL, stackSize }; }
+static inline void ?{}( coroutine_desc & this, const char * name)                    { this{ name, 0p, 0 }; }
+static inline void ?{}( coroutine_desc & this, const char * name, size_t stackSize ) { this{ name, 0p, stackSize }; }
 
 //-----------------------------------------------------------------------------
@@ -89 +89 @@
         src->state = Active;
 
-        if( unlikely(src->cancellation != NULL) ) {
+        if( unlikely(src->cancellation != 0p) ) {
                 _CtxCoroutine_Unwind(src->cancellation, src);
         }
@@ -128 +128 @@
         coroutine_desc * dst = get_coroutine(cor);
 
-        if( unlikely(dst->context.SP == NULL) ) {
+        if( unlikely(dst->context.SP == 0p) ) {
                 __stack_prepare(&dst->stack, 65000);
                 CtxStart(&cor, CtxInvokeCoroutine);

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 28 22:34:07 2019
-// Update Count     : 41
+// Last Modified On : Wed Dec  4 08:05:32 2019
+// Update Count     : 43
 //
 
@@ -208 +208 @@
 
                 static inline void ?{}(__monitor_group_t & this) {
-                        (this.data){NULL};
+                        (this.data){0p};
                         (this.size){0};
                         (this.func){NULL};

libcfa/src/concurrency/kernel.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 28 21:24:12 2019
-// Update Count     : 17
+// Last Modified On : Wed Dec  4 07:54:51 2019
+// Update Count     : 18
 //
 
@@ -89 +89 @@
 static inline void ?{}(FinishAction & this) {
         this.action_code = No_Action;
-        this.thrd = NULL;
-        this.lock = NULL;
+        this.thrd = 0p;
+        this.lock = 0p;
 }
 static inline void ^?{}(FinishAction &) {}

libcfa/src/concurrency/monitor.cfa

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 14:30:26 2018
-// Update Count     : 9
+// Last Modified On : Wed Dec  4 07:55:14 2019
+// Update Count     : 10
 //
 
@@ -363 +363 @@
         this.waiting_thread = waiting_thread;
         this.count = count;
-        this.next = NULL;
+        this.next = 0p;
         this.user_info = user_info;
 }
@@ -369 +369 @@
 void ?{}(__condition_criterion_t & this ) with( this ) {
         ready  = false;
-        target = NULL;
-        owner  = NULL;
-        next   = NULL;
+        target = 0p;
+        owner  = 0p;
+        next   = 0p;
 }
 
@@ -378 +378 @@
         this.target = target;
         this.owner  = &owner;
-        this.next   = NULL;
+        this.next   = 0p;
 }
 
@@ -387 +387 @@
 
         // Check that everything is as expected
-        assertf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
+        assertf( this.monitors != 0p, "Waiting with no monitors (%p)", this.monitors );
         verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
         verifyf( this.monitor_count < 32u, "Excessive monitor count (%"PRIiFAST16")", this.monitor_count );
@@ -449 +449 @@
 
         // Lock all monitors
-        lock_all( this.monitors, NULL, count );
+        lock_all( this.monitors, 0p, count );
 
         //Pop the head of the waiting queue
@@ -471 +471 @@
 
         //Check that everything is as expected
-        verifyf( this.monitors != NULL, "Waiting with no monitors (%p)", this.monitors );
+        verifyf( this.monitors != 0p, "Waiting with no monitors (%p)", this.monitors );
         verifyf( this.monitor_count != 0, "Waiting with 0 monitors (%"PRIiFAST16")", this.monitor_count );
 
@@ -674 +674 @@
 
 static inline void reset_mask( monitor_desc * this ) {
-        this->mask.accepted = NULL;
-        this->mask.data = NULL;
+        this->mask.accepted = 0p;
+        this->mask.data = 0p;
         this->mask.size = 0;
 }
@@ -816 +816 @@
         }
 
-        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : NULL );
-        return ready2run ? node->waiting_thread : NULL;
+        __cfaabi_dbg_print_safe( "Kernel :  Runing %i (%p)\n", ready2run, ready2run ? node->waiting_thread : 0p );
+        return ready2run ? node->waiting_thread : 0p;
 }
 
@@ -824 +824 @@
         if( !this.monitors ) {
                 // __cfaabi_dbg_print_safe( "Branding\n" );
-                assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data );
+                assertf( thrd->monitors.data != 0p, "No current monitor to brand condition %p", thrd->monitors.data );
                 this.monitor_count = thrd->monitors.size;
 

libcfa/src/concurrency/monitor.hfa

@@ -10 +10 @@
 // Created On       : Thd Feb 23 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct  7 18:06:45 2017
-// Update Count     : 10
+// Last Modified On : Wed Dec  4 07:55:32 2019
+// Update Count     : 11
 //
 
@@ -31 +31 @@
         entry_queue{};
         signal_stack{};
-        owner         = NULL;
+        owner         = 0p;
         recursion     = 0;
-        mask.accepted = NULL;
-        mask.data     = NULL;
+        mask.accepted = 0p;
+        mask.data     = 0p;
         mask.size     = 0;
-        dtor_node     = NULL;
+        dtor_node     = 0p;
 }
 
@@ -122 +122 @@
 
 static inline void ?{}( condition & this ) {
-        this.monitors = NULL;
+        this.monitors = 0p;
         this.monitor_count = 0;
 }

libcfa/src/concurrency/mutex.cfa

@@ -11 +11 @@
 // Author           : Thierry Delisle
 // Created On       : Fri May 25 01:37:11 2018
-// Last Modified By : Thierry Delisle
-// Last Modified On : Fri May 25 01:37:51 2018
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec  4 09:16:39 2019
+// Update Count     : 1
 //
 
@@ -73 +73 @@
         this.lock{};
         this.blocked_threads{};
-        this.owner = NULL;
+        this.owner = 0p;
         this.recursion_count = 0;
 }
@@ -83 +83 @@
 void lock(recursive_mutex_lock & this) with(this) {
         lock( lock __cfaabi_dbg_ctx2 );
-        if( owner == NULL ) {
+        if( owner == 0p ) {
                 owner = kernelTLS.this_thread;
                 recursion_count = 1;
@@ -101 +101 @@
         bool ret = false;
         lock( lock __cfaabi_dbg_ctx2 );
-        if( owner == NULL ) {
+        if( owner == 0p ) {
                 owner = kernelTLS.this_thread;
                 recursion_count = 1;

libcfa/src/concurrency/mutex.hfa

@@ -11 +11 @@
 // Author           : Thierry Delisle
 // Created On       : Fri May 25 01:24:09 2018
-// Last Modified By : Thierry Delisle
-// Last Modified On : Fri May 25 01:24:12 2018
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec  4 09:16:53 2019
+// Update Count     : 1
 //
 
@@ -110 +110 @@
 
         static inline void ?{}(lock_scope(L) & this) {
-                this.locks = NULL;
+                this.locks = 0p;
                 this.count = 0;
         }

libcfa/src/concurrency/thread.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 17:19:52 2018
-// Update Count     : 8
+// Last Modified On : Wed Dec  4 09:17:49 2019
+// Update Count     : 9
 //
 
@@ -33 +33 @@
 // Thread ctors and dtors
 void ?{}(thread_desc & this, const char * const name, cluster & cl, void * storage, size_t storageSize ) with( this ) {
-        context{ NULL, NULL };
+        context{ 0p, 0p };
         self_cor{ name, storage, storageSize };
         state = Start;
@@ -41 +41 @@
         self_mon_p = &self_mon;
         curr_cluster = &cl;
-        next = NULL;
+        next = 0p;
 
-        node.next = NULL;
-        node.prev = NULL;
+        node.next = 0p;
+        node.prev = 0p;
         doregister(curr_cluster, this);
 

libcfa/src/concurrency/thread.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 17:51:33 2019
-// Update Count     : 5
+// Last Modified On : Wed Dec  4 09:18:14 2019
+// Update Count     : 6
 //
 
@@ -61 +61 @@
 void ^?{}(thread_desc & this);
 
-static inline void ?{}(thread_desc & this)                                                                  { this{ "Anonymous Thread", *mainCluster, NULL, 65000 }; }
-static inline void ?{}(thread_desc & this, size_t stackSize )                                               { this{ "Anonymous Thread", *mainCluster, NULL, stackSize }; }
+static inline void ?{}(thread_desc & this)                                                                  { this{ "Anonymous Thread", *mainCluster, 0p, 65000 }; }
+static inline void ?{}(thread_desc & this, size_t stackSize )                                               { this{ "Anonymous Thread", *mainCluster, 0p, stackSize }; }
 static inline void ?{}(thread_desc & this, void * storage, size_t storageSize )                             { this{ "Anonymous Thread", *mainCluster, storage, storageSize }; }
-static inline void ?{}(thread_desc & this, struct cluster & cl )                                            { this{ "Anonymous Thread", cl, NULL, 65000 }; }
-static inline void ?{}(thread_desc & this, struct cluster & cl, size_t stackSize )                          { this{ "Anonymous Thread", cl, NULL, stackSize }; }
+static inline void ?{}(thread_desc & this, struct cluster & cl )                                            { this{ "Anonymous Thread", cl, 0p, 65000 }; }
+static inline void ?{}(thread_desc & this, struct cluster & cl, size_t stackSize )                          { this{ "Anonymous Thread", cl, 0p, stackSize }; }
 static inline void ?{}(thread_desc & this, struct cluster & cl, void * storage, size_t storageSize )        { this{ "Anonymous Thread", cl, storage, storageSize }; }
-static inline void ?{}(thread_desc & this, const char * const name)                                         { this{ name, *mainCluster, NULL, 65000 }; }
-static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl )                   { this{ name, cl, NULL, 65000 }; }
-static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl, size_t stackSize ) { this{ name, cl, NULL, stackSize }; }
+static inline void ?{}(thread_desc & this, const char * const name)                                         { this{ name, *mainCluster, 0p, 65000 }; }
+static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl )                   { this{ name, cl, 0p, 65000 }; }
+static inline void ?{}(thread_desc & this, const char * const name, struct cluster & cl, size_t stackSize ) { this{ name, cl, 0p, stackSize }; }
 
 //-----------------------------------------------------------------------------