Changeset 6e2b04e

Timestamp:

Jun 8, 2022, 4:23:41 PM (16 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

7f0ac12, db7a3ad

Parents:

55422cf (diff), 720f2fe2 (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

Files:

• benchmark/io/http/Makefile.am (modified) (2 diffs)
• benchmark/io/http/main.cfa (modified) (15 diffs)
• benchmark/io/http/options.cfa (modified) (2 diffs)
• benchmark/io/http/options.hfa (modified) (1 diff)
• benchmark/io/http/socket.cfa (added)
• benchmark/io/http/socket.hfa (added)
• benchmark/io/http/worker.cfa (modified) (1 diff)
• libcfa/src/concurrency/io.cfa (modified) (1 diff)
• libcfa/src/concurrency/io/setup.cfa (modified) (1 diff)
• src/Concurrency/Waitfor.cc (modified) (1 diff)
• src/Concurrency/Waitfor.h (modified) (1 diff)
• src/Concurrency/WaitforNew.cpp (added)
• src/Concurrency/module.mk (modified) (1 diff)
• src/InitTweak/FixGlobalInit.cc (modified) (1 diff)
• src/InitTweak/FixInit.cc (modified) (1 diff)
• src/InitTweak/InitTweak.cc (modified) (4 diffs)
• src/InitTweak/InitTweak.h (modified) (1 diff)
• src/main.cc (modified) (3 diffs)
• tools/cfa.nanorc (modified) (1 diff)
• tools/jenkins/setup.sh.in (modified) (2 diffs)

benchmark/io/http/Makefile.am

@@ -21 +21 @@
 include $(top_srcdir)/tools/build/cfa.make
 
-AM_CFLAGS = -O3 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
+AM_CFLAGS = -O3 -Wall -Wextra -I$(srcdir) -lrt -pthread -g # -Werror
 AM_CFAFLAGS = -quiet -nodebug
 AM_LDFLAGS = -quiet -nodebug
@@ -39 +39 @@
         protocol.cfa \
         protocol.hfa \
+        socket.cfa \
+        socket.hfa \
         worker.cfa \
         worker.hfa

benchmark/io/http/main.cfa

@@ -2 +2 @@
 
 #include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -8 +9 @@
         #include <sched.h>
         #include <signal.h>
+        #include <sys/eventfd.h>
         #include <sys/socket.h>
         #include <netinet/in.h>
@@ -14 +16 @@
 #include <fstream.hfa>
 #include <kernel.hfa>
+#include <locks.hfa>
 #include <iofwd.hfa>
 #include <stats.hfa>
@@ -21 +24 @@
 #include "filecache.hfa"
 #include "options.hfa"
+#include "socket.hfa"
 #include "worker.hfa"
 
@@ -36 +40 @@
         Worker * workers;
         int worker_cnt;
+        condition_variable(fast_block_lock) var;
 };
 
@@ -54 +59 @@
                 or else {}
 
-                sleep(10`s);
+                wait(this.var, 10`s);
 
                 print_stats_now( *active_cluster(), CFA_STATS_READY_Q | CFA_STATS_IO );
@@ -177 +182 @@
 
 //=============================================================================================
+// Termination
+//=============================================================================================
+
+int closefd;
+void cleanstop(int) {
+        eventfd_t buffer = 1;
+        char * buffer_s = (char*)&buffer;
+        int ret = write(closefd, buffer_s, sizeof(buffer));
+        if(ret < 0) abort( "eventfd write error: (%d) %s\n", (int)errno, strerror(errno) );
+        return;
+}
+
+//=============================================================================================
 // Main
 //============================================================================================='
 int main( int argc, char * argv[] ) {
+        int ret;
         __sighandler_t s = 1p;
         signal(SIGPIPE, s);
@@ -186 +205 @@
         // Parse args
         parse_options(argc, argv);
+
+        //===================
+        // Setup non-interactive termination
+        if(!options.interactive) {
+                closefd = eventfd(0, 0);
+                if(closefd < 0) abort( "eventfd error: (%d) %s\n", (int)errno, strerror(errno) );
+
+                sighandler_t prev = signal(SIGTERM, cleanstop);
+                intptr_t prev_workaround = (intptr_t) prev;
+                // can't use SIG_ERR it crashes the compiler
+                if(prev_workaround == -1) abort( "signal setup error: (%d) %s\n", (int)errno, strerror(errno) );
+
+                sout | "Signal termination ready";
+        }
 
         //===================
@@ -197 +230 @@
         // Open Socket
         sout | getpid() | ": Listening on port" | options.socket.port;
-        int server_fd = socket(AF_INET, SOCK_STREAM, 0);
-        if(server_fd < 0) {
-                abort( "socket error: (%d) %s\n", (int)errno, strerror(errno) );
-        }
-
-        int ret = 0;
+
         struct sockaddr_in address;
-        int addrlen = sizeof(address);
-        memset( (char *)&address, '\0' );
-        address.sin_family = AF_INET;
-        address.sin_addr.s_addr = htonl(INADDR_ANY);
-        address.sin_port = htons( options.socket.port );
-
-        int waited = 0;
-        for() {
-                int sockfd = server_fd;
-                __CONST_SOCKADDR_ARG addr;
-                addr.__sockaddr__ = (struct sockaddr *)&address;
-                socklen_t addrlen = sizeof(address);
-                ret = bind( sockfd, addr, addrlen );
-                if(ret < 0) {
-                        if(errno == EADDRINUSE) {
-                                if(waited == 0) {
-                                        if(!options.interactive) abort | "Port already in use in non-interactive mode. Aborting";
-                                        sout | "Waiting for port";
-                                } else {
-                                        sout | "\r" | waited | nonl;
-                                        flush( sout );
-                                }
-                                waited ++;
-                                sleep( 1`s );
-                                continue;
-                        }
-                        abort( "bind error: (%d) %s\n", (int)errno, strerror(errno) );
-                }
-                break;
-        }
-
-        ret = listen( server_fd, options.socket.backlog );
-        if(ret < 0) {
-                abort( "listen error: (%d) %s\n", (int)errno, strerror(errno) );
+        int addrlen = prepaddr(address);
+
+        int server_fd;
+        if(!options.socket.manyreuse) {
+                server_fd = listener(address, addrlen);
         }
 
@@ -257 +256 @@
 
                 {
+                        // Stats printer makes a copy so this needs to persist longer than normal
+                        Worker * workers;
                         ServerCluster cl[options.clopts.nclusters];
 
                         init_protocol();
                         {
-                                Worker * workers = anew(options.clopts.nworkers);
+                                workers = anew(options.clopts.nworkers);
                                 cl[0].prnt->workers = workers;
                                 cl[0].prnt->worker_cnt = options.clopts.nworkers;
@@ -273 +274 @@
                                                 workers[i].pipe[0] = fds[pipe_off + (i * 2) + 0];
                                                 workers[i].pipe[1] = fds[pipe_off + (i * 2) + 1];
-                                                workers[i].sockfd  = server_fd;
+                                                workers[i].sockfd  = options.socket.manyreuse ?  listener(address, addrlen) : server_fd;
                                                 workers[i].addr    = (struct sockaddr *)&address;
                                                 workers[i].addrlen = (socklen_t*)&addrlen;
@@ -285 +286 @@
                                 }
                                 sout | nl;
-                                if(!options.interactive) park();
                                 {
-                                        char buffer[128];
-                                        for() {
-                                                int ret = cfa_read(0, buffer, 128, 0);
-                                                if(ret == 0) break;
+                                        if(options.interactive) {
+                                                char buffer[128];
+                                                for() {
+                                                        int ret = cfa_read(0, buffer, 128, 0);
+                                                        if(ret == 0) break;
+                                                        if(ret < 0) abort( "main read error: (%d) %s\n", (int)errno, strerror(errno) );
+                                                        sout | "User wrote '" | "" | nonl;
+                                                        write(sout, buffer, ret - 1);
+                                                        sout | "'";
+                                                }
+                                        }
+                                        else {
+                                                char buffer[sizeof(eventfd_t)];
+                                                int ret = cfa_read(closefd, buffer, sizeof(eventfd_t), 0);
                                                 if(ret < 0) abort( "main read error: (%d) %s\n", (int)errno, strerror(errno) );
-                                                sout | "User wrote '" | "" | nonl;
-                                                write(sout, buffer, ret - 1);
-                                                sout | "'";
                                         }
 
@@ -307 +314 @@
 
                                 sout | "Shutting down socket..." | nonl; flush( sout );
-                                int ret = shutdown( server_fd, SHUT_RD );
-                                if( ret < 0 ) {
-                                        abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) );
+                                if(options.socket.manyreuse) {
+                                        for(i; options.clopts.nworkers) {
+                                                ret = shutdown( workers[i].sockfd, SHUT_RD );
+                                                if(ret < 0) abort( "close socket %d error: (%d) %s\n", i, (int)errno, strerror(errno) );
+                                        }
+                                }
+                                else {
+                                        ret = shutdown( server_fd, SHUT_RD );
+                                        if( ret < 0 ) {
+                                                abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) );
+                                        }
                                 }
                                 sout | "done";
@@ -316 +331 @@
                                 // Close Socket
                                 sout | "Closing Socket..." | nonl; flush( sout );
-                                ret = close( server_fd );
-                                if(ret < 0) {
-                                        abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
+                                if(options.socket.manyreuse) {
+                                        for(i; options.clopts.nworkers) {
+                                                ret = close(workers[i].sockfd);
+                                                if(ret < 0) abort( "close socket %d error: (%d) %s\n", i, (int)errno, strerror(errno) );
+                                        }
+                                }
+                                else {
+                                        ret = close( server_fd );
+                                        if(ret < 0) {
+                                                abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
+                                        }
                                 }
                                 sout | "done";
 
                                 sout | "Stopping connection threads..." | nonl; flush( sout );
-                                adelete(workers);
+                                for(i; options.clopts.nworkers) {
+                                        for(j; 2) {
+                                                ret = close(workers[i].pipe[j]);
+                                                if(ret < 0) abort( "close pipe %d error: (%d) %s\n", j, (int)errno, strerror(errno) );
+                                        }
+                                        join(workers[i]);
+                                }
                         }
                         sout | "done";
@@ -331 +360 @@
                         sout | "done";
 
+                        sout | "Stopping printer threads..." | nonl; flush( sout );
+                        for(i; options.clopts.nclusters) {
+                                StatsPrinter * p = cl[i].prnt;
+                                if(p) {
+                                        notify_one(p->var);
+                                        join(*p);
+                                }
+                        }
+                        sout | "done";
+
+                        // Now that the stats printer is stopped, we can reclaim this
+                        adelete(workers);
+
                         sout | "Stopping processors/clusters..." | nonl; flush( sout );
                 }
                 sout | "done";
 
-                sout | "Closing splice fds..." | nonl; flush( sout );
-                for(i; pipe_cnt) {
-                        ret = close( fds[pipe_off + i] );
-                        if(ret < 0) {
-                                abort( "close pipe error: (%d) %s\n", (int)errno, strerror(errno) );
-                        }
-                }
+                // sout | "Closing splice fds..." | nonl; flush( sout );
+                // for(i; pipe_cnt) {
+                //      ret = close( fds[pipe_off + i] );
+                //      if(ret < 0) {
+                //              abort( "close pipe error: (%d) %s\n", (int)errno, strerror(errno) );
+                //      }
+                // }
                 free(fds);
                 sout | "done";

benchmark/io/http/options.cfa

@@ -35 +35 @@
 
         { // socket
-                8080, // port
-                10,   // backlog
-                1024  // buflen
+                8080,  // port
+                10,    // backlog
+                1024,  // buflen
+                false, // onereuse
+                false  // manyreuse
         },
 
@@ -70 +72 @@
                 {'\0', "shell",          "Disable interactive mode", options.interactive, parse_setfalse},
                 {'\0', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
+                {'\0', "reuseport-one",  "Create a single listen socket with SO_REUSEPORT", options.socket.onereuse, parse_settrue},
+                {'\0', "reuseport",      "Use many listen sockets with SO_REUSEPORT", options.socket.manyreuse, parse_settrue},
                 {'\0', "request_len",    "Maximum number of bytes in the http request, requests with more data will be answered with Http Code 414", options.socket.buflen},
                 {'\0', "seed",           "seed to use for hashing", options.file_cache.hash_seed },

benchmark/io/http/options.hfa

@@ -27 +27 @@
                 int backlog;
                 int buflen;
+                bool onereuse;
+                bool manyreuse;
         } socket;
 

benchmark/io/http/worker.cfa

@@ -43 +43 @@
         /* paranoid */ assert( this.pipe[0] != -1 );
         /* paranoid */ assert( this.pipe[1] != -1 );
+
+        const bool reuse = options.socket.manyreuse;
 
         CONNECTION:

libcfa/src/concurrency/io.cfa

@@ -159 +159 @@
 
                 const __u32 mask = *ctx->cq.mask;
+                const __u32 num  = *ctx->cq.num;
                 unsigned long long ts_prev = ctx->cq.ts;
-
-                // re-read the head and tail in case it already changed.
-                const __u32 head = *ctx->cq.head;
-                const __u32 tail = *ctx->cq.tail;
-                const __u32 count = tail - head;
-                __STATS__( false, io.calls.drain++; io.calls.completed += count; )
-
-                for(i; count) {
-                        unsigned idx = (head + i) & mask;
-                        volatile struct io_uring_cqe & cqe = ctx->cq.cqes[idx];
-
-                        /* paranoid */ verify(&cqe);
-
-                        struct io_future_t * future = (struct io_future_t *)(uintptr_t)cqe.user_data;
-                        // __cfadbg_print_safe( io, "Kernel I/O : Syscall completed : cqe %p, result %d for %p\n", &cqe, cqe.res, future );
-
-                        __kernel_unpark( fulfil( *future, cqe.res, false ), UNPARK_LOCAL );
-                }
-
-                unsigned long long ts_next = ctx->cq.ts = rdtscl();
-
-                // Mark to the kernel that the cqe has been seen
-                // Ensure that the kernel only sees the new value of the head index after the CQEs have been read.
-                __atomic_store_n( ctx->cq.head, head + count, __ATOMIC_SEQ_CST );
-                ctx->proc->idle_wctx.drain_time = ts_next;
+                unsigned long long ts_next;
+
+                // We might need to do this multiple times if more events completed than can fit in the queue.
+                for() {
+                        // re-read the head and tail in case it already changed.
+                        const __u32 head = *ctx->cq.head;
+                        const __u32 tail = *ctx->cq.tail;
+                        const __u32 count = tail - head;
+                        __STATS__( false, io.calls.drain++; io.calls.completed += count; )
+
+                        for(i; count) {
+                                unsigned idx = (head + i) & mask;
+                                volatile struct io_uring_cqe & cqe = ctx->cq.cqes[idx];
+
+                                /* paranoid */ verify(&cqe);
+
+                                struct io_future_t * future = (struct io_future_t *)(uintptr_t)cqe.user_data;
+                                // __cfadbg_print_safe( io, "Kernel I/O : Syscall completed : cqe %p, result %d for %p\n", &cqe, cqe.res, future );
+
+                                __kernel_unpark( fulfil( *future, cqe.res, false ), UNPARK_LOCAL );
+                        }
+
+                        ts_next = ctx->cq.ts = rdtscl();
+
+                        // Mark to the kernel that the cqe has been seen
+                        // Ensure that the kernel only sees the new value of the head index after the CQEs have been read.
+                        __atomic_store_n( ctx->cq.head, head + count, __ATOMIC_SEQ_CST );
+                        ctx->proc->idle_wctx.drain_time = ts_next;
+
+                        if(likely(count < num)) break;
+
+                        ioring_syscsll( *ctx, 0, IORING_ENTER_GETEVENTS);
+                }
 
                 __cfadbg_print_safe(io, "Kernel I/O : %u completed age %llu\n", count, ts_next);

libcfa/src/concurrency/io/setup.cfa

@@ -138 +138 @@
                 __u32 nentries = params_in.num_entries != 0 ? params_in.num_entries : 256;
                 if( !is_pow2(nentries) ) {
-                        abort("ERROR: I/O setup 'num_entries' must be a power of 2\n");
+                        abort("ERROR: I/O setup 'num_entries' must be a power of 2, was %u\n", nentries);
                 }
 

src/Concurrency/Waitfor.cc

@@ -56 +56 @@
                       |  |
                       |  |
-                            |  |
+                      |  |
                       |  |
                       |  |

src/Concurrency/Waitfor.h

@@ -19 +19 @@
 
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace Concurrency {
         void generateWaitFor( std::list< Declaration * > & translationUnit );
+
+void generateWaitFor( ast::TranslationUnit & translationUnit );
 };
 

src/Concurrency/module.mk

@@ -19 +19 @@
         Concurrency/Keywords.cc \
         Concurrency/Keywords.h \
+        Concurrency/WaitforNew.cpp \
         Concurrency/Waitfor.cc \
         Concurrency/Waitfor.h

src/InitTweak/FixGlobalInit.cc

@@ -162 +162 @@
                         } // if
                         if ( Statement * ctor = ctorInit->ctor ) {
-                                addDataSectonAttribute( objDecl );
+                                addDataSectionAttribute( objDecl );
                                 initStatements.push_back( ctor );
                                 objDecl->init = nullptr;

src/InitTweak/FixInit.cc

@@ -806 +806 @@
                                                 // The attribute works, and is meant to apply, both for leaving the static local alone,
                                                 // and for hoisting it out as a static global.
-                                                addDataSectonAttribute( objDecl );
+                                                addDataSectionAttribute( objDecl );
 
                                                 // originally wanted to take advantage of gcc nested functions, but

src/InitTweak/InitTweak.cc

@@ -587 +587 @@
 
         bool isConstructable( const ast::Type * type ) {
-                return ! dynamic_cast< const ast::VarArgsType * >( type ) && ! dynamic_cast< const ast::ReferenceType * >( type ) 
+                return ! dynamic_cast< const ast::VarArgsType * >( type ) && ! dynamic_cast< const ast::ReferenceType * >( type )
                 && ! dynamic_cast< const ast::FunctionType * >( type ) && ! Tuples::isTtype( type );
         }
@@ -1025 +1025 @@
                 if (!assign) {
                         auto td = new ast::TypeDecl({}, "T", {}, nullptr, ast::TypeDecl::Dtype, true);
-                        assign = new ast::FunctionDecl({}, "?=?", {}, 
+                        assign = new ast::FunctionDecl({}, "?=?", {},
                         { new ast::ObjectDecl({}, "_dst", new ast::ReferenceType(new ast::TypeInstType("T", td))),
                           new ast::ObjectDecl({}, "_src", new ast::TypeInstType("T", td))},
@@ -1095 +1095 @@
 
                         // address of a variable or member expression is constexpr
-                        if ( ! dynamic_cast< const ast::NameExpr * >( arg ) 
-                        && ! dynamic_cast< const ast::VariableExpr * >( arg ) 
-                        && ! dynamic_cast< const ast::MemberExpr * >( arg ) 
+                        if ( ! dynamic_cast< const ast::NameExpr * >( arg )
+                        && ! dynamic_cast< const ast::VariableExpr * >( arg )
+                        && ! dynamic_cast< const ast::MemberExpr * >( arg )
                         && ! dynamic_cast< const ast::UntypedMemberExpr * >( arg ) ) result = false;
                 }
@@ -1241 +1241 @@
         }
 
-        void addDataSectonAttribute( ObjectDecl * objDecl ) {
+        #if defined( __x86_64 ) || defined( __i386 ) // assembler comment to prevent assembler warning message
+                #define ASM_COMMENT "#"
+        #else // defined( __ARM_ARCH )
+                #define ASM_COMMENT "//"
+        #endif
+        static const char * const data_section =  ".data" ASM_COMMENT;
+        static const char * const tlsd_section = ".tdata" ASM_COMMENT;
+        void addDataSectionAttribute( ObjectDecl * objDecl ) {
+                const bool is_tls = objDecl->get_storageClasses().is_threadlocal;
+                const char * section = is_tls ? tlsd_section : data_section;
                 objDecl->attributes.push_back(new Attribute("section", {
-                        new ConstantExpr( Constant::from_string(".data"
-#if defined( __x86_64 ) || defined( __i386 ) // assembler comment to prevent assembler warning message
-                                        "#"
-#else // defined( __ARM_ARCH )
-                                        "//"
-#endif
-                                ))}));
+                        new ConstantExpr( Constant::from_string( section ) )
+                }));
         }
 
         void addDataSectionAttribute( ast::ObjectDecl * objDecl ) {
+                const bool is_tls = objDecl->storage.is_threadlocal;
+                const char * section = is_tls ? tlsd_section : data_section;
                 objDecl->attributes.push_back(new ast::Attribute("section", {
-                        ast::ConstantExpr::from_string(objDecl->location, ".data"
-#if defined( __x86_64 ) || defined( __i386 ) // assembler comment to prevent assembler warning message
-                                        "#"
-#else // defined( __ARM_ARCH )
-                                        "//"
-#endif
-                                )}));
+                        ast::ConstantExpr::from_string(objDecl->location, section)
+                }));
         }
 

src/InitTweak/InitTweak.h

@@ -127 +127 @@
         ///    .section .data#,"a"
         /// to avoid assembler warning "ignoring changed section attributes for .data"
-        void addDataSectonAttribute( ObjectDecl * objDecl );
+        void addDataSectionAttribute( ObjectDecl * objDecl );
 
         void addDataSectionAttribute( ast::ObjectDecl * objDecl );

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Apr 29  9:52:00 2022
-// Update Count     : 673
+// Last Modified On : Tue Jun  7 13:29:00 2022
+// Update Count     : 674
 //
 
@@ -447 +447 @@
                         PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
 
-                        PASS( "Translate Tries" , ControlStruct::translateTries( transUnit ) );
+                        PASS( "Translate Tries", ControlStruct::translateTries( transUnit ) );
+                        PASS( "Gen Waitfor", Concurrency::generateWaitFor( transUnit ) );
 
                         translationUnit = convert( move( transUnit ) );
@@ -517 +518 @@
 
                         PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
-
-                        PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
+                        PASS( "Translate Tries", ControlStruct::translateTries( translationUnit ) );
+                        PASS( "Gen Waitfor", Concurrency::generateWaitFor( translationUnit ) );
                 }
-
-                PASS( "Gen Waitfor" , Concurrency::generateWaitFor( translationUnit ) );
 
                 PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded

tools/cfa.nanorc

@@ -10 +10 @@
 color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
 color green "\<(float|double|bool|char|int|short|long|enum|void|auto)\>"
-color green "\<(static|const|extern|(un)?signed|inline)\>" "\<(sizeof)\>"
+color green "\<(static|const|extern|(un)?signed|inline|sizeof|vtable)\>"
 color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 
 # Declarations
 color brightgreen "\<(struct|union|typedef|trait|coroutine|generator)\>"
-color brightgreen "\<(monitor|thread|with)\>"
+color brightgreen "\<(monitor|thread|with|exception)\>"
 
 # Control Flow Structures

tools/jenkins/setup.sh.in

@@ -29 +29 @@
 function getrunpath()
 {
-        local elfout=$(readelf -d $1 | grep "RUNPATH")
+        local elfout=$(readelf -d $1 | grep -E "RPATH|RUNPATH")
         regex='\[/([[:alpha:][:digit:]@/_.-]+)\]'
         if [[ $elfout =~ $regex ]]; then
@@ -43 +43 @@
 {
         local deps=$(ldd $1)
+        retlcldeps=()
         retsysdeps=()
-        retlcldeps=()
         while IFS= read -r line; do
-                regex1='/([[:alpha:][:digit:]@/_.-]+)'
-                regex2='(libcfa[[:alpha:][:digit:].]+) => not found'
+                regex1='(libcfa[[:alpha:][:digit:].]+)'
+                regex2='/([[:alpha:][:digit:]@/_.-]+)'
                 regex3='linux-vdso.so.1|linux-gate.so.1'
                 if [[ $line =~ $regex1 ]]; then
+                        retlcldeps+=(${BASH_REMATCH[1]})
+                elif [[ $line =~ $regex2 ]]; then
                         retsysdeps+=(${BASH_REMATCH[1]})
-                elif [[ $line =~ $regex2 ]]; then
-                        retlcldeps+=(${BASH_REMATCH[1]})
                 elif [[ $line =~ $regex3 ]]; then
                         # echo "ignoring '$line}': intrinsic"