Changeset 9cdfb4d0 for src/libcfa/concurrency/monitor.c

Timestamp:

Jan 22, 2018, 3:09:01 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

e23d20b

Parents:

326cd2b (diff), 4bf3b2b (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

File:

• src/libcfa/concurrency/monitor.c (modified) (2 diffs)

src/libcfa/concurrency/monitor.c

@@ -534 +534 @@
         __lock_size_t actual_count = aggregate( mon_storage, mask );
 
-        __cfaabi_dbg_print_buffer_decl( "Kernel : waitfor %d (s: %d, m: %d)\n", actual_count, mask.size, (__lock_size_t)max);
+        __cfaabi_dbg_print_buffer_decl( "Kernel : waitfor %"PRIdFAST16" (s: %"PRIdFAST16", m: %"PRIdFAST16")\n", actual_count, mask.size, (__lock_size_t)max);
 
         if(actual_count == 0) return;
@@ -575 +575 @@
                                 monitor_save;
 
-                                __cfaabi_dbg_print_buffer_local( "Kernel :  baton of %d monitors : ", count );
+                                __cfaabi_dbg_print_buffer_local( "Kernel :  baton of %"PRIdFAST16" monitors : ", count );
                                 #ifdef __CFA_DEBUG_PRINT__
                                         for( int i = 0; i < count; i++) {