Changeset 527acfc

Timestamp:

Jul 16, 2020, 5:30:07 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

50d529e

Parents:

0aa20e3 (diff), efc171d1 (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:

libcfa/src/concurrency

Files:

• iocall.cfa (modified) (1 diff)
• kernel.cfa (modified) (1 diff)
• kernel_private.hfa (modified) (1 diff)

libcfa/src/concurrency/iocall.cfa

@@ -346 +346 @@
 }
 
+// Forward declare in case it is not supported
+struct statx;
 int cfa_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) {
         #if !defined(HAVE_LINUX_IO_URING_H) || !defined(IORING_OP_STATX)

libcfa/src/concurrency/kernel.cfa

@@ -735 +735 @@
 void __unpark(  struct __processor_id_t * id, $thread * thrd __cfaabi_dbg_ctx_param2 ) {
         // record activity
-        __cfaabi_dbg_debug_do( char * old_caller = thrd->unpark_caller; )
         __cfaabi_dbg_record_thrd( *thrd, false, caller );
 

libcfa/src/concurrency/kernel_private.hfa

@@ -36 +36 @@
 }
 
-void __schedule_thread( struct __processor_id_t *, $thread * ) __attribute__((nonnull (2)));
+void __schedule_thread( struct __processor_id_t *, $thread * )
+#if defined(NDEBUG) || (!defined(__CFA_DEBUG__) && !defined(__CFA_VERIFY__))
+        __attribute__((nonnull (2)))
+#endif
+;
 
 //Block current thread and release/wake-up the following resources