Changeset a362f97 for src/examples

Timestamp:

Jan 27, 2017, 3:27:34 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c0aa336

Parents:

6acb935 (diff), 0a86a30 (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 plg2:software/cfa/cfa-cc

Location:

src/examples

Files:

• a.out (added)
• thread.c (modified) (3 diffs)

src/examples/thread.c

@@ +1 @@
+#include <fstream>
 #include <kernel>
 #include <stdlib>
@@ -4 +5 @@
 
 // Start coroutine routines
-extern "C" {
-      forall(dtype T | is_coroutine(T))
-      void CtxInvokeCoroutine(T * this);
-
-      forall(dtype T | is_coroutine(T))
-      void CtxStart(T * this, void ( *invoke)(T *));
-
-        forall(dtype T | is_coroutine(T))
-      void CtxInvokeThread(T * this);
-}
-
 struct MyThread {
-        thread_h t;
+        thread t;
         unsigned id;
         unsigned count;
 };
 
+DECL_THREAD(MyThread)
+
 void ?{}( MyThread * this ) {
-        this->id = 0;
-        this->count = 10;
 }
 
@@ -31 +21 @@
 }
 
-void ^?{}( MyThread * this ) {}
-
 void main(MyThread* this) {
-        printf("Main called with %p\n", this);
-        printf("Thread %d : Suspending %d times\n", this->id, this->count);
+        sout | "Thread" | this->id | " : Suspending" | this->count | "times" | endl;
+        yield();
 
         for(int i = 0; i < this->count; i++) {
-                printf("Thread %d : Suspend No. %d\n", this->id, i + 1);
-                printf("Back to %p\n", &this->t.c);
-                suspend();
+                sout | "Thread" | this->id | " : Suspend No." | i + 1 | endl;
+                yield();
         }
 }
 
-thread_h* get_thread(MyThread* this) {
-        return &this->t;
-}
+int main(int argc, char* argv[]) {
 
-coroutine* get_coroutine(MyThread* this) {
-        return &this->t.c;
-}
+        unsigned itterations = 10u;
+        if(argc == 2) { 
+                int val = ato(argv[1]);
+                assert(val >= 0);
+                itterations = val;
+        }
 
-int main() {
+        sout | "User main begin" | endl;
 
-        thread(MyThread) thread1;
-        thread(MyThread) thread2;
+        {
+                processor p;
+                {
+                        scoped(MyThread) thread1 = { 1u, itterations };
+                        scoped(MyThread) thread2 = { 2u, itterations };
+                }
+        }
 
-        thread2.handle.id = 1;
-
-        printf("\n\nMain is %p\n", this_coroutine());
-
-        kernel_run();
-
-        printf("Kernel terminated correctly\n");
+        sout | "User main end" | endl;
 
         return 0;