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 |  102 +++++++++++++++++++++++++++-----------------------
 1 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/shm.go b/shm.go
index 6b61dbc..534fc83 100644
--- a/shm.go
+++ b/shm.go
@@ -1,20 +1,20 @@
 package deliver
 
 import (
-	"bytes"
 	"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
+	rw  *shm.ReadWriteCloser
+	typ td
+
+	// recvData []byte
 }
 
 // Send impl interface Diliver
@@ -23,26 +23,12 @@
 		return errors.New("please init shm producer first")
 	}
 
-	ch := make(chan int)
-	go func(){
-		n, _ := s.rw.Write(data)
-		ch <- n
-	}()
-	select{
-	case <-ch:
-		return nil
-	case <- time.After(3 * time.Second):
-		return errors.New("send time out")
+	n, err := s.rw.Write(data)
+	if n < 1 {
+		fmt.Println("recv data less than 1 length")
 	}
 
-	return errors.New("send should't here")
-
-	// n, err := s.rw.Write(data)
-	// if n < 1 {
-	// 	fmt.Println("recv data less than 1 length")
-	// }
-
-	// return err
+	return err
 }
 
 // Recv impl interface Diliver
@@ -52,33 +38,53 @@
 		return nil, errors.New("please open shm consumer first")
 	}
 
-	ch := make(chan []byte)
-	go func(){
-		buffer := new(bytes.Buffer)
-		_, err := s.rw.WriteTo(buffer)
-		if err == nil || err == io.EOF {
-			ch <- buffer.Bytes()
-		}
-		ch <- nil
-	}()
-	select{
-	case d := <-ch:
-		return d, nil
-	case <- time.After(3 * time.Second):
-		return nil, errors.New("recv time out")
-	}
-
-	return nil, errors.New("recv should't here")
-
+	// orig
 
 	// data := make([]byte, maxRecvSize)
 	// n, err := s.rw.Read(data)
 	// if err == nil || err == io.EOF {
-	// 	data = data[:n:n]
+	// 	data := data[:n:n]
 	// 	return data, nil
 	// }
 
-	// return nil, err
+	// 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 = 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
@@ -115,14 +121,16 @@
 		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, blocks, size)
 	if err == nil {
 		fmt.Println(rw.Name())
 		return &SHM{
-			rw,
-			agent,
+			rw:  rw,
+			typ: agent,
 		}, nil
 	}
 
@@ -137,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