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 |  117 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/shm.go b/shm.go
index 21f8167..0cc0bad 100644
--- a/shm.go
+++ b/shm.go
@@ -4,20 +4,24 @@
 	"errors"
 	"fmt"
 	"io"
+	"reflect"
+	"time"
+	"unsafe"
 
-	"github.com/tmthrgd/shm-go"
+	"basic.com/valib/shm.git"
 )
 
 // SHM share memory
 type SHM struct {
-	rw   *shm.ReadWriteCloser
-	typ  td
-	data []byte
+	rw  *shm.ReadWriteCloser
+	typ td
+
+	recvData []byte
 }
 
 // Send impl interface Diliver
 func (s *SHM) Send(data []byte) error {
-	if s.rw == nil {
+	if s == nil || s.rw == nil {
 		return errors.New("please init shm producer first")
 	}
 
@@ -32,21 +36,64 @@
 // Recv impl interface Diliver
 func (s *SHM) Recv() ([]byte, error) {
 
-	if s.rw == nil {
+	if s == nil || s.rw == nil {
 		return nil, errors.New("please open shm consumer first")
 	}
 
-	n, err := s.rw.Read(s.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 {
-		s.data = s.data[:n:n]
-		return s.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
 func (s *SHM) Close() {
+	if s == nil {
+		return
+	}
 	if s.rw != nil {
 		s.rw.Close()
 	}
@@ -55,56 +102,54 @@
 	}
 }
 
-func shmServer(m Mode, url string, args ...interface{}) *SHM {
+func shmServer(m Mode, url string, args ...interface{}) (*SHM, error) {
 	if m != Shm {
-		fmt.Println("this is not a shm mode: ", m)
-		return nil
+		return nil, errors.New("please use deliver.Shm mode")
 	}
 
 	var param []int
 	for _, v := range args {
-		fmt.Println(v)
 		switch v.(type) {
 		case int:
 			param = append(param, v.(int))
 		default:
-			fmt.Println("shmProducer recv error parameters")
 
-			return nil
+			return nil, errors.New("shmServer created recv error parameters")
 		}
 	}
-	if len(param) != 2 {
-		fmt.Println("shmProducer recv too much parameter: ", len(param))
-		return nil
+
+	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)
-	if rw, err := shm.CreateSimplex(url, 0644, param[0], param[1]); err == nil {
+
+	rw, err := shm.CreateSimplex(url, 0644, blocks, size)
+	if err == nil {
 		fmt.Println(rw.Name())
 		return &SHM{
-			rw,
-			agent,
-			nil,
-		}
+			rw:  rw,
+			typ: agent,
+		}, nil
 	}
 
-	fmt.Println("create simple shm error")
-	return nil
+	return nil, err
 }
 
-func shmClient(m Mode, url string, args ...interface{}) *SHM {
-
+func shmClient(m Mode, url string, args ...interface{}) (*SHM, error) {
 	if m != Shm {
-		fmt.Println("this is not a shm mode: ", m)
-		return nil
+		return nil, errors.New("please use deliver.Shm mode")
 	}
 
-	if rw, err := shm.OpenSimplex(url); err == nil {
+	rw, err := shm.OpenSimplex(url)
+	if err == nil {
 		return &SHM{
-			rw,
-			coactee,
-			make([]byte, maxRecvSize),
-		}
+			rw:  rw,
+			typ: coactee,
+		}, nil
 	}
-	fmt.Println("shmConsumer open error")
-	return nil
+	return nil, err
 }

--
Gitblit v1.8.0