Changeset 9f5ecf5

Timestamp:

Sep 13, 2017, 2:14:55 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:

e3e16bc

Parents:

9dcb653

Message:

Skeleton for waitfor language support

Location:

src

Files:

• Concurrency/Keywords.cc (modified) (4 diffs)
• Concurrency/Waitfor.cc (added)
• Concurrency/Waitfor.h (added)
• Concurrency/module.mk (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• libcfa/concurrency/monitor (modified) (1 diff)
• main.cc (modified) (2 diffs)
• tests/sched-ext-parse.c (added)

src/Concurrency/Keywords.cc

@@ -259 +259 @@
         //=============================================================================================
         void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
-                if( decl->get_name() == type_name && decl->has_body() ) {
+                if( decl->name == type_name && decl->body ) {
                         assert( !type_decl );
                         type_decl = decl;
@@ -270 +270 @@
 
         void ConcurrentSueKeyword::handle( StructDecl * decl ) {
-                if( ! decl->has_body() ) return;
+                if( ! decl->body ) return;
 
                 if( !type_decl ) throw SemanticError( context_error, decl );
@@ -418 +418 @@
         void MutexKeyword::postvisit(StructDecl* decl) {
 
-                if( decl->get_name() == "monitor_desc" ) {
+                if( decl->name == "monitor_desc" ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
                 }
-                else if( decl->get_name() == "monitor_guard_t" ) {
+                else if( decl->name == "monitor_guard_t" ) {
                         assert( !guard_decl );
                         guard_decl = decl;
@@ -524 +524 @@
         //=============================================================================================
         void ThreadStarter::postvisit(FunctionDecl * decl) {
-                if( ! CodeGen::isConstructor(decl->get_name()) ) return;
+                if( ! CodeGen::isConstructor(decl->name) ) return;
 
                 DeclarationWithType * param = decl->get_functionType()->get_parameters().front();

src/Concurrency/module.mk

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## module.mk -- 
+## module.mk --
 ##
 ## Author           : Thierry Delisle
 ## Created On       : Mon Mar 13 12:48:40 2017
-## Last Modified By : 
-## Last Modified On : 
+## Last Modified By :
+## Last Modified On :
 ## Update Count     : 0
 ###############################################################################
 
-SRC += Concurrency/Keywords.cc 
+SRC += Concurrency/Keywords.cc \
+       Concurrency/Waitfor.cc
 

src/Makefile.in

@@ -159 +159 @@
         CodeTools/driver_cfa_cpp-TrackLoc.$(OBJEXT) \
         Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT) \
+        Concurrency/driver_cfa_cpp-Waitfor.$(OBJEXT) \
         Common/driver_cfa_cpp-SemanticError.$(OBJEXT) \
         Common/driver_cfa_cpp-UniqueName.$(OBJEXT) \
@@ -490 +491 @@
         CodeGen/OperatorTable.cc CodeTools/DeclStats.cc \
         CodeTools/TrackLoc.cc Concurrency/Keywords.cc \
-        Common/SemanticError.cc Common/UniqueName.cc \
-        Common/DebugMalloc.cc Common/Assert.cc \
+        Concurrency/Waitfor.cc Common/SemanticError.cc \
+        Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
@@ -663 +664 @@
         @: > Concurrency/$(DEPDIR)/$(am__dirstamp)
 Concurrency/driver_cfa_cpp-Keywords.$(OBJEXT):  \
+        Concurrency/$(am__dirstamp) \
+        Concurrency/$(DEPDIR)/$(am__dirstamp)
+Concurrency/driver_cfa_cpp-Waitfor.$(OBJEXT):  \
         Concurrency/$(am__dirstamp) \
         Concurrency/$(DEPDIR)/$(am__dirstamp)
@@ -995 +999 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/driver_cfa_cpp-UniqueName.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/driver_cfa_cpp-Keywords.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ExceptTranslate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-ForExprMutator.Po@am__quote@
@@ -1263 +1268 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Concurrency/driver_cfa_cpp-Keywords.obj `if test -f 'Concurrency/Keywords.cc'; then $(CYGPATH_W) 'Concurrency/Keywords.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Keywords.cc'; fi`
 
+Concurrency/driver_cfa_cpp-Waitfor.o: Concurrency/Waitfor.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Waitfor.o -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo -c -o Concurrency/driver_cfa_cpp-Waitfor.o `test -f 'Concurrency/Waitfor.cc' || echo '$(srcdir)/'`Concurrency/Waitfor.cc
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Concurrency/Waitfor.cc' object='Concurrency/driver_cfa_cpp-Waitfor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Concurrency/driver_cfa_cpp-Waitfor.o `test -f 'Concurrency/Waitfor.cc' || echo '$(srcdir)/'`Concurrency/Waitfor.cc
+
+Concurrency/driver_cfa_cpp-Waitfor.obj: Concurrency/Waitfor.cc
+@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Concurrency/driver_cfa_cpp-Waitfor.obj -MD -MP -MF Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo -c -o Concurrency/driver_cfa_cpp-Waitfor.obj `if test -f 'Concurrency/Waitfor.cc'; then $(CYGPATH_W) 'Concurrency/Waitfor.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Waitfor.cc'; fi`
+@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Tpo Concurrency/$(DEPDIR)/driver_cfa_cpp-Waitfor.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Concurrency/Waitfor.cc' object='Concurrency/driver_cfa_cpp-Waitfor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Concurrency/driver_cfa_cpp-Waitfor.obj `if test -f 'Concurrency/Waitfor.cc'; then $(CYGPATH_W) 'Concurrency/Waitfor.cc'; else $(CYGPATH_W) '$(srcdir)/Concurrency/Waitfor.cc'; fi`
+
 Common/driver_cfa_cpp-SemanticError.o: Common/SemanticError.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Common/driver_cfa_cpp-SemanticError.o -MD -MP -MF Common/$(DEPDIR)/driver_cfa_cpp-SemanticError.Tpo -c -o Common/driver_cfa_cpp-SemanticError.o `test -f 'Common/SemanticError.cc' || echo '$(srcdir)/'`Common/SemanticError.cc

src/libcfa/concurrency/monitor

@@ -103 +103 @@
         unsigned short count;
         monitor_desc ** monitors;
+        bool is_dtor;
 };
 

src/main.cc

@@ -39 +39 @@
 #include "Common/UnimplementedError.h"      // for UnimplementedError
 #include "Common/utility.h"                 // for deleteAll, filter, printAll
+#include "Concurrency/Waitfor.h"            // for generateWaitfor
 #include "ControlStruct/ExceptTranslate.h"  // for translateEHM
 #include "ControlStruct/Mutate.h"           // for mutate
@@ -304 +305 @@
                 ControlStruct::translateEHM( translationUnit );
 
+                OPTPRINT( "generateWaitfor" );
+                Concurrency::generateWaitFor( translationUnit );
+
                 OPTPRINT( "convertSpecializations" ) // needs to happen before tuple types are expanded
                 GenPoly::convertSpecializations( translationUnit );