Changes in / [ee2938a:ff2d1139]

Location:

src

Files:

• SymTab/Mangler.cc (modified) (1 diff)
• libcfa/Makefile.in (modified) (2 diffs)
• libcfa/concurrency/alarm.c (modified) (2 diffs)
• libcfa/concurrency/alarm.h (modified) (1 diff)
• libcfa/concurrency/coroutine.c (modified) (2 diffs)
• libcfa/concurrency/kernel.c (modified) (1 diff)
• libcfa/concurrency/monitor (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -99 +99 @@
                         Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
                                 : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
-
-                        Mangler::Mangler( const Mangler &rhs ) : mangleName() {
-                                varNums = rhs.varNums;
-                                nextVarNum = rhs.nextVarNum;
-                                isTopLevel = rhs.isTopLevel;
-                                mangleOverridable = rhs.mangleOverridable;
-                                typeMode = rhs.typeMode;
-                        }
 
                         void Mangler::mangleDecl( DeclarationWithType * declaration ) {

src/libcfa/Makefile.in

@@ -263 +263 @@
         containers/result containers/vector concurrency/coroutine \
         concurrency/thread concurrency/kernel concurrency/monitor \
-        ${shell echo stdhdr/*} math gmp bits/align.h bits/containers.h \
-        bits/defs.h bits/debug.h bits/locks.h concurrency/invoke.h
+        ${shell find stdhdr -type f -printf "%p "} math gmp \
+        bits/align.h bits/containers.h bits/defs.h bits/debug.h \
+        bits/locks.h concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -428 +429 @@
 libcfa_d_a_SOURCES = ${libsrc}
 libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
-stdhdr = ${shell echo stdhdr/*}
+stdhdr = ${shell find stdhdr -type f -printf "%p "}
 cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = \

src/libcfa/concurrency/alarm.c

@@ -41 +41 @@
 void ?{}( __cfa_time_t & this, zero_t zero ) { this.val = 0; }
 
-void ?{}( itimerval & this, __cfa_time_t * alarm ) {
-        this.it_value.tv_sec = alarm->val / one_second;                 // seconds
-        this.it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
-        this.it_interval.tv_sec = 0;
-        this.it_interval.tv_usec = 0;
+void ?{}( itimerval & this, __cfa_time_t * alarm ) with( this ) {
+        it_value.tv_sec = alarm->val / one_second;                      // seconds
+        it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
+        it_interval.tv_sec = 0;
+        it_interval.tv_usec = 0;
 }
 
@@ -84 +84 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) with( this ) {
         this.thrd = thrd;
         this.alarm = alarm;
         this.period = period;
-        this.next = 0;
-        this.set = false;
-        this.kernel_alarm = false;
-}
-
-void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+        next = 0;
+        set = false;
+        kernel_alarm = false;
+}
+
+void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) with( this ) {
         this.proc = proc;
         this.alarm = alarm;
         this.period = period;
-        this.next = 0;
-        this.set = false;
-        this.kernel_alarm = true;
+        next = 0;
+        set = false;
+        kernel_alarm = true;
 }
 

src/libcfa/concurrency/alarm.h

@@ -114 +114 @@
 };
 
-static inline void ?{}( alarm_list_t & this ) {
-        this.head = 0;
-        this.tail = &this.head;
+static inline void ?{}( alarm_list_t & this ) with( this ) {
+        head = 0;
+        tail = &head;
 }
 

src/libcfa/concurrency/coroutine.c

@@ -39 +39 @@
 //-----------------------------------------------------------------------------
 // Coroutine ctors and dtors
-void ?{}(coStack_t& this) {
-        this.size               = 65000;        // size of stack
-        this.storage    = NULL; // pointer to stack
-        this.limit              = NULL; // stack grows towards stack limit
-        this.base               = NULL; // base of stack
-        this.context    = NULL; // address of cfa_context_t
-        this.top                = NULL; // address of top of storage
-        this.userStack  = false;
+void ?{}(coStack_t& this) with( this ) {
+        size            = 65000;        // size of stack
+        storage = NULL; // pointer to stack
+        limit           = NULL; // stack grows towards stack limit
+        base            = NULL; // base of stack
+        context = NULL; // address of cfa_context_t
+        top             = NULL; // address of top of storage
+        userStack       = false;
 }
 
@@ -60 +60 @@
 }
 
-void ?{}(coroutine_desc& this, const char * name) {
+void ?{}(coroutine_desc& this, const char * name) with( this ) {
         this.name = name;
-        this.errno_ = 0;
-        this.state = Start;
-        this.starter = NULL;
-        this.last = NULL;
+        errno_ = 0;
+        state = Start;
+        starter = NULL;
+        last = NULL;
 }
 

src/libcfa/concurrency/kernel.c

@@ -142 +142 @@
 }
 
-void ?{}(processor & this, cluster * cltr) {
+void ?{}(processor & this, cluster * cltr) with( this ) {
         this.cltr = cltr;
-        this.terminated{ 0 };
-        this.do_terminate = false;
-        this.preemption_alarm = NULL;
-        this.pending_preemption = false;
+        terminated{ 0 };
+        do_terminate = false;
+        preemption_alarm = NULL;
+        pending_preemption = false;
 
         start( &this );
 }
 
-void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) {
+void ?{}(processor & this, cluster * cltr, processorCtx_t & runner) with( this ) {
         this.cltr = cltr;
-        this.terminated{ 0 };
-        this.do_terminate = false;
-        this.preemption_alarm = NULL;
-        this.pending_preemption = false;
-        this.kernel_thread = pthread_self();
+        terminated{ 0 };
+        do_terminate = false;
+        preemption_alarm = NULL;
+        pending_preemption = false;
+        kernel_thread = pthread_self();
 
         this.runner = &runner;

src/libcfa/concurrency/monitor

@@ -27 +27 @@
 };
 
-static inline void ?{}(monitor_desc & this) {
-        (this.lock){};
-        (this.entry_queue){};
-        (this.signal_stack){};
-        this.owner         = NULL;
-        this.recursion     = 0;
-        this.mask.accepted = NULL;
-        this.mask.data     = NULL;
-        this.mask.size     = 0;
-        this.dtor_node     = NULL;
+static inline void ?{}(monitor_desc & this) with( this ) {
+        lock{};
+        entry_queue{};
+        signal_stack{};
+        owner         = NULL;
+        recursion     = 0;
+        mask.accepted = NULL;
+        mask.data     = NULL;
+        mask.size     = 0;
+        dtor_node     = NULL;
 }
 

src/libcfa/concurrency/monitor.c

@@ -151 +151 @@
                         // We already have the monitor... but where about to destroy it so the nesting will fail
                         // Abort!
-                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex." );
+                        abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.", this, thrd->self_cor.name, thrd );
                 }
 
@@ -358 +358 @@
 }
 
-void ?{}(__condition_criterion_t & this ) {
-        this.ready  = false;
-        this.target = NULL;
-        this.owner  = NULL;
-        this.next   = NULL;
+void ?{}(__condition_criterion_t & this ) with( this ) {
+        ready  = false;
+        target = NULL;
+        owner  = NULL;
+        next   = NULL;
 }
 
@@ -427 +427 @@
                 thread_desc * this_thrd = this_thread;
                 if ( this.monitor_count != this_thrd->monitors.size ) {
-                        abort( "Signal on condition %p made with different number of monitor(s), expected %i got %i", &this, this.monitor_count, this_thrd->monitors.size );
+                        abort( "Signal on condition %p made with different number of monitor(s), expected %li got %li", &this, this.monitor_count, this_thrd->monitors.size );
                 }
 
                 for(int i = 0; i < this.monitor_count; i++) {
                         if ( this.monitors[i] != this_thrd->monitors[i] ) {
-                                abort( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
+                                abort( "Signal on condition %p made with different monitor, expected %p got %p", &this, this.monitors[i], this_thrd->monitors[i] );
                         }
                 }