Changeset 54eb1bb3 for doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/thread.cpp

Timestamp:

Dec 15, 2020, 10:26:35 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:

13fece5, 42f6e07

Parents:

dd92fe9 (diff), 72b1800 (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

File:

• doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/thread.cpp (modified) (1 diff)

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

@@ -1 @@
-#include "thread.hpp"
+#if !defined(WITH_PTHREADS) && !defined(WITH_LIBFIBRE) && !defined(WITH_CFORALL)
+#error must define WITH_PTHREADS, WITH_LIBFIBRE or WITH_CFORALL
+#endif
 
-#include <cstdarg>                                                                              // va_start, va_end
-#include <cstdio>
-#include <cstring>                                                                              // strlen
-extern "C" {
-        #include <unistd.h>                                                                             // _exit, getpid
-        #include <signal.h>
-        #include <dlfcn.h>                                                                              // dlopen, dlsym
-        #include <execinfo.h>                                                                   // backtrace, messages
-}
+#ifdef WITH_PTHREADS
+#include "pthread.hpp"
+#endif
+#ifdef WITH_LIBFIBRE
+#include "fibre.hpp"
+#endif
+#ifdef WITH_CFORALL
+#include "cforall.hpp"
+#endif
 
-#include <iostream>
-#include <string>
+namespace thrdlib {
+        //--------------------
+        // Basic thread support
+        void * create( void (*main)( void * ) ) { return (thread_t)thrdlib_create(  (void (*)( thread_t )) main ); }
+        void join  ( void * handle ) { thrdlib_join  ((thread_t)handle); }
+        void park  ( void * handle ) { thrdlib_park  ((thread_t)handle); }
+        void unpark( void * handle ) { thrdlib_unpark((thread_t)handle); }
+        void yield( void )  { thrdlib_yield(); }
 
-using thrdlib::thread_t;
-
-thread_t (*thrdlib::create)( void (*main)( thread_t ) ) = nullptr;
-void (*thrdlib::join)( thread_t handle ) = nullptr;
-void (*thrdlib::park)( thread_t handle ) = nullptr;
-void (*thrdlib::unpark)( thread_t handle ) = nullptr;
-void (*thrdlib::yield)( void ) = nullptr;
-void (*lib_clean)(void) = nullptr;
-
-typedef void (*fptr_t)();
-static fptr_t open_symbol( void * library, const char * symbol, bool required ) {
-        void * ptr = dlsym( library, symbol );
-
-        const char * error = dlerror();
-        if ( required && error ) {
-                std::cerr << "Fetching symbol '" << symbol << "' failed with error '" << error << "'\n";
-                std::abort();
-        }
-
-        return (fptr_t)ptr;
-}
-
-//--------------------
-// Basic kernel features
-void thrdlib::init( const char * name, int procs ) {
-        std::string file = __FILE__;
-        std::size_t found = file.find_last_of("/");
-        std::string libname = file.substr(0,found+1) + name + ".so";
-
-        std::cout << "Use framework " << name << "(" << libname << ")\n";
-
-        void * library = dlopen( libname.c_str(), RTLD_NOW );
-        if ( const char * error = dlerror() ) {
-                std::cerr << "Could not open library '" << libname << "' from name '" << name <<"'\n";
-                std::cerr << "Error was : '" << error << "'\n";
-                std::abort();
-        }
-
-        void (*lib_init)( int ) = (void (*)( int ))open_symbol( library, "thrdlib_init", false );
-        lib_clean = open_symbol( library, "thrdlib_clean" , false );
-
-        thrdlib::create = (typeof(thrdlib::create))open_symbol( library, "thrdlib_create", true  );
-        thrdlib::join   = (typeof(thrdlib::join  ))open_symbol( library, "thrdlib_join"  , true  );
-        thrdlib::park   = (typeof(thrdlib::park  ))open_symbol( library, "thrdlib_park"  , true  );
-        thrdlib::unpark = (typeof(thrdlib::unpark))open_symbol( library, "thrdlib_unpark", true  );
-        thrdlib::yield  = (typeof(thrdlib::yield ))open_symbol( library, "thrdlib_yield" , true  );
-
-        lib_init( procs );
-}
-
-void thrdlib::clean( void ) {
-        if(lib_clean) lib_clean();
-}
+        //--------------------
+        // Basic kernel features
+        void init( int procs ) { thrdlib_init(procs); }
+        void clean( void ) { thrdlib_clean(); }
+};