Changeset fd061ed3

Timestamp:

Feb 28, 2017, 1:49:12 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:

14f6bb39

Parents:

31868da (diff), cc7f4b1 (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

Files:

• Jenkinsfile (modified) (2 diffs)
• src/Parser/DeclarationNode.cc (modified) (6 diffs)
• src/Parser/ParseNode.h (modified) (2 diffs)
• src/Parser/TypeData.cc (modified) (4 diffs)
• src/Parser/TypeData.h (modified) (3 diffs)
• src/Parser/parser.yy.new (deleted)
• src/SymTab/Validate.cc (modified) (4 diffs)
• src/SynTree/ReferenceToType.cc (modified) (2 diffs)
• src/SynTree/Type.h (modified) (3 diffs)
• src/libcfa/concurrency/invoke.h (modified) (2 diffs)
• src/libcfa/concurrency/monitor (modified) (1 diff)
• src/libcfa/concurrency/monitor.c (modified) (3 diffs)
• src/libcfa/iostream (modified) (2 diffs)
• src/libcfa/iostream.c (modified) (2 diffs)
• src/libcfa/stdlib (modified) (2 diffs)
• src/libcfa/stdlib.c (modified) (2 diffs)
• src/tests/monitor.c (modified) (2 diffs)

Jenkinsfile

@@ -173 +173 @@
 
 def notify_server() {
-        sh 'curl --silent -X POST http://plg2:8082/jenkins/notify > /dev/null'
+        sh 'curl --silent -X POST http://plg2:8082/jenkins/notify > /dev/null || true'
         return
 }
@@ -320 +320 @@
 
                 //Then publish the results
-                sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null'
+                sh 'curl --silent --data @bench.csv http://plg2:8082/jenkins/publish > /dev/null || true'
 }
 

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 15:45:02 2017
-// Update Count     : 759
+// Last Modified On : Thu Feb 23 22:21:06 2017
+// Update Count     : 775
 //
 
@@ -607 +607 @@
                                         type->aggInst.aggregate = o->type;
                                         if ( o->type->kind == TypeData::Aggregate ) {
+                                                type->aggInst.hoistType = o->type->aggregate.body;
                                                 type->aggInst.params = maybeClone( o->type->aggregate.actuals );
+                                        } else {
+                                                type->aggInst.hoistType = o->type->enumeration.body;
                                         } // if
                                         type->qualifiers |= o->type->qualifiers;
@@ -881 +884 @@
                                 newType->aggInst.aggregate->aggregate.fields = nullptr;
                         } // if
+                        // don't hoist twice
+                        newType->aggInst.hoistType = false;
                 } // if
 
@@ -941 +946 @@
         SemanticError errors;
         std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
-        
+
         for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
@@ -953 +958 @@
                                         auto obj = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
                                         obj->location = cur->location;
-                                        * out++ = obj; 
+                                        * out++ = obj;
                                         delete agg;
                                 } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
