From 2d390df9ede39c9d7c34bd8190b9329cfc371325 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 27 九月 2019 16:19:05 +0800
Subject: [PATCH] remove exist ipc

---
 shm.go |   69 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/shm.go b/shm.go
index 8d40445..534fc83 100644
--- a/shm.go
+++ b/shm.go
@@ -4,14 +4,17 @@
 	"errors"
 	"fmt"
 	"io"
+	"time"
 
-	"github.com/tmthrgd/shm-go"
+	"basic.com/valib/shm.git"
 )
 
 // SHM share memory
 type SHM struct {
 	rw  *shm.ReadWriteCloser
 	typ td
+
+	// recvData []byte
 }
 
 // Send impl interface Diliver
@@ -35,14 +38,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 {
-		data = data[:n:n]
 		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
+
+	// n, err := s.rw.Read(s.recvData)
+	// if err == nil || err == io.EOF {
+	// 	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
@@ -65,7 +107,6 @@
 
 	var param []int
 	for _, v := range args {
-		fmt.Println(v)
 		switch v.(type) {
 		case int:
 			param = append(param, v.(int))
@@ -74,18 +115,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
 	}
 
@@ -100,8 +145,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