mediocregopher/mediocre-go-lib
1
0
Fork 0
Code Releases Activity

mrun: make Thread's callback not take in a context, it doesn't really help anything

Browse Source
This commit is contained in:
Brian Picciano 2019-01-24 19:18:44 -05:00
parent bd4d7fc9e3
commit 5f864c44f2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mrun/mrun.go
View File

@ -40,7 +40,7 @@ type ctxKey int
// be canceled as well. // be canceled as well.
// //
// See Wait for accompanying functionality. // See Wait for accompanying functionality.
func Thread(ctx mctx.Context, fn func(mctx.Context) error) { func Thread(ctx mctx.Context, fn func() error) {
futErr := newFutureErr() futErr := newFutureErr()
mctx.GetSetMutableValue(ctx, false, ctxKey(0), func(i interface{}) interface{} { mctx.GetSetMutableValue(ctx, false, ctxKey(0), func(i interface{}) interface{} {
futErrs, ok := i.([]*futureErr) futErrs, ok := i.([]*futureErr)
@ -51,7 +51,7 @@ func Thread(ctx mctx.Context, fn func(mctx.Context) error) {
}) })
go func() { go func() {
futErr.set(fn(ctx)) futErr.set(fn())
}() }()
} }

20
mrun/mrun_test.go
View File

@ -29,7 +29,7 @@ func TestThreadWait(t *T) {
t.Run("noBlock", func(t *T) { t.Run("noBlock", func(t *T) {
t.Run("noErr", func(t *T) { t.Run("noErr", func(t *T) {
ctx := mctx.New() ctx := mctx.New()
Thread(ctx, func(mctx.Context) error { return nil }) Thread(ctx, func() error { return nil })
if err := Wait(ctx, nil); err != nil { if err := Wait(ctx, nil); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -37,7 +37,7 @@ func TestThreadWait(t *T) {
t.Run("err", func(t *T) { t.Run("err", func(t *T) {
ctx := mctx.New() ctx := mctx.New()
Thread(ctx, func(mctx.Context) error { return testErr }) Thread(ctx, func() error { return testErr })
if err := Wait(ctx, nil); err != testErr { if err := Wait(ctx, nil); err != testErr {
t.Fatalf("should have got test error, got: %v", err) t.Fatalf("should have got test error, got: %v", err)
} }
@ -47,7 +47,7 @@ func TestThreadWait(t *T) {
t.Run("block", func(t *T) { t.Run("block", func(t *T) {
t.Run("noErr", func(t *T) { t.Run("noErr", func(t *T) {
ctx := mctx.New() ctx := mctx.New()
Thread(ctx, func(mctx.Context) error { Thread(ctx, func() error {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
return nil return nil
}) })
@ -58,7 +58,7 @@ func TestThreadWait(t *T) {
t.Run("err", func(t *T) { t.Run("err", func(t *T) {
ctx := mctx.New() ctx := mctx.New()
Thread(ctx, func(mctx.Context) error { Thread(ctx, func() error {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
return testErr return testErr
}) })
@ -69,7 +69,7 @@ func TestThreadWait(t *T) {
t.Run("canceled", func(t *T) { t.Run("canceled", func(t *T) {
ctx := mctx.New() ctx := mctx.New()
Thread(ctx, func(mctx.Context) error { Thread(ctx, func() error {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
return testErr return testErr
}) })
@ -89,7 +89,7 @@ func TestThreadWait(t *T) {
t.Run("noBlock", func(t *T) { t.Run("noBlock", func(t *T) {
t.Run("noErr", func(t *T) { t.Run("noErr", func(t *T) {
ctx, childCtx := ctxWithChild() ctx, childCtx := ctxWithChild()
Thread(childCtx, func(mctx.Context) error { return nil }) Thread(childCtx, func() error { return nil })
if err := Wait(ctx, nil); err != nil { if err := Wait(ctx, nil); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -97,7 +97,7 @@ func TestThreadWait(t *T) {
t.Run("err", func(t *T) { t.Run("err", func(t *T) {
ctx, childCtx := ctxWithChild() ctx, childCtx := ctxWithChild()
Thread(childCtx, func(mctx.Context) error { return testErr }) Thread(childCtx, func() error { return testErr })
if err := Wait(ctx, nil); err != testErr { if err := Wait(ctx, nil); err != testErr {
t.Fatalf("should have got test error, got: %v", err) t.Fatalf("should have got test error, got: %v", err)
} }
@ -107,7 +107,7 @@ func TestThreadWait(t *T) {
t.Run("block", func(t *T) { t.Run("block", func(t *T) {
t.Run("noErr", func(t *T) { t.Run("noErr", func(t *T) {
ctx, childCtx := ctxWithChild() ctx, childCtx := ctxWithChild()
Thread(childCtx, func(mctx.Context) error { Thread(childCtx, func() error {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
return nil return nil
}) })
@ -118,7 +118,7 @@ func TestThreadWait(t *T) {
t.Run("err", func(t *T) { t.Run("err", func(t *T) {
ctx, childCtx := ctxWithChild() ctx, childCtx := ctxWithChild()
Thread(childCtx, func(mctx.Context) error { Thread(childCtx, func() error {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
return testErr return testErr
}) })
@ -129,7 +129,7 @@ func TestThreadWait(t *T) {
t.Run("canceled", func(t *T) { t.Run("canceled", func(t *T) {
ctx, childCtx := ctxWithChild() ctx, childCtx := ctxWithChild()
Thread(childCtx, func(mctx.Context) error { Thread(childCtx, func() error {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
return testErr return testErr
}) })