Changeset f5478c8 for src/libcfa/concurrency

Timestamp:

Nov 24, 2017, 8:57:00 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

2b716ec

Parents:

50abab9 (diff), 3de176d (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.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• kernel (modified) (1 diff)
• monitor.c (modified) (1 diff)

src/libcfa/concurrency/kernel

@@ -108 +108 @@
 #ifdef __CFA_DEBUG__
         // Last function to enable preemption on this processor
-        char * last_enable;
+        const char * last_enable;
 #endif
 };

src/libcfa/concurrency/monitor.c

@@ -823 +823 @@
                 this.monitor_count = thrd->monitors.size;
 
-                this.monitors = malloc( this.monitor_count * sizeof( *this.monitors ) );
+                this.monitors = (monitor_desc **)malloc( this.monitor_count * sizeof( *this.monitors ) );
                 for( int i = 0; i < this.monitor_count; i++ ) {
                         this.monitors[i] = thrd->monitors[i];