Changeset ef42b143

Timestamp:

Mar 16, 2017, 5:20:16 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:

3743983

Parents:

1fbab5a

Message:

Implemented monitor keyword, and it works

Location:

src

Files:

• Concurrency/Keywords.cc (modified) (6 diffs)
• SynTree/Type.h (modified) (1 diff)
• main.cc (modified) (1 diff)
• tests/monitor.c (modified) (1 diff)
• tests/multi-monitor.c (modified) (1 diff)

src/Concurrency/Keywords.cc

@@ -111 +111 @@
           private:
                 StructDecl* monitor_decl = nullptr;
+                StructDecl* guard_decl = nullptr;
         };
 
@@ -137 +138 @@
                 if( ! body ) return;
 
-                assert(monitor_decl);
                 addStatments( body, mutexArgs );
         }
@@ -146 +146 @@
                         monitor_decl = decl;
                 }
+                else if( decl->get_name() == "monitor_guard_t" ) {
+                        assert( !guard_decl );
+                        guard_decl = decl;
+                }
         }
 
@@ -175 +179 @@
 
                 //Make sure that typed isn't mutex
-                if( ! base->get_qualifiers().isMutex ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
+                if( base->get_qualifiers().isMutex ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
         }
 
         void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+                assert(monitor_decl);
+                assert(guard_decl);
 
                 ObjectDecl * monitors = new ObjectDecl(
@@ -218 +224 @@
                                 new StructInstType(
                                         noQualifiers,
-                                        "monitor_guard_t"
+                                        guard_decl
                                 ),
                                 new ListInit(
@@ -224 +230 @@
                                                 new SingleInit( new VariableExpr( monitors ) ),
                                                 new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
-                                        }
+                                        },
+                                        noDesignators,
+                                        true
                                 )
                         ))
                 );
 
-                //monitor_desc * __monitors[] = { a, b };
+                //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
                 body->push_front( new DeclStmt( noLabels, monitors) );
         }

src/SynTree/Type.h

@@ -92 +92 @@
                 bool operator<=( Qualifiers other ) const {
                         return isConst <= other.isConst && isVolatile <= other.isVolatile &&
-                                isMutex == other.isMutex && isAtomic == other.isAtomic;
+                                isMutex >= other.isMutex && isAtomic == other.isAtomic;
                 }
                 bool operator>=( Qualifiers other ) const {
                         return isConst >= other.isConst && isVolatile >= other.isVolatile &&
-                                isMutex == other.isMutex && isAtomic == other.isAtomic;
+                                isMutex <= other.isMutex && isAtomic == other.isAtomic;
                 }
                 bool operator<( Qualifiers other ) const {

src/main.cc

@@ -241 +241 @@
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "tweakInit" )
+                OPTPRINT( "genInit" )
                 InitTweak::genInit( translationUnit );
                 OPTPRINT( "expandMemberTuples" );

src/tests/monitor.c

@@ -13 +13 @@
 }
 
+monitor_desc * get_monitor( global_t * this ) {
+        return &this->m;
+}
+
 static global_t global;
 
-void increment( /*mutex*/ global_t * this ) {
-        monitor_desc * mon = &this->m;
-        monitor_guard_t g1 = { &mon };
-        {
-                monitor_guard_t g2 = { &mon };
-                {
-                        monitor_guard_t g3 = { &mon };
-                        this->value += 1;
-                }
-        }
+void increment3( global_t * mutex this ) {
+        this->value += 1;
+}
+
+void increment2( global_t * mutex this ) {
+        increment3( this );
+}
+
+void increment( global_t * mutex this ) {
+        increment2( this );
 }
 

src/tests/multi-monitor.c

@@ -6 +6 @@
 static int global12, global23, global13;
 
-static monitor_desc m1, m2, m3;
+struct monitor_t {
+        monitor_desc m;
+};
 
-void increment( /*mutex*/ monitor_desc * p1, /*mutex*/ monitor_desc * p2, int * value ) {
-        monitor_desc * mons[] = { p1, p2 };
-        monitor_guard_t g = { mons, 2 };
+monitor_desc * get_monitor( monitor_t * this ) {
+        return &this->m;
+}
+
+static monitor_t m1, m2, m3;
+
+void increment( monitor_t * mutex p1, monitor_t * mutex p2, int * value ) {
         *value += 1;
 }