From 8c7dd4313817f6854461a64a7cadb7d970fb3e88 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 09:56:37 +0800
Subject: [PATCH] run nomally
---
util/util.go | 103 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 79 insertions(+), 24 deletions(-)
diff --git a/util/util.go b/util/util.go
index 96b3edc..264880a 100644
--- a/util/util.go
+++ b/util/util.go
@@ -1,11 +1,21 @@
package util
-import(
- "github.com/pierrec/lz4"
- "taskpubsub/logger"
- )
+import (
+ "context"
+ "errors"
+ "fmt"
+ "basic.com/valib/deliver.git"
+ // "github.com/pierrec/lz4"
+ "taskpubsub/logger"
+)
+
+type SocketContext struct {
+ Sock deliver.Deliver
+ Context context.Context
+ Cancel context.CancelFunc
+}
// 1. oldstring element is not in new : abandon(delete)
// 2. new element is not in oldstring : add(add)
@@ -41,28 +51,73 @@
// UnCompress uncompress
func UnCompress(in []byte) ([]byte, error) {
- out := make([]byte, 10*len(in))
- n, err := lz4.UncompressBlock(in, out)
- if err != nil {
- logger.Error("uncompress error: ", err)
- return nil, err
- }
- out = out[:n] // uncompressed data
- return out, nil
+ return in, nil
+
+ // out := make([]byte, 3*len(in))
+ // n, err := lz4.UncompressBlock(in, out)
+ // if err != nil {
+ // logger.Error("uncompress error: ", err)
+ // return nil, err
+ // }
+ // out = out[:n] // uncompressed data
+ // return out, nil
}
// Compress compress
func Compress(in []byte) ([]byte, error) {
- out := make([]byte, len(in))
- ht := make([]int, 64<<10) // buffer for the compression table
- n, err := lz4.CompressBlock(in, out, ht)
- if err != nil {
- logger.Error("compress: ", err)
- return nil, err
- }
- if n >= len(in) {
- logger.Error("image is not compressible")
- }
- out = out[:n] // compressed data
- return out, nil
+ return in, nil
+
+ // out := make([]byte, len(in))
+ // ht := make([]int, 64<<10) // buffer for the compression table
+ // n, err := lz4.CompressBlock(in, out, ht)
+ // if err != nil {
+ // logger.Error("compress: ", err)
+ // return nil, err
+ // }
+ // if n >= len(in) {
+ // logger.Error("image is not compressible")
+ // }
+ // out = out[:n] // compressed data
+ // return out, nil
+}
+
+// create server
+func NewSocketListen(mode int, url string, shm bool) (socket SocketContext, err error) {
+ logger.Info("url is: ", url)
+ ctx, cancel := context.WithCancel(context.Background())
+
+ socket.Context = ctx
+ socket.Cancel = cancel
+
+ if shm {
+ var err error
+ socket.Sock, err = deliver.NewServerWithError(deliver.Mode(mode), url)
+ if err != nil {
+ fmt.Println("TASK CREATE SERVER SHM ERROR: ", err)
+ }
+ } else {
+ socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
+ }
+
+ if socket.Sock == nil {
+ return socket, errors.New("create listen error")
+ }
+
+ return socket, nil
+}
+
+func NewSocketDial(mode int, url string) (socket SocketContext, err error) {
+ logger.Info("url is: ", url)
+ ctx, cancel := context.WithCancel(context.Background())
+
+ socket.Context = ctx
+ socket.Cancel = cancel
+
+ socket.Sock = deliver.NewClient(deliver.Mode(mode), url)
+
+ if socket.Sock == nil {
+ return socket, errors.New("create listen error")
+ }
+
+ return socket, nil
}
--
Gitblit v1.8.0