Changeset 34687d3

Timestamp:

Dec 17, 2020, 12:59:37 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:

8235415

Parents:

024fa4b

Message:

Added some debugging comments and a return value if closed

File:

• benchmark/readyQ/locality.go (modified) (7 diffs)

benchmark/readyQ/locality.go

@@ -17 +17 @@
 type GoCtx struct {
         s * semaphore.Weighted
-        d * [] uint64
+        d unsafe.Pointer
         c context.Context
+        id int
 }
 
 type Spot struct {
         ptr uintptr
+        id int
 }
 
@@ -29 +31 @@
 // Next threads unblocks current one and blocks in its place
 // if share == true, exchange data in the process
-func (this * Spot) put( ctx * GoCtx, data * [] uint64, share bool) (* [] uint64) {
+func (this * Spot) put( ctx * GoCtx, data * [] uint64, share bool) (* [] uint64, bool) {
         new := uintptr(unsafe.Pointer(ctx))
-        // fmt.Printf("Enter with %p\n", data)
+        old_d := ctx.d
         var raw uintptr
         for true {
                 raw = this.ptr
                 if raw == uintptr(1) {
-                        return nil
+                        return nil, true
                 }
                 if atomic.CompareAndSwapUintptr(&this.ptr, raw, new) {
@@ -47 +49 @@
                 val = (*GoCtx)(unsafe.Pointer(raw))
                 if share {
-                        val.d = data
+                        // fmt.Printf("[%d] - %d update %d: %p -> %p\n", this.id, ctx.id, val.id, val.d, data)
+                        atomic.StorePointer(&val.d, unsafe.Pointer(data))
                 }
 
+                // fmt.Printf("[%d] - %d release %d\n", this.id, ctx.id, val.id)
                 val.s.Release(1)
         }
 
+        // fmt.Printf("[%d] - %d enter\n", this.id, ctx.id)
         ctx.s.Acquire(ctx.c, 1)
-        // fmt.Printf("Leave with %p (was %p)\n", ctx.d, data)
-        return ctx.d
+        ret := (* [] uint64)(atomic.LoadPointer(&ctx.d))
+        // fmt.Printf("[%d] - %d leave: %p -> %p\n", this.id, ctx.id, ret, old_d)
+
+        return ret, false
 }
 
@@ -76 +83 @@
 }
 
-func local(result chan uint64, start chan struct{}, size uint64, cnt uint64, channels [] Spot, share bool) {
+func local(result chan uint64, start chan struct{}, size uint64, cnt uint64, channels [] Spot, share bool, id int) {
         state := rand.Uint64()
         var my_data [] uint64
@@ -87 +94 @@
         sem := semaphore.NewWeighted(1)
         sem.Acquire(context.Background(), 1)
-        ctx := GoCtx{sem, data, context.Background()}
+        ctx := GoCtx{sem, unsafe.Pointer(data), context.Background(), id}
 
         count := uint64(0)
@@ -97 +104 @@
 
                 i := __xorshift64(&state) % uint64(len(channels))
-                // data = channels[i].put(sem, data, share)
-                data = channels[i].put(&ctx, data, share)
+                var closed bool
+                data, closed = channels[i].put(&ctx, data, share)
                 count += 1
 
+                if closed { break }
                 if  clock_mode && atomic.LoadInt32(&stop) == 1 { break }
                 if !clock_mode && count >= stop_count { break }
@@ -129 +137 @@
 
         barrierStart := make(chan struct{})
-        threads_left = int64(nthreads)
+        threads_left = int64(nprocs)
         result  := make(chan uint64)
         channels := make([]Spot, nthreads - nprocs)
         for i := range channels {
-                channels[i] = Spot{uintptr(0)}
+                channels[i] = Spot{uintptr(0), i}
         }
 
         for i := 0; i < nthreads; i++ {
-                go local(result, barrierStart, size, cnt, channels, share)
+                go local(result, barrierStart, size, cnt, channels, share, i)
         }
         fmt.Printf("Starting\n");