@@ -1035 +1040 @@
 
         switch ( type->kind ) {
-          case TypeData::Enum: {
-                  if ( type->enumeration.body ) {
-                          EnumDecl * typedecl = buildEnum( type, attributes );
-                          return new EnumInstType( buildQualifiers( type ), typedecl );
-                  } else {
-                          return new EnumInstType( buildQualifiers( type ), *type->enumeration.name );
-                  }
-          }
+          case TypeData::Enum:
           case TypeData::Aggregate: {
-                  ReferenceToType * ret;
-                  if ( type->aggregate.body ) {
-                          AggregateDecl * typedecl = buildAggregate( type, attributes );
-                          switch ( type->aggregate.kind ) {
-                                case DeclarationNode::Struct:
-                                  ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
-                                  break;
-                                case DeclarationNode::Union:
-                                  ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
-                                  break;
-                                case DeclarationNode::Trait:
-                                  assert( false );
-                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
-                                  break;
-                                default:
-                                  assert( false );
-                          } // switch
-                  } else {
-                          switch ( type->aggregate.kind ) {
-                                case DeclarationNode::Struct:
-                                  ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
-                                  break;
-                                case DeclarationNode::Union:
-                                  ret = new UnionInstType( buildQualifiers( type ), *type->aggregate.name );
-                                  break;
-                                case DeclarationNode::Trait:
-                                  assert( false );
-                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
-                                  break;
-                                default:
-                                  assert( false );
-                          } // switch
-                  } // if
+                  ReferenceToType * ret = buildComAggInst( type, attributes );
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;

src/Parser/ParseNode.h

@@ -109 +109 @@
         ExpressionNode( const ExpressionNode &other );
         virtual ~ExpressionNode() {}
-        virtual ExpressionNode * clone() const { return expr ? new ExpressionNode( expr->clone() ) : nullptr; }
+        virtual ExpressionNode * clone() const override { return expr ? new ExpressionNode( expr->clone() ) : nullptr; }
 
         bool get_extension() const { return extension; }
@@ -259 +259 @@
         DeclarationNode();
         ~DeclarationNode();
-        DeclarationNode * clone() const;
+        DeclarationNode * clone() const override;
 
         DeclarationNode * addQualifiers( DeclarationNode * );

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 16:26:39 2017
-// Update Count     : 477
+// Last Modified On : Thu Feb 23 21:48:55 2017
+// Update Count     : 485
 //
 
@@ -62 +62 @@
                 aggInst.aggregate = nullptr;
                 aggInst.params = nullptr;
+                aggInst.hoistType = false;;
                 break;
           case Enum:
@@ -195 +196 @@
                 newtype->aggInst.aggregate = maybeClone( aggInst.aggregate );
                 newtype->aggInst.params = maybeClone( aggInst.params );
+                newtype->aggInst.hoistType = aggInst.hoistType;
                 break;
           case Enum:
@@ -644 +646 @@
 } // buildAggregate
 
+ReferenceToType * buildComAggInst( const TypeData * type, std::list< Attribute * > attributes ) {
+        switch ( type->kind ) {
+          case TypeData::Enum: {
+                  if ( type->enumeration.body ) {
+                          EnumDecl * typedecl = buildEnum( type, attributes );
+                          return new EnumInstType( buildQualifiers( type ), typedecl );
+                  } else {
+                          return new EnumInstType( buildQualifiers( type ), *type->enumeration.name );
+                  } // if
+          }
+          case TypeData::Aggregate: {
+                  ReferenceToType * ret;
+                  if ( type->aggregate.body ) {
+                          AggregateDecl * typedecl = buildAggregate( type, attributes );
+                          switch ( type->aggregate.kind ) {
+                                case DeclarationNode::Struct:
+                                  ret = new StructInstType( buildQualifiers( type ), (StructDecl *)typedecl );
+                                  break;
+                                case DeclarationNode::Union:
+                                  ret = new UnionInstType( buildQualifiers( type ), (UnionDecl *)typedecl );
+                                  break;
+                                case DeclarationNode::Trait:
+                                  assert( false );
+                                  //ret = new TraitInstType( buildQualifiers( type ), (TraitDecl *)typedecl );
+                                  break;
+                                default:
+                                  assert( false );
+                          } // switch
+                  } else {
+                          switch ( type->aggregate.kind ) {
+                                case DeclarationNode::Struct:
+                                  ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
+                                  break;
+                                case DeclarationNode::Union:
+                                  ret = new UnionInstType( buildQualifiers( type ), *type->aggregate.name );
+                                  break;
+                                case DeclarationNode::Trait:
+                                  ret = new TraitInstType( buildQualifiers( type ), *type->aggregate.name );
+                                  break;
+                                default:
+                                  assert( false );
+                          } // switch
+                  } // if
+                  return ret;
+          }
+          default:
+                assert( false );
+        } // switch
+} // buildAggInst
+
 ReferenceToType * buildAggInst( const TypeData * td ) {
         assert( td->kind == TypeData::AggregateInst );
 
-        ReferenceToType * ret;
-        if ( td->aggInst.aggregate->kind == TypeData::Enum ) {
-                ret = new EnumInstType( buildQualifiers( td ), *td->aggInst.aggregate->enumeration.name );
-        } else {
-                assert( td->aggInst.aggregate->kind == TypeData::Aggregate );
-                switch ( td->aggInst.aggregate->aggregate.kind ) {
-                  case DeclarationNode::Struct:
-                        assert( td->aggInst.aggregate->aggregate.name );
-                        ret = new StructInstType( buildQualifiers( td ), *td->aggInst.aggregate->aggregate.name );
-                        break;
-                  case DeclarationNode::Union:
-                        ret = new UnionInstType( buildQualifiers( td ), *td->aggInst.aggregate->aggregate.name );
-                        break;
-                  case DeclarationNode::Trait:
-                        ret = new TraitInstType( buildQualifiers( td ), *td->aggInst.aggregate->aggregate.name );
-                        break;
-                  default:
-                        assert( false );
-                } // switch
-        } // if
+        // ReferenceToType * ret = buildComAggInst( td->aggInst.aggregate, std::list< Attribute * >() );
+        ReferenceToType * ret = nullptr;
+        TypeData * type = td->aggInst.aggregate;
+        switch ( type->kind ) {
+          case TypeData::Enum: {
+                  return new EnumInstType( buildQualifiers( type ), *type->enumeration.name );
+          }
+          case TypeData::Aggregate: {
+                  switch ( type->aggregate.kind ) {
+                        case DeclarationNode::Struct:
+                          ret = new StructInstType( buildQualifiers( type ), *type->aggregate.name );
+                          break;
+                        case DeclarationNode::Union:
+                          ret = new UnionInstType( buildQualifiers( type ), *type->aggregate.name );
+                          break;
+                        case DeclarationNode::Trait:
+                          ret = new TraitInstType( buildQualifiers( type ), *type->aggregate.name );
+                          break;
+                        default:
+                          assert( false );
+                  } // switch
+          }
+          break;
+          default:
+                assert( false );
+        } // switch
+
+        ret->set_hoistType( td->aggInst.hoistType );
         buildList( td->aggInst.params, ret->get_parameters() );
         buildForall( td->forall, ret->get_forall() );

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 15:16:18 2017
-// Update Count     : 155
+// Last Modified On : Thu Feb 23 17:14:46 2017
+// Update Count     : 158
 //
 
@@ -38 +38 @@
                 TypeData * aggregate;
                 ExpressionNode * params;
+                bool hoistType;
         };
 
@@ -104 +105 @@
 ArrayType * buildArray( const TypeData * );
 AggregateDecl * buildAggregate( const TypeData *, std::list< Attribute * > );
+ReferenceToType * buildComAggInst( const TypeData *, std::list< Attribute * > attributes );
 ReferenceToType * buildAggInst( const TypeData * );
 NamedTypeDecl * buildSymbolic( const TypeData *, const std::string &name, DeclarationNode::StorageClass sc );

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  2 17:47:54 2017
-// Update Count     : 312
+// Last Modified On : Thu Feb 23 21:33:55 2017
+// Update Count     : 318
 //
 
@@ -629 +629 @@
                 } else {
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Can't find name %s", typeInst->get_name().c_str() );
+                        assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() );
                         typeInst->set_baseType( base->second );
                 } // if
