Changeset 615767b for doc

Timestamp:

Oct 1, 2020, 3:54:39 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

91131689

Parents:

ebec8ed (diff), dd53f75 (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 into master

Location:

doc/theses/thierry_delisle_PhD/code/readQ_example

Files:

• Makefile (added)
• proto-gui/main.cpp (modified) (12 diffs)
• thrdlib/Makefile (added)
• thrdlib/cforall.cpp (added)
• thrdlib/fibre.cpp (added)
• thrdlib/pthread.cpp (moved) (moved from doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/thread_pthread.h) (3 diffs)
• thrdlib/thread.cpp (added)
• thrdlib/thread.h (deleted)
• thrdlib/thread.hpp (added)

doc/theses/thierry_delisle_PhD/code/readQ_example/proto-gui/main.cpp

@@ -1 @@
-#include "thrdlib/thread.h"
+#include "thrdlib/thread.hpp"
 
 #include <cassert>
@@ -5 +5 @@
 #include <algorithm>
 #include <atomic>
+#include <iostream>
 #include <memory>
 #include <vector>
 
 #include <getopt.h>
+using thrdlib::thread_t;
+
+
+extern __attribute__((aligned(128))) thread_local struct {
+        void * volatile this_thread;
+        void * volatile this_processor;
+        void * volatile this_stats;
+
+        struct {
+                volatile unsigned short disable_count;
+                volatile bool enabled;
+                volatile bool in_progress;
+        } preemption_state;
+
+        #if defined(__SIZEOF_INT128__)
+                __uint128_t rand_seed;
+        #else
+                uint64_t rand_seed;
+        #endif
+        struct {
+                uint64_t fwd_seed;
+                uint64_t bck_seed;
+        } ready_rng;
+} kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
 
 //--------------------
@@ -36 +61 @@
                         assert( expected == reset );
                         if( std::atomic_compare_exchange_strong( &state, &expected, self) ) {
-                                thrdlib_park( self );
+                                thrdlib::park( self );
                                 ret = true;
                                 goto END;
@@ -54 +79 @@
                 if( got == reset ) return false;
 
-                thrdlib_unpark( got );
+                thrdlib::unpark( got );
                 return true;
         }
@@ -109 +134 @@
         the_stats_thread = self;
         fence();
-        thrdlib_park( self );
+        thrdlib::park( self );
 
         std::vector<bool> seen;
@@ -115 +140 @@
 
         while(last_produced < nproduce) {
-                thrdlib_yield();
+                thrdlib::yield();
                 thrd_stats.stats.ran++;
                 if( last_produced > 0 ) seen.at(last_produced - 1) = true;
@@ -147 +172 @@
 
 void Renderer( thread_t self ) {
-        thrdlib_unpark( the_stats_thread );
+        thrdlib::unpark( the_stats_thread );
         for(unsigned i = 0; i < nproduce; i++) {
                 auto & frame = frames[i % nframes];
@@ -178 +203 @@
         fsize    = 1000;
         nproduce = 60;
+
+        const char * framework;
 
         for(;;) {
@@ -196 +223 @@
                         case -1:
                                 /* paranoid */ assert(optind <= argc);
+                                if( optind == argc ) {
+                                        std::cerr << "Must specify a framework" << std::endl;
+                                        goto usage;
+
+                                }
+                                framework = argv[optind];
                                 goto run;
                         case 'b':
@@ -228 +261 @@
                                 std::cerr << opt << std::endl;
                         usage:
-                                std::cerr << "Usage: " << argv[0] << " [options]" << std::endl;
+                                std::cerr << "Usage: " << argv[0] << " [options] framework" << std::endl;
                                 std::cerr << std::endl;
                                 std::cerr << "  -b, --buff=COUNT    Number of frames to buffer" << std::endl;
@@ -237 +270 @@
         }
         run:
+        assert( framework );
 
         frames.reset(new Frame[nframes]);
@@ -246 +280 @@
         std::cout << "(Buffering " << nframes << ")" << std::endl;
 
-        thrdlib_setproccnt( 2 );
-
-        thread_t stats     = thrdlib_create( Stats     );
+        thrdlib::init( framework, 2 );
+
+        thread_t stats     = thrdlib::create( Stats );
         std::cout << "Created Stats Thread" << std::endl;
-        while( the_stats_thread == nullptr ) thrdlib_yield();
+        while( the_stats_thread == nullptr ) thrdlib::yield();
+
         std::cout << "Creating Main Threads" << std::endl;
-        thread_t renderer  = thrdlib_create( Renderer  );
-        // while(true);
-        thread_t simulator = thrdlib_create( Simulator );
+        thread_t renderer  = thrdlib::create( Renderer  );
+        thread_t simulator = thrdlib::create( Simulator );
 
         std::cout << "Running" << std::endl;
 
-        thrdlib_join( simulator );
-        thrdlib_join( renderer  );
-        thrdlib_join( stats     );
+        thrdlib::join( simulator );
+        thrdlib::join( renderer  );
+        thrdlib::join( stats     );
+
+        thrdlib::clean();
 
         std::cout << "----------" << std::endl;

doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/pthread.cpp

@@ -1 @@
-#pragma once
-
 #include <pthread.h>
 #include <errno.h>
@@ -56 +54 @@
 #undef CHECKED
 
-#if defined(__cforall) || defined(__cpluplus)
+//--------------------
+// Basic types
+struct pthread_runner_t {
+        pthread_t handle;
+        __bin_sem_t sem;
+};
+typedef pthread_runner_t * thread_t;
+
+static_assert(sizeof(thread_t) == sizeof(void*), "thread_t musst be of same size as void*");
+
 extern "C" {
-#endif
-        //--------------------
-        // Basic types
-        struct pthread_runner_t {
-                pthread_t handle;
-                __bin_sem_t sem;
-        };
-        typedef pthread_runner_t * thread_t;
-
         //--------------------
         // Basic thread support
@@ -98 +96 @@
         //--------------------
         // Basic kernel features
-        void thrdlib_setproccnt( int ) {
-
-        }
-
-
-#if defined(__cforall) || defined(__cpluplus)
+        void thrdlib_init( int ) {}
 }
-#endif