Changeset 29185fc

Timestamp:

Sep 30, 2020, 4:44:22 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4e39f51

Parents:

d035cf7

Message:

Working towards allowing different thread frameworks to be picked from the command line

Location:

doc/theses/thierry_delisle_PhD/code/readQ_example

Files:

• proto-gui/main.cpp (modified) (8 diffs)
• thrdlib/Makefile (added)
• thrdlib/fibre.cpp (moved) (moved from doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/thread_libfibre.h) (2 diffs)
• 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>
@@ -10 +10 @@
 
 #include <getopt.h>
+using thrdlib::thread_t;
+
 
 //--------------------
@@ -37 +39 @@
                         assert( expected == reset );
                         if( std::atomic_compare_exchange_strong( &state, &expected, self) ) {
-                                thrdlib_park( self );
+                                thrdlib::park( self );
                                 ret = true;
                                 goto END;
@@ -55 +57 @@
                 if( got == reset ) return false;
 
-                thrdlib_unpark( got );
+                thrdlib::unpark( got );
                 return true;
         }
@@ -110 +112 @@
         the_stats_thread = self;
         fence();
-        thrdlib_park( self );
+        thrdlib::park( self );
 
         std::vector<bool> seen;
@@ -116 +118 @@
 
         while(last_produced < nproduce) {
-                thrdlib_yield();
+                thrdlib::yield();
                 thrd_stats.stats.ran++;
                 if( last_produced > 0 ) seen.at(last_produced - 1) = true;
@@ -148 +150 @@
 
 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];
@@ -247 +249 @@
         std::cout << "(Buffering " << nframes << ")" << std::endl;
 
-        thrdlib_init( 2 );
-
-        thread_t stats     = thrdlib_create( Stats     );
+        thrdlib::init( "fibre", 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_clean();
+        thrdlib::join( simulator );
+        thrdlib::join( renderer  );
+        thrdlib::join( stats     );
+
+        thrdlib::clean();
 
         std::cout << "----------" << std::endl;

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

@@ -1 @@
-#pragma once
-
 #include <cassert>
 #include <libfibre/cfibre.h>
 
-#if defined(__cforall) || defined(__cpluplus)
+typedef cfibre_t thread_t;
+static_assert(sizeof(thread_t) == sizeof(void*), "thread_t musst be of same size as void*");
+
+void * fibre_runner(void * arg) {
+        auto the_main = (void (*)( thread_t ))arg;
+        the_main( cfibre_self() );
+        return nullptr;
+}
+
 extern "C" {
-#endif
-        //--------------------
-        // Basic types
-        typedef cfibre_t thread_t;
-
-        void * fibre_runner(void * arg) {
-                auto the_main = (void (*)( thread_t ))arg;
-                the_main( cfibre_self() );
-                return nullptr;
-        }
-
         //--------------------
         // Basic thread support
@@ -51 +46 @@
 
         }
-
-
-#if defined(__cforall) || defined(__cpluplus)
 }
-#endif

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
@@ -99 +97 @@
         // Basic kernel features
         void thrdlib_init( int ) {}
-        void thrdlib_clean( void ) {}
-
-
-#if defined(__cforall) || defined(__cpluplus)
 }
-#endif