From 91ca2658d546bf5d9857b144e6beefa1019ba972 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 11 九月 2019 18:47:03 +0800
Subject: [PATCH] 合并张蒙的共享内存，增加logger
---
main.go | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/main.go b/main.go
index f33ff3a..2888fd0 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,6 @@
"flag"
_ "net/http/pprof"
"time"
-
"taskpubsub/camera"
"taskpubsub/sdk"
"taskpubsub/tasktag"
@@ -16,6 +15,8 @@
var initchan = make(chan bool)
+var useShm bool
+
func init(){
var logFile = "./taskpubsub.log"
var logSaveDays = 15
@@ -23,13 +24,20 @@
// 鏃ュ織鍒濆鍖�
logger.Config(logFile, logger.InfoLevel)
logger.SetSaveDays(logSaveDays)
- logger.Info("loginit success !")
+ logger.Info("loginit success !")
+
+ flag.BoolVar(&useShm, "shm", false, "use shm for performance")
}
-func main() {
+func main() {
flag.Parse()
time.Sleep(time.Second)
+ if useShm{
+ logger.Info("USE SHARE MEMORY")
+ }else{
+ logger.Info("USE PIPE")
+ }
// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
go func() {
logger.Info(http.ListenAndServe("0.0.0.0:6061", nil))
@@ -38,8 +46,8 @@
go util.Init(initchan)
logger.Info("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
- sdk.Init() // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+ sdk.Init(useShm) // 鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
- camera.Init() //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+ camera.Init(useShm) //鑾峰彇cid, taskid, sdkid ,鍏崇郴
select {}
}
--
Gitblit v1.8.0