Changes in / [2325b57:00f89a6]

Location:

doc/uC++toCFA

Files:

• .gitignore (modified) (1 diff)
• uC++toCFA.tex (modified) (5 diffs)

doc/uC++toCFA/.gitignore

@@ -3 +3 @@
 *.pdf
 *.ps
-*.cc
-*.cfa

doc/uC++toCFA/uC++toCFA.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Nov 13 18:09:58 2024
-%% Update Count     : 6207
+%% Last Modified On : Mon Nov 11 21:51:39 2024
+%% Update Count     : 6144
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -540 +540 @@
 
 
-\section{Thread}
-
-\begin{cquote}
-\begin{tabular}{@{}l|ll@{}}
-\begin{uC++}
-
-@_Task@ T {
-        // private task fields
-        void main() {
-                ... @_Resume E( ... ) _At partner@;
-                ... @uThisTask();@ ...
-        }
-  public:
-};
-\end{uC++}
-&
-\begin{cfa}
-#include <$thread$.hfa>
-@thread@ T {
-        // private task fields
-
-};
-void main( @T & t@ ) {
-        ... @resumeAt( partner, ExceptionInst( E, ... )@ );
-        ... @active_thread();@ ...
-}
-\end{cfa}
-\\
-\multicolumn{2}{@{}l@{}}{\lstinline{T t; // start thread in main routine}}
-\end{tabular}
-\end{cquote}
-
-
 \section{\lstinline{COBEGIN}/\lstinline{COFOR}}
 
@@ -691 +658 @@
 
 
+\section{Thread}
+
+\begin{cquote}
+\begin{tabular}{@{}l|ll@{}}
+\begin{uC++}
+
+@_Task@ T {
+        // private task fields
+        void main() {
+                ... _Resume E( ... ) _At partner;
+                ... uThisTask(); ...
+        }
+  public:
+};
+\end{uC++}
+&
+\begin{cfa}
+#include <$thread$.hfa>
+@thread@ T {
+        // private task fields
+
+};
+void main( @T & t@ ) {
+        ... resumeAt( partner, ExceptionInst( E, ... ) );
+        ... active_thread(); ...
+}
+\end{cfa}
+\\
+\multicolumn{2}{@{}l@{}}{\lstinline{T t; // start thread in main routine}}
+\end{tabular}
+\end{cquote}
+
+
 \section{Locks}
 
@@ -721 +721 @@
 \end{cquote}
 
-
-\section{Barrier}
-
-\begin{cquote}
-\begin{tabular}{@{}l|ll@{}}
-\begin{uC++}
-#include <iostream>
-using namespace std;
-#include <uBarrier.h>
-
-@_Cormonitor@ Barrier
-                : @public uBarrier@ { // inheritance
-        int total;
-  public:
-        Barrier( unsigned int group ) :
-                        @uBarrier( group )@ {
-                total = 0;
-        }
-        void @block@( int subtotal ) {
-                total += subtotal;
-                @uBarrier::block();@
-        }
-  private:
-        void @last@() { cout << total << endl; }
-};
-enum { N = 3 };
-Barrier b{ N };
-
-_Task T {
-        void main() {
-                for ( int i = 0; i < 10; i += 1 ) {
-                        b.block( 1 );
-                }
-        }
-};
-int main() {
-        uProcessor p[N - 1];
-        T t[N];
-}
-\end{uC++}
-&
-\begin{cfa}
-#include <fstream.hfa>
-#include <$thread$.hfa>
-#include <barrier.hfa>
-#include <mutex_stmt.hfa>
-struct Barrier {
-        @barrier b;@                    // containment
-        int total;
-};
-void ?{}( Barrier & B, unsigned int group ) with(B) {
-        @?{}( b, group );@              // initialize barrier
-        total = 0;
-}
-unsigned int block( Barrier & B, int subtotal ) with(B) {
-        @mutex( b )@ {  total += subtotal; } // use barrier's mutual exclusion
-        void @last@() { sout | total; } // called by Gth arriving thread
-        @block@( b, last ); // wait for barrier trigger
-}
-
-
-enum { N = 3 };
-Barrier b{ N };
-
-thread T {};
-void main( T & ) {
-        for ( 10 ) {
-                block( b, 1 );
-        }
-}
-
-int main() {
-        processor p[N - 1];
-        T t[N];
-}
-\end{cfa}
-\end{tabular}
-\end{cquote}
-
-\newpage
 
 \section{Monitor}
@@ -869 +789 @@
 \end{cquote}
 
-\enlargethispage{1000pt}
+\newpage
 
 External Scheduling