| camera/camera.go | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| go.mod | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| go.sum | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk/sdk.go | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| util/util.go | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
camera/camera.go
@@ -5,10 +5,11 @@ //"sync" "taskpubsub/logger" "basic.com/pubsub/protomsg.git" "github.com/gogo/protobuf/proto" "taskpubsub/sdk" "taskpubsub/util" "basic.com/pubsub/protomsg.git" "github.com/gogo/protobuf/proto" // "golang.org/x/sys/unix" @@ -61,14 +62,13 @@ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id) m := deliver.PushPull if shm{ if shm { m = deliver.Shm url = id // unix.Unlink("/dev/shm/" + url) } fmt.Println("ipc url: ", url) fmt.Println("CAMERA URL : ", url) socket, err := util.NewSocketListen(int(m), url, shm) if err != nil { logger.Error("create socket error") go.mod
@@ -5,8 +5,9 @@ require ( basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65 basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2 basic.com/valib/deliver.git v0.0.0-20190823025733-20dc6375d16b basic.com/valib/deliver.git v0.0.0-20190826090841-20a4c4bfb5b9 basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 basic.com/valib/shm.git v0.0.0-20190826090635-7db9aba5ca93 // indirect github.com/ajg/form v1.5.1 // indirect github.com/gogo/protobuf v1.2.1 github.com/golang/protobuf v1.3.1 @@ -14,8 +15,6 @@ github.com/pierrec/lz4 v2.0.5+incompatible github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877 // indirect github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9 // indirect github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290 // indirect golang.org/x/net v0.0.0-20190522155817-f3200d17e092 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a nanomsg.org/go-mangos v1.4.0 go.sum
@@ -14,10 +14,12 @@ basic.com/pubsub/protomsg.git v0.0.0-20190705101637-65381a182a3c/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU= basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2 h1:ygh9CQPS48KmXv+PNUrOcrMqIiDZOs11apnQdu9oGEY= basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU= basic.com/valib/deliver.git v0.0.0-20190823025733-20dc6375d16b h1:BWrfRuo6j24guzxJt851Hfi0DuHk1vto0ogjbnfbY8A= basic.com/valib/deliver.git v0.0.0-20190823025733-20dc6375d16b/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY= basic.com/valib/deliver.git v0.0.0-20190826090841-20a4c4bfb5b9 h1:l6IGWLIdjdnGw+KHz8WY5XRsuPcN7o1p8Bg0DGvcVng= basic.com/valib/deliver.git v0.0.0-20190826090841-20a4c4bfb5b9/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY= basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 h1:3hejanzPEBvZSSvjIqayB83/6/6SLLrX9oNZAdiYELg= basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28/go.mod h1:CQ+UJyZV8MRzwwckncdUDu6/RDTKAzSIPCxc9tFcwPs= basic.com/valib/shm.git v0.0.0-20190826090635-7db9aba5ca93 h1:KawyUKwFGIQIv043VGV1QvXOiU8aq7DEyB3QhAq+Syc= basic.com/valib/shm.git v0.0.0-20190826090635-7db9aba5ca93/go.mod h1:yYRM7bM9y0KKd4IfNt3myjsvkFVFIIWNjsvK14tNbq4= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= @@ -36,10 +38,6 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877 h1:n65+IT/xy5+trHm3Zpg9+j7IO4n8pBcPzvaKbMolW8U= github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877/go.mod h1:sgTk9wg3WurMlziuB3hcfgHYTz3pEkjQpSCTT8V2pW8= github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9 h1:uVRQSWD6TOlWlLJ7IYYmbjRr0Xg35ADFN89HGQLPFGI= github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9/go.mod h1:vy1jksyhzuQOMkHXMEi+X2bZ47ZeCn3QTnYdFBesABs= github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290 h1:5zW+TRr0WH4uN72/E/XYwb1PcaYN5BIB/FUbcQ0nHr0= github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290/go.mod h1:e9PZQr6zVezMTwj1v0j1YhGCNdS2zTCjXU9q9K+HHGk= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= sdk/sdk.go
@@ -4,13 +4,15 @@ "fmt" // "golang.org/x/sys/unix" "github.com/gogo/protobuf/proto" "taskpubsub/tasktag" "taskpubsub/util" "github.com/gogo/protobuf/proto" "taskpubsub/logger" "basic.com/pubsub/protomsg.git" "basic.com/valib/deliver.git" "taskpubsub/logger" ) const ( @@ -90,11 +92,13 @@ url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPush) m := deliver.PushPull if shm{ if shm { m = deliver.Shm url = id + postPush // unix.Unlink("/dev/shm/" + url) } fmt.Println("SDK URL: ", url) socket, err := util.NewSocketListen(int(m), url, shm) if err != nil { delete(SdkMap, id) @@ -114,11 +118,10 @@ url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPull) m := deliver.PushPull if shm{ if shm { m = deliver.Shm url = id + postPull // unix.Unlink("/dev/shm/" + url) } socket, err := util.NewSocketListen(int(m), url, shm) util/util.go
@@ -1,9 +1,12 @@ package util import ( "basic.com/valib/deliver.git" "context" "errors" "fmt" "basic.com/valib/deliver.git" // "github.com/pierrec/lz4" "taskpubsub/logger" ) @@ -86,9 +89,13 @@ socket.Context = ctx socket.Cancel = cancel if shm{ socket.Sock = deliver.NewServer(deliver.Mode(mode), url) }else{ 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) }
