Changeset fcc57ba

Timestamp:

Sep 25, 2018, 10:14:14 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

41cca44

Parents:

e523b07 (diff), ec71a50 (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:

• doc/bibliography/pl.bib (modified) (34 diffs)
• src/CodeTools/ResolvProtoDump.cc (modified) (7 diffs)
• tools/cfa.nanorc (modified) (3 diffs)

doc/bibliography/pl.bib

@@ -701 +701 @@
 % B
 
+@article{Michael13,
+    contributer = {pabuhr@plg},
+    author      = {Maged M. Michael},
+    title       = {The Balancing Act of Choosing Nonblocking Features},
+    journal     = cacm,
+    volume      = 56,
+    number      = 9,
+    month       = sep,
+    year        = 2013,
+    pages       = {46--53},
+    publisher   = {ACM},
+    address     = {New York, NY, USA},
+}
+
 @incollection{beta:old,
     keywords    = {beta, patterns, virtual types},
@@ -908 +922 @@
 
 @misc{Cforall,
+    contributer = {pabuhr@plg},
     key         = {Cforall},
-    title       = {\textsf{C}{$\mathbf{\forall}$} Features},
-    howpublished= {\url{https://plg.uwaterloo.ca/~cforall/features}},
+    author      = {{\textsf{C}{$\mathbf{\forall}$} Features}},
+    howpublished= {\href{https://plg.uwaterloo.ca/~cforall/features}{https://\-plg.uwaterloo.ca/\-~cforall/\-features}},
     optnote     = {Accessed: 2018-01-01},
 }
@@ -926 +941 @@
 
 @misc{CFAStackEvaluation,
+    contributer = {a3moss@plg},
     author      = {Aaron Moss},
     title       = {\textsf{C}$\mathbf{\forall}$ Stack Evaluation Programs},
@@ -934 +950 @@
 
 @article{Moss18,
-    keywords    = {concurrency, C++},
+    keywords    = {type systems, tuples, Cforall},
     contributer = {pabuhr@plg},
     author      = {Aaron Moss and Robert Schluntz and Peter A. Buhr},
@@ -941 +957 @@
     month       = aug,
     journal     = spe,
-    note        = {http://dx.doi.org/10.1002/spe.2624},
+    note        = {\href{http://dx.doi.org/10.1002/spe.2624}{http://\-dx.doi.org/\-10.1002/\-spe.2624}},
 }
 
@@ -1417 +1433 @@
 }
 
+@misc{NThreadCode13,
+    keywords    = {N-thread software-solution mutual exclusion},
+    contributer = {pabuhr@plg},
+    key         = {concurrent locking},
+    author      = {Peter A. Buhr and David Dice and Wim H. Hesselink},
+    title       = {concurrent-locking},
+    howpublished= {\href{https://github.com/pabuhr/concurrent-locking}{https://\-github.com/\-pabuhr/\-concurrent-locking}},
+    optnote     = {[Accessed April 2017]},
+}
+
 @incollection{Reppy93,
     keywords    = {ML, concurrency, continuation passing},
@@ -1490 +1516 @@
     month       = dec,
     year        = 2017,
-    note        = {\href{http://plg.uwaterloo.ca/~usystem/pub/uSystem/u++-7.0.0.sh}{http://\-plg.\-uwaterloo.\-ca/\-$\sim$usystem/\-pub/\-uSystem/\-u++-7.0.0.sh}},
+    note        = {\href{https://plg.uwaterloo.ca/~usystem/pub/uSystem/uC++.pdf}{https://\-plg.uwaterloo.ca/\-~usystem/\-pub/\-uSystem/uC++.pdf}},
 }
 
@@ -1557 +1583 @@
 }
 
+@mastersthesis{Sun15,
+    author      = {Sun, Xianda},
+    title       = {Concurrent High-performance Persistent Hash Table In {J}ava},
+    school      = {School of Computer Science, University of Waterloo},
+    year        = 2015,
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
+    note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/10013}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-10013}},
+}
+
 @book{Andrews91:book,
     keywords    = {concurrency},
@@ -1581 +1616 @@
 
 @mastersthesis{Delisle18,
+    keywords    = {concurrency, Cforall},
+    contributer = {pabuhr@plg},
     author      = {Thierry Delisle},
     title       = {Concurrency in \textsf{C}$\mathbf{\forall}$},
     school      = {School of Computer Science, University of Waterloo},
     year        = 2018,
-    address     = {Waterloo, Ontario, Canada, N2L 3G1},
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
     note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/12888}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-12888}},
+}
+
+@article{Delisle18b,
+    keywords    = {concurrency, Cforall},
+    contributer = {pabuhr@plg},
+    author      = {Thierry Delisle and Peter A. Buhr},
+    title       = {Concurrency in \textsf{C}$\mathbf{\forall}$},
+    year        = 2018,
+    journal     = spe,
+    pages       = {1-32},
+    note        = {submitted},
 }
 
@@ -2865 +2913 @@
     keywords    = {concurrency, mutual exclusion, performance experiment, software solutions},
     title       = {Fast mutual exclusion by the {T}riangle algorithm},
-    author      = {Wim H. Hesselink and Peter Buhr and David Dice},
+    author      = {Wim H. Hesselink and Peter A. Buhr and David Dice},
     journal     = ccpe,
     volume      = 30,
@@ -2872 +2920 @@
     month       = feb,
     publisher   = {John Wiley \& Sons},
-    note        = {\url{https://doi.org/10.1002/cpe.4183}}
+    note        = {\href{https://doi.org/10.1002/cpe.4183}{https://\-doi.org/\-10.1002/\-cpe.4183}}
 }
 
@@ -3284 +3332 @@
     edition     = {{S}imon {M}arlow},
     year        = 2010,
-    note        = {\href{https://haskell.org/definition/haskell2010.pdf}{https://haskell.org/\-definition/\-haskell2010.pdf}},
+    note        = {\href{https://haskell.org/definition/haskell2010.pdf}{https://\-haskell.org/\-definition/\-haskell2010.pdf}},
 }
 
@@ -3358 +3406 @@
 }
 
-@article{Hesselink17,
+@article{Hesselink17b,
     keywords    = {concurrency, mutual exclusion, performance experiment, software solutions},
     title       = {High-Contention Mutual Exclusion by Elevator Algorithms},
-    author      = {Peter Buhr and David Dice and Wim H. Hesselink},
+    author      = {Peter A. Buhr and David Dice and Wim H. Hesselink},
     journal     = ccpe,
     volume      = 30,
@@ -3368 +3416 @@
     month       = sep,
     publisher   = {John Wiley \& Sons},
-    note        = {\url{https://doi-org.proxy.lib.uwaterloo.ca/10.1002/cpe.4475}}
+    note        = {\href{https://doi-org.proxy.lib.uwaterloo.ca/10.1002/cpe.4475}{https://\-doi-org.proxy.lib.uwaterloo.ca/\-10.1002/\-cpe.4475}},
 }
 
@@ -3846 +3894 @@
 
 % K
+
+@inproceedings{Buhr96b,
+    author      = {Peter A. Buhr and Martin Karsten and Jun Shih},
+    title       = {{\small\textsf{KDB}}: A Multi-threaded Debugger for Multi-threaded Applications},
+    booktitle   = {Proceedings of SPDT'96: SIGMETRICS Symposium on Parallel and Distributed Tools},
+    publisher   = {ACM Press},
+    address     = {Philadelphia, Pennsylvania, U.S.A.},
+    month       = may,
+    year        = 1996,
+    pages       = {80-87},
+}
 
 @article{Duggan96,
@@ -4534 +4593 @@
 % N
 
+@techreport{Drepper03,
+    keywords    = {NPTL, threading, 1:1 model},
+    contributer = {pabuhr@plg},
+    author      = {Ulrich Drepper and Ingo Molnar},
+    title       = {The Native POSIX Thread Library for Linux},
+    institution = {Red Hat},
+    year        = 2003,
+    note        = {\href{http://www.cs.utexas.edu/~witchel/372/lectures/POSIX_Linux_Threading.pdf}{http://www.cs.utexas.edu/\-$\sim$witchel/\-372/\-lectures/\-POSIX\_Linux\_Threading.pdf}},
+}
+
 @article{Haddon77,
     keywords    = {monitors, nested monitor calls},
@@ -4657 +4726 @@
     volume      = 9,
     pages       = {157-164},
+}
+
+@misc{nginx,
+    key         = {nginx},
+    author      = {{NGINX}},
+    howpublished= {\href{https://www.nginx.com}{https://\-www.nginx.com}},
 }
 
@@ -4769 +4844 @@
 @misc{obj-c-book,
     keywords    = {objective-c},
-    contributor = {a3moss@uwaterloo.ca},
+    contributor = {pabuhr@plg},
     key         = {Objective-C},
-    title       = {Objective-C},
+    author      = {Objective-C},
     publisher   = {Apple Inc.},
-    year        = 2015,
-    howpublished= {\href{https://developer.apple.com/library/content/documentation/General/Conceptual/DevPedia-CocoaCore/ObjectiveC.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-General/\-Conceptual/\-DevPedia-\-CocoaCore/\-ObjectiveC.html}},
+    year        = 2014,
+    howpublished= {\href{https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC}{https://\-developer.apple.com/\-library/archive/\-documentation/\-Cocoa/\-Conceptual/\-ProgrammingWithObjectiveC}},
     optnote     = {Accessed: 2018-03}
 }
@@ -4784 +4859 @@
     title       = {{X}code 7 Release Notes},
     year        = 2015,
-    howpublished= {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
+    howpublished= {\href{https://developer.apple.com/library/content/documentation/Xcode/Conceptual/RN-Xcode-Archive/Chapters/xc7_release_notes.html}{https://\-developer.apple.com/\-library/\-content/\-documentation/\-Xcode/\-Conceptual/\-RN-Xcode-Archive/\-Chapters/\-xc7\_release\_notes.html}},
     optnote     = {Accessed: 2017-04}
 }
@@ -5284 +5359 @@
 }
 
+@misc{perf,
+    contributer = {pabuhr@plg},
+    key         = {perf},
+    author      = {perf},
+    howpublished= {\href{https://perf.wiki.kernel.org/index.php/Tutorial}{https://\-perf.wiki.kernel.org/\-index.php/\-Tutorial}},
+}
+
+@misc{Verch12,
+    contributer = {pabuhr@plg},
+    author      = {Shaun Verch},
+    title       = {Performance Analysis of 64-Bit Capriccio},
+    month       = may,
+    year        = 2012,
+    howpublished= {\href{http://cs.brown.edu/research/pubs/theses/masters/2012/verch.pdf}{http://cs.brown.edu/\-research/\-pubs/\-theses/\-masters/\-2012/\-verch.pdf}},
+    optnote     = {Accessed: 2013-10-4}
+}
+
 @article{Anderson90,
     keywords    = {spin locks, back off, performance},
@@ -5504 +5596 @@
     note        = {Proceedings of the OOPSLA'89 Conference, Oct. 1--6, 1989, New Orleans, Lousiana},
     abstract    = {},
+}
+
+@inproceedings{Buhr98,
+    keywords    = {profiling, monitoring, visualization},
+    contributer = {pabuhr@plg},
+    author      = {Peter A. Buhr and Robert Denda},
+    title       = {{$\mu$Profiler} : Profiling User-Level Threads in a Shared-Memory Programming Environment},
+    booktitle   = {Proceedings of the Second International Symposium on Computing in Object-Oriented Parallel Environments (ISCOPE'98)},
+    series      = {Lecture Notes in Computer Science},
+    publisher   = {Springer-Verlag},
+    volume      = 1505,
+    opteditor   = {Dennis Caromel and Rodney R. Oldehoeft and Marydell Tholburn},
+    address     = {Santa Fe, New Mexico, U.S.A.},
+    month       = dec,
+    year        = 1998,
+    pages       = {159-166},
 }
 
@@ -5965 +6073 @@
 }
 
+@article{Ronsse03,
+    keywords    = {profiling, replay},
+    contributer = {pabuhr@plg},
+    author      = {Michiel Ronsse and De Bosschere, Koen and Mark Christiaens and Jacques Chassin de Kergommeaux and Dieter Kranzlm\"{u}ller},
+    title       = {Record/Replay for Nondeterministic Program Executions},
+    journal     = cacm,
+    month       = sep,
+    year        = 2003,
+    volume      = 46,
+    number      = 9,
+    pages       = {62-67},
+}
+
 @article{Robinson48,
     keywords    = {recursion, Ackermann function},
@@ -6003 +6124 @@
 }
 
+@mastersthesis{Schuster99,
+    author      = {Oliver Schuster},
+    title       = {Replay of Concurrent Shared-Memory Programs},
+    school      = {Universit\"at Mannheim},
+    address     = {Mannheim, Deutschland},
+    year        = 1999,
+    month       = apr,
+    type        = {Diplomarbeit},
+    note        = {\href{ftp://plg.uwaterloo.ca/pub/theses/SchusterThesis.ps.gz}{ftp://\-plg.uwaterloo.ca/\-pub/\-theses/\-SchusterThesis.ps.gz}},
+}
+
 @article{Euclid,
     keywords    = {Euclid},
@@ -6034 +6166 @@
     school      = {School of Computer Science, University of Waterloo},
     year        = 2017,
-    address     = {Waterloo, Ontario, Canada, N2L 3G1},
+    optaddress  = {Waterloo, Ontario, Canada, N2L 3G1},
     note        = {\href{https://uwspace.uwaterloo.ca/handle/10012/11830}{https://\-uwspace.uwaterloo.ca/\-handle/\-10012/\-11830}},
 }
@@ -6861 +6993 @@
     contributer = {pabuhr@plg},
     key         = {TIOBE Index},
-    title       = {{TIOBE} Index},
+    author      = {{TIOBE Index}},
     howpublished= {\href{http://www.tiobe.com/tiobe_index}{http://\-www.tiobe.com/\-tiobe\_index}},
     optnote     = {Accessed: 2018-09},
@@ -7001 +7133 @@
     year        = 1980
 }
+
+@misc{TraceCompass,
+    contributer = {pabuhr@plg},
+    key         = {Trace Compass},
+    author      = {{T}race {C}ompass},
+    howpublished= {\href{https://projects.eclipse.org/proposals/trace-compass}{https://\-projects.eclipse.org/\-proposals/\-trace-compass}},
+}
  
 @article{Leroy00,
@@ -7136 +7275 @@
     title       = {Usability Challenges in Exception Handling},
     booktitle   = {5th International Workshop on Exception Handling (WEH)},
-    organization= {16th International Symposium on the Foundations of Software Engineering (FSE 16)},
+    optorganization= {16th International Symposium on the Foundations of Software Engineering (FSE 16)},
     address     = {Zurich, Switzerland},
     month       = jun,
@@ -7280 +7419 @@
 }
 
+@inproceedings{vonBehren03,
+    keywords    = {threads, events, web server},
+    contributer = {pabuhr@plg},
+    author      = {Rob von Behren and Jeremy Condit and Eric Brewer},
+    title       = {Why Events Are a Bad Idea (for high-concurrency servers)},
+    booktitle   = {HotOS IX: The 9th Workshop on Hot Topics in Operating Systems},
+    publisher   = {USENIX Association},
+    address     = {Lihue, Hawaii, U.S.A.},
+    month       = may,
+    year        = 2003,
+    pages       = {19-24},
+}
+
 @techreport{Moss90,
     keywords    = {Swizzling, database},
@@ -7344 +7496 @@
     year        = 1986,
     editor      = {Norman Meyrowitz},
-    publisher   = sigplan # " 21(11)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Portland, Oregon},
-    month       = sep # { 29}
+    month       = sep,
 }
 
@@ -7356 +7508 @@
     year        = 1987,
     editor      = {Norman Meyrowitz},
-    publisher   = sigplan # " 22(12)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Orlando, Florida},
-    month       = oct # { 4--8}
+    month       = oct,
 }
 
@@ -7368 +7520 @@
     year        = 1988,
     editor      = {Norman Meyrowitz},
-    publisher   = sigplan # " 23(11)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {San Diego, California},
-    month       = sep # { 25--30}
+    month       = sep,
 }
 
@@ -7380 +7532 @@
     year        = 1989,
     editor      = {Norman Meyrowitz},
-    publisher   = sigplan # " 24(10)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {New Orleans, Louisiana},
-    month       = oct # { 1--6}
+    month       = oct,
 }
 
@@ -7392 +7544 @@
     year        = 1990,
     editor      = {Norman Meyrowitz},
-    publisher   = sigplan # " 25(10)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Ottawa, Canada},
-    month       = oct # { 21--25}
+    month       = oct,
 }
 
@@ -7404 +7556 @@
     year        = 1991,
     editor      = {Andreas Paepcke},
-    publisher   = sigplan # " 26(11)",
+    publisher   = sigplan,
     organization= {Association for Computing Machinery},
     address     = {Phoenix, Arizona},
-    month       = oct # { 6--11}
-}
+    month       = oct,
+}

src/CodeTools/ResolvProtoDump.cc

@@ -196 +196 @@
                         }
                         
-                        // default to just name
-                        ss << pre << name;
+                        // default to just name, with first character in lowercase
+                        ss << pre 
+                           << (char)std::tolower( static_cast<unsigned char>(name[0]) )
+                           << (name.c_str() + 1);
                 }
 
                 /// ensures type inst names are uppercase
                 static void ti_name( const std::string& name, std::stringstream& ss ) {
-                        ss << (char)std::toupper( static_cast<unsigned char>(name[0]) )
-                           << (name.c_str() + 1);
+                        unsigned i = 0;
+                        while ( i < name.size() && name[i] == '_' ) { ++i; }
+                        if ( i == name.size() ) {
+                                ss << "Anon";
+                                return;
+                        }
+                        ss << (char)std::toupper( static_cast<unsigned char>(name[i]) )
+                           << (name.c_str() + i + 1);
                 }
 
@@ -219 +227 @@
                         void previsit( BasicType* bt ) { ss << (int)bt->get_kind(); }
 
-                        // pointers represented as generic type
-                        // TODO except pointer to function
-                        void previsit( PointerType* ) { ss << "#$ptr<"; ++depth; }
-                        void postvisit( PointerType* ) { --depth; ss << '>'; }
-
-                        // arrays represented as generic type
+                        // pointers (except function pointers) represented as generic type
+                        void previsit( PointerType* pt ) {
+                                if ( ! dynamic_cast<FunctionType*>(pt->base) ) { ss << "#$ptr<"; ++depth; }
+                        }
+                        void postvisit( PointerType* pt ) {
+                                if ( ! dynamic_cast<FunctionType*>(pt->base) ) { --depth; ss << '>'; }
+                        }
+
+                        // arrays represented as generic pointers
                         void previsit( ArrayType* at ) {
-                                ss << "#$arr<";
+                                ss << "#$ptr<";
                                 ++depth;
                                 at->base->accept( *visitor );
@@ -244 +255 @@
                         }
 
-                        // encode function type as a 2-param generic type
-                        // TODO handle forall functions
+                        // print function types using prototype syntax
                         void previsit( FunctionType* ft ) {
-                                ss << "#$fn<";
+                                ss << '[';
                                 ++depth;
-                                buildAsTuple( *visitor, from_decls( ft->returnVals ), ss );
-                                ss << ' ';
-                                buildAsTuple( *visitor, from_decls( ft->parameters ), ss );
+                                build( *visitor, from_decls( ft->returnVals ), ss, preceded );
+                                ss << " : ";
+                                build( *visitor, from_decls( ft->parameters ), ss, terminated );
                                 --depth;
-                                ss << '>';
+                                ss << ']';
                                 visit_children = false;
                         }
@@ -341 +351 @@
                         }
 
-                        // print variable declaration as zero-arg function
+                        // print variable declaration in prototype syntax
                         PassVisitor<TypePrinter> printTy{ closed, ss };
                         norefs->accept( printTy );
-                        ss << ' ';
+                        ss << " &";
                         rp_name( name, ss );
                 }
@@ -381 +391 @@
                                 : closed(closed), ss(ss) {}
 
-                        /// Names handled as nullary function calls
+                        /// Names handled as name expressions
                         void previsit( NameExpr* expr ) {
+                                ss << '&';
                                 rp_name( expr->name, ss );
-                                ss << "()";
                         }
 
@@ -416 +426 @@
                         }
 
+                        /// Already-resolved calls skipped
+                        void previsit( ApplicationExpr* ) {
+                                visit_children = false;
+                        }
+
                         /// Address-of handled as operator
                         void previsit( AddressExpr* expr ) {
@@ -585 +600 @@
 
                 void previsit( FunctionDecl *decl ) {
+                        // skip decls with ftype parameters
+                        for ( TypeDecl* tyvar : decl->type->forall ) {
+                                if ( tyvar->get_kind() == TypeDecl::Ftype ) {
+                                        visit_children = false;
+                                        return;
+                                }
+                        }
+
                         // add function as declaration
                         std::stringstream ss;

tools/cfa.nanorc

@@ -2 +2 @@
 ## WIP
 
-syntax "cfa" "\.cfa"
+syntax "cfa" "\.(c|h)fa"
 
 # Macros
@@ -9 +9 @@
 # Types
 color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
-color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto)\>"
-color green "\<(static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<(float|double|bool|char|int|short|long|enum|void|auto)\>"
+color green "\<(static|const|extern|(un)?signed|inline)\>" "\<(sizeof)\>"
 color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 
@@ -19 +19 @@
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
+color brightyellow "\<(disable|enable|waitfor|when|timeout)\>"
 color brightyellow "\<(try|catch(Resume)?|finally)\>"
 
 # Control Flow Statements
 color magenta "\<(goto|return|break|continue|fallthr(u|ough)|throw(Resume)?)\>"
+
+# Escaped Keywords, now Identifiers.
+color white "`\w+`"
 
 # Operator Names