@@ -660 +660 @@
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
-                        return new StructDecl( aggDecl->get_name() );
+                        return aggDecl->get_baseStruct() ? Mutator::mutate( aggDecl->get_baseStruct() ) : new StructDecl( aggDecl->get_name() );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
-                        return new UnionDecl( aggDecl->get_name() );
+                        return aggDecl->get_baseUnion() ? Mutator::mutate( aggDecl->get_baseUnion() ) : new UnionDecl( aggDecl->get_name() );
                 } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( tyDecl->get_base() ) ) {
                         return new EnumDecl( enumDecl->get_name() );
@@ -732 +732 @@
         }
 
-        // there may be typedefs nested within aggregates in order for everything to work properly, these should be removed
+        // there may be typedefs nested within aggregates. in order for everything to work properly, these should be removed
         // as well
         template<typename AggDecl>

src/SynTree/ReferenceToType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  2 17:45:07 2017
-// Update Count     : 23
+// Last Modified On : Thu Feb 23 16:38:54 2017
+// Update Count     : 24
 //
 
@@ -23 +23 @@
 #include "Common/utility.h"
 
-ReferenceToType::ReferenceToType( const Type::Qualifiers &tq, const std::string &name, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), name( name ) {
+ReferenceToType::ReferenceToType( const Type::Qualifiers &tq, const std::string &name, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), name( name ), hoistType( false ) {
 }
 
-ReferenceToType::ReferenceToType( const ReferenceToType &other ) : Type( other ), name( other.name ) {
+ReferenceToType::ReferenceToType( const ReferenceToType &other ) : Type( other ), name( other.name ), hoistType( other.hoistType ) {
         cloneAll( other.parameters, parameters );
 }

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  2 17:43:01 2017
-// Update Count     : 33
+// Last Modified On : Thu Feb 23 16:38:53 2017
+// Update Count     : 34
 //
 
@@ -240 +240 @@
         void set_name( std::string newValue ) { name = newValue; }
         std::list< Expression* >& get_parameters() { return parameters; }
+        bool get_hoistType() const { return hoistType; }
+        void set_hoistType( bool newValue ) { hoistType = newValue; }
 
         virtual ReferenceToType *clone() const = 0;
@@ -250 +252 @@
         std::string name;
   private:
+        bool hoistType;
 };
 

src/libcfa/concurrency/invoke.h

@@ -60 +60 @@
 
       struct coStack_t {
-            unsigned int size;          // size of stack
-            void *storage;                      // pointer to stack
-            void *limit;                        // stack grows towards stack limit
-            void *base;                         // base of stack
-            void *context;                      // address of cfa_context_t
-            void *top;                          // address of top of storage
+            unsigned int size;                // size of stack
+            void *storage;                            // pointer to stack
+            void *limit;                              // stack grows towards stack limit
+            void *base;                               // base of stack
+            void *context;                            // address of cfa_context_t
+            void *top;                                // address of top of storage
             bool userStack;     
       };
@@ -73 +73 @@
       struct coroutine {
             struct coStack_t stack;
-            const char *name;                   // textual name for coroutine/task, initialized by uC++ generated code
-            int errno_;                         // copy of global UNIX variable errno
-            enum coroutine_state state; // current execution status for coroutine
-            struct coroutine *starter;  // first coroutine to resume this one
-            struct coroutine *last;             // last coroutine to resume this one
+            const char *name;                         // textual name for coroutine/task, initialized by uC++ generated code
+            int errno_;                               // copy of global UNIX variable errno
+            enum coroutine_state state;       // current execution status for coroutine
+            struct coroutine *starter;        // first coroutine to resume this one
+            struct coroutine *last;                   // last coroutine to resume this one
       };
 
       struct thread {
-            struct coroutine c;           // coroutine body used to store context
-            struct signal_once terminated;// indicate if execuation state is not halted
-            struct thread * next;         // instrusive link field for threads
+            struct coroutine c;                 // coroutine body used to store context
+            struct signal_once terminated;      // indicate if execuation state is not halted
+            struct thread * next;               // instrusive link field for threads
       };
 

src/libcfa/concurrency/monitor

@@ -21 +21 @@
 #include "invoke.h"
 
-struct monitor {
+struct __monitor_t {
         spinlock lock;
-        thread * holder;
+        thread * owner;
         simple_thread_list entry_queue;
+        unsigned int recursion;
 };
 
-void enter(monitor *);
-void leave(monitor *);
+static inline void ?{}(__monitor_t * this) {
+        this->owner = 0;
+        this->recursion = 0;
+}
 
-struct monitor_guard {
-        monitor * m;
+void enter(__monitor_t *);
+void leave(__monitor_t *);
+
+struct monitor_guard_t {
+        __monitor_t * m;
 };
 
-static inline void ?{}( monitor_guard * this, monitor * m ) {
+static inline void ?{}( monitor_guard_t * this, __monitor_t * m ) {
         this->m = m;
         enter( this->m );
 }
 
-static inline void ^?{}( monitor_guard * this ) {
+static inline void ^?{}( monitor_guard_t * this ) {
         leave( this->m );
 }

src/libcfa/concurrency/monitor.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// monitor.c --
+// __monitor_t.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(monitor * this) {
+void enter(__monitor_t * this) {
         lock( &this->lock );
         thread * thrd = this_thread();
 
-        if( this->holder ) {
+        if( !this->owner ) {
+                //No one has the monitor, just take it
+                this->owner = thrd;
+                this->recursion = 1;
+        }
+        else if( this->owner == thrd) {
+                //We already have the monitor, just not how many times we took it
+                assert( this->recursion > 0 );
+                this->recursion += 1;
+        }
+        else {
+                //Some one else has the monitor, wait in line for it
                 append( &this->entry_queue, thrd );
                 ScheduleInternal( &this->lock );
-                return;
-        }
-        else {
-                this->holder = thrd;
+
+                //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                return; 
         }
 
@@ -35 +45 @@
 }
 
-void leave(monitor * this) {
+void leave(__monitor_t * this) {
         lock( &this->lock );
 
         thread * thrd = this_thread();
-        assert( thrd == this->holder );
+        assert( thrd == this->owner );
 
-        this->holder = pop_head( &this->entry_queue );
+        //Leaving a recursion level, decrement the counter
+        this->recursion -= 1;
+
+        //If we left the last level of recursion it means we are changing who owns the monitor
+        thread * new_owner = 0;
+        if( this->recursion == 0) {
+                //Get the next thread in the list
+                new_owner = this->owner = pop_head( &this->entry_queue );
+
+                //We are passing the monitor to someone else, which means recursion level is not 0
+                this->recursion = new_owner ? 1 : 0;
+        }       
 
         unlock( &this->lock );
 
-        if( this->holder ) ScheduleThread( this->holder );
+        //If we have a new owner, we need to wake-up the thread
+        if( new_owner ) {
+                ScheduleThread( new_owner );
+        }
 }

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 18:01:09 2016
-// Update Count     : 93
+// Last Modified On : Fri Feb 24 21:09:09 2017
+// Update Count     : 94
 //
 
@@ -45 +45 @@
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, signed char );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned char );
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, short int );

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 18:01:39 2016
-// Update Count     : 306
+// Last Modified On : Fri Feb 24 21:09:59 2017
+// Update Count     : 307
 //
 
@@ -26 +26 @@
 ostype * ?|?( ostype *os, char c ) {
         prtfmt( os, "%c", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, signed char c ) {
+        prtfmt( os, "%hhd", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned char c ) {
+        prtfmt( os, "%hhu", c );
         sepOff( os );
         return os;

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 14:11:47 2017
-// Update Count     : 100
+// Last Modified On : Fri Feb 24 21:07:16 2017
+// Update Count     : 101
 //
 
@@ -95 +95 @@
 //---------------------------------------
 
-char abs( char );
+unsigned char abs( signed char );
 extern "C" { int abs( int ); }                                                  // use default C routine for int
-long int abs( long int );
-long long int abs( long long int );
+unsigned long int abs( long int );
+unsigned long long int abs( long long int );
 float abs( float );
 double abs( double );

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 14:11:29 2017
-// Update Count     : 170
+// Last Modified On : Fri Feb 24 21:08:11 2017
+// Update Count     : 171
 //
 
@@ -240 +240 @@
 //---------------------------------------
 
-char abs( char v ) { return abs( (int)v ); }
-long int abs( long int v ) { return labs( v ); }
-long long int abs( long long int v ) { return llabs( v ); }
+unsigned char abs( signed char v ) { return abs( (int)v ); }
+unsigned long int abs( long int v ) { return labs( v ); }
+unsigned long long int abs( long long int v ) { return llabs( v ); }
 float abs( float x ) { return fabsf( x ); }
 double abs( double x ) { return fabs( x ); }

src/tests/monitor.c

@@ -6 +6 @@
 struct global_t {
         int value;
-        monitor m;
+        __monitor_t m;
 };
 
@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        monitor_guard g = { &this->m };
-        this->value += 1;
+        monitor_guard_t g1 = { &this->m };
+        {
+                monitor_guard_t g2 = { &this->m };
+                {
+                        monitor_guard_t g3 = { &this->m };
+                        this->value += 1;
+                }
+        }
 }