From 47adbbbb6651527a7cf7416702d66fa7ddf5c2a9 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 30 八月 2019 16:36:57 +0800
Subject: [PATCH] recover
---
shm.go | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/shm.go b/shm.go
index 939a859..534fc83 100644
--- a/shm.go
+++ b/shm.go
@@ -4,9 +4,7 @@
"errors"
"fmt"
"io"
- "reflect"
"time"
- "unsafe"
"basic.com/valib/shm.git"
)
@@ -16,7 +14,7 @@
rw *shm.ReadWriteCloser
typ td
- recvData []byte
+ // recvData []byte
}
// Send impl interface Diliver
@@ -51,25 +49,25 @@
// cur
- // data, err := s.rw.DirectRead()
- // if err == nil || err == io.EOF {
- // return data, nil
- // }
+ data, err := s.rw.DirectRead()
+ if err == nil || err == io.EOF {
+ return data, nil
+ }
// new
- if s.recvData == nil {
- s.recvData = make([]byte, maxRecvSize)
- }
- sliceHeader := (*reflect.SliceHeader)(unsafe.Pointer(&s.recvData))
- // sliceHeader.Cap = maxRecvSize
- sliceHeader.Len = maxRecvSize
+ // if s.recvData == nil {
+ // s.recvData = make([]byte, maxRecvSize)
+ // }
+ // sliceHeader := (*reflect.SliceHeader)(unsafe.Pointer(&s.recvData))
+ // // sliceHeader.Cap = maxRecvSize
+ // sliceHeader.Len = maxRecvSize
- n, err := s.rw.Read(s.recvData)
- if err == nil || err == io.EOF {
- sliceHeader.Len = n
- return s.recvData, nil
- }
+ // n, err := s.rw.Read(s.recvData)
+ // if err == nil || err == io.EOF {
+ // sliceHeader.Len = n
+ // return s.recvData, nil
+ // }
return nil, err
}
--
Gitblit v1.8.0