Changes in / [41a7137:511aa69a]

Location:

src

Files:

• benchmark/CorCtxSwitch.c (added)
• benchmark/ThrdCtxSwitch.c (added)
• examples/Bench.c (modified) (4 diffs)
• libcfa/concurrency/CtxSwitch-x86_64.S (modified) (2 diffs)
• libcfa/concurrency/coroutines (modified) (2 diffs)
• libcfa/concurrency/invoke.c (modified) (2 diffs)
• libcfa/concurrency/kernel.c (modified) (1 diff)
• libcfa/concurrency/threads (modified) (1 diff)
• libcfa/containers/vector (modified) (2 diffs)
• tests/thread.c (modified) (1 diff)

src/examples/Bench.c

@@ -87 +87 @@
 
 struct CoroutineDummy { coroutine c; };
-DECL_COROUTINE(CoroutineDummy)
+DECL_COROUTINE(CoroutineDummy);
 void main(CoroutineDummy * this) {}
 
@@ -122 +122 @@
 };
 
-DECL_COROUTINE(CoroutineResume)
+DECL_COROUTINE(CoroutineResume);
 
 void ?{}(CoroutineResume* this, int N) {
@@ -151 +151 @@
 
 struct ThreadDummy { thread t; };
-DECL_THREAD(ThreadDummy)
+DECL_THREAD(ThreadDummy);
 void main(ThreadDummy * this) {}
 
@@ -183 +183 @@
 };
 
-DECL_THREAD(ContextSwitch)
+DECL_THREAD(ContextSwitch);
 
 void main(ContextSwitch * this) {    

src/libcfa/concurrency/CtxSwitch-x86_64.S

@@ -49 +49 @@
         // Save volatile registers on the stack.
 
+        subq   $8,%rsp
+        stmxcsr 0(%rsp)         // 4 bytes
+        fnstcw  4(%rsp)         // 2 bytes
         pushq %r15
         pushq %r14
@@ -72 +75 @@
         popq %r14
         popq %r15
+        fldcw   4(%rsp)
+        ldmxcsr 0(%rsp)
+        addq $8,%rsp
 
         // Return to thread.

src/libcfa/concurrency/coroutines

@@ -30 +30 @@
 };
 
-#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this);
+#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
 
 //-----------------------------------------------------------------------------
@@ -110 +110 @@
 }
 
+static inline void resume(coroutine * dst) {
+        coroutine * src = this_coroutine();             // optimization
+
+      // not resuming self ?
+        if ( src != dst ) {
+                assertf( dst->notHalted ,
+                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
+                        "Possible cause is terminated coroutine's main routine has already returned.",
+                        src->name, src, dst->name, dst );
+
+            // set last resumer
+                dst->last = src;
+        } // if
+
+      // always done for performance testing
+        CoroutineCtxSwitch( src, dst );
+}
+
 #endif //COROUTINES_H
 

src/libcfa/concurrency/invoke.c

@@ -109 +109 @@
       struct FakeStack {
             void *fixedRegisters[5];                    // fixed registers rbx, r12, r13, r14, r15
-            void *rturn;                                        // where to go on return from uSwitch
+            uint32_t mxcr;                                  // SSE Status and Control bits (control bits are preserved across function calls)
+            uint16_t fcw;                                   // X97 FPU control word (preserved across function calls)
+            void *rturn;                                      // where to go on return from uSwitch
             void *dummyReturn;                          // NULL return address to provide proper alignment
       };
@@ -120 +122 @@
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7 
 #else
       #error Only __i386__ and __x86_64__ is supported for threads in cfa

src/libcfa/concurrency/kernel.c

@@ -43 +43 @@
 };
 
-DECL_COROUTINE(processorCtx_t)
+DECL_COROUTINE(processorCtx_t);
 
 #define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]

src/libcfa/concurrency/threads

@@ -32 +32 @@
 };
 
-#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this);
+#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this)
 
 forall( dtype T | is_thread(T) )

src/libcfa/containers/vector

@@ -118 +118 @@
 }
 
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline const T* cbegin(const vector(T, allocator_t)* this)
-{
-        return data(&this->storage);
-}
+// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
+// static inline const T* cbegin(const vector(T, allocator_t)* this)
+// {
+//      return data(&this->storage);
+// }
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
@@ -130 +130 @@
 }
 
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline const T* cend(const vector(T, allocator_t)* this)
-{
-        return data(&this->storage) + this->size;
-}
+// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
+// static inline const T* cend(const vector(T, allocator_t)* this)
+// {
+//      return data(&this->storage) + this->size;
+// }
 
 //------------------------------------------------------------------------------

src/tests/thread.c

@@ -7 +7 @@
 struct Second { thread t; simple_lock* lock; };
 
-DECL_THREAD(First)
-DECL_THREAD(Second)
+DECL_THREAD(First);
+DECL_THREAD(Second);
 
 void ?{}( First * this, simple_lock* lock ) { this->lock = lock; }