From 4f3bd6a122917eed4b5a5ead80a05ef9c143e395 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 30 八月 2019 16:12:20 +0800
Subject: [PATCH] test one data

---
 shm.go |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/shm.go b/shm.go
index 0edb422..0cc0bad 100644
--- a/shm.go
+++ b/shm.go
@@ -4,6 +4,9 @@
 	"errors"
 	"fmt"
 	"io"
+	"reflect"
+	"time"
+	"unsafe"
 
 	"basic.com/valib/shm.git"
 )
@@ -12,6 +15,8 @@
 type SHM struct {
 	rw  *shm.ReadWriteCloser
 	typ td
+
+	recvData []byte
 }
 
 // Send impl interface Diliver
@@ -35,14 +40,53 @@
 		return nil, errors.New("please open shm consumer first")
 	}
 
-	data := make([]byte, maxRecvSize)
-	n, err := s.rw.Read(data)
+	// orig
+
+	// data := make([]byte, maxRecvSize)
+	// n, err := s.rw.Read(data)
+	// if err == nil || err == io.EOF {
+	// 	data := data[:n:n]
+	// 	return data, nil
+	// }
+
+	// cur
+
+	// 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 = 0
+
+	n, err := s.rw.Read(s.recvData)
 	if err == nil || err == io.EOF {
-		data = data[:n:n]
-		return data, nil
+		sliceHeader.Len = n
+		return s.recvData, nil
 	}
 
 	return nil, err
+}
+
+// Recv2 impl interface
+func (s *SHM) Recv2(data []byte) (int, error) {
+	if s == nil || s.rw == nil {
+		return 0, errors.New("please open shm consumer first")
+	}
+
+	n, err := s.rw.Read(data)
+	if err == nil || err == io.EOF {
+		data = data[:n:n]
+		return n, nil
+	}
+
+	return 0, err
 }
 
 // Close impl interface Deliver
@@ -73,18 +117,22 @@
 			return nil, errors.New("shmServer created recv error parameters")
 		}
 	}
-	if len(param) != 2 {
-		return nil, errors.New("shmServer created recv too much parameters")
+
+	blocks, size := 2, maxRecvSize
+	if len(param) == 2 {
+		blocks, size = param[0], param[1]
+		// return nil, errors.New("shmServer created recv too much parameters")
 	}
 
+	time.Sleep(time.Millisecond)
 	shm.Unlink(url)
 
-	rw, err := shm.CreateSimplex(url, 0644, param[0], param[1])
+	rw, err := shm.CreateSimplex(url, 0644, blocks, size)
 	if err == nil {
 		fmt.Println(rw.Name())
 		return &SHM{
-			rw,
-			agent,
+			rw:  rw,
+			typ: agent,
 		}, nil
 	}
 
@@ -99,8 +147,8 @@
 	rw, err := shm.OpenSimplex(url)
 	if err == nil {
 		return &SHM{
-			rw,
-			coactee,
+			rw:  rw,
+			typ: coactee,
 		}, nil
 	}
 	return nil, err

--
Gitblit v1.8.0