bug fixed withintime

zhangmeng

2021-09-24 82a262ef5cf721e5a236c8b1d2ab3ff92ca33122

 shmwrap.go

@@ -4,7 +4,12 @@
    "context"
    "fmt"
    "time"
    "github.com/gen2brain/shm"
    shm "basic.com/valib/goshm.git"
)

const (
    sleepPeriod = time.Duration(5) * time.Millisecond
    attachTimes = 100
)

// NewBlock shm block with size
@@ -72,7 +77,7 @@
                if err == nil {
                    break loopB
                }
                time.Sleep(time.Millisecond)
                time.Sleep(sleepPeriod)
                data, id, err = NewBlock(size, key)
            }
        }
@@ -93,8 +98,31 @@
                if err == nil {
                    break loopB
                }
                time.Sleep(time.Millisecond)
                time.Sleep(sleepPeriod)
                data, id, err = AttachBlock(key)
            }
        }
    }
    return data, id
}

//AttachRawShmTimeout don't create
func AttachRawShmTimeout(ctx context.Context, key int) ([]byte, int) {
    tryCount := 0
    data, id, err := AttachBlock(key)
    if err != nil {
    loopB:
        for {
            select {
            case <-ctx.Done():
                return nil, -1
            default:
                if err == nil || tryCount > attachTimes {
                    break loopB
                }
                time.Sleep(sleepPeriod)
                data, id, err = AttachBlock(key)
                tryCount++
            }
        }
    }
@@ -115,7 +143,33 @@
                if err == nil {
                    break loopB
                }
                time.Sleep(time.Millisecond)
                time.Sleep(sleepPeriod)
                id, err = NewBlockOnly(size, key)
            }
        }
    }
    return id
}

// CreateShmOnly create shm block with size, only space, no padding, return id(int)
// context for quit
func CreateShmOnlyTime(ctx context.Context, size int, key int, timeout int) int {
    id, err := NewBlockOnly(size, key)
    if err != nil {
        to := time.NewTimer(time.Duration(timeout) * time.Millisecond)
        defer to.Stop()
    loopB:
        for {
            select {
            case <-ctx.Done():
                return -1
            case <-to.C:
                return -1
            default:
                if err == nil {
                    break loopB
                }
                time.Sleep(sleepPeriod)
                id, err = NewBlockOnly(size, key)
            }
        }
@@ -139,7 +193,7 @@
                } else {
                    fmt.Println("createShm error:", err)
                }
                time.Sleep(time.Millisecond)
                time.Sleep(sleepPeriod)
                data, id, err = NewBlock(size, key)
            }
        }