commit

aarch64/kinglong/common/service/kill_self.go

@@ -70,7 +70,7 @@ func WaitKillSelf() {
 
 func AddKillTimes(info string) {
 	MutexKill.Lock()
-
+	defer MutexKill.Unlock()
 	switch info {
 	case "1":
 		close(ChannelKillRosRecord)
@@ -94,7 +94,6 @@ func AddKillTimes(info string) {
 		KillTimes++
 		c_log.GlobalLogger.Infof("已杀死bag包消费goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 	}
-	MutexKill.Unlock()
 }
 
 func killDone(restart bool) {

aarch64/pji/common/service/kill_self.go

@@ -72,7 +72,7 @@ func WaitKillSelf() {
 
 func AddKillTimes(info string) {
 	MutexKill.Lock()
-
+	defer MutexKill.Unlock()
 	switch info {
 	case "1":
 		ChannelKillDiskClean <- 1
@@ -96,7 +96,6 @@ func AddKillTimes(info string) {
 		KillTimes++
 		c_log.GlobalLogger.Infof("已杀死 bag 包消费 goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 	}
-	MutexKill.Unlock()
 }
 
 func killDone(restart bool) {

aarch64/pjisuv/common/service/kill_self.go

@@ -36,7 +36,7 @@ func (m *KillService) Kill(args *KillSignal, reply *int) error {
 	c_log.GlobalLogger.Info("接收到自杀信号：", *args)
 	// 1 杀死 rosbag record 命令
 	ChannelKillRosRecord <- 1
-	// 2 杀死所有 ros 订阅者
+	// 2 杀死所有 ros 订阅者（时间窗口生辰这）
 	ChannelKillWindowProducer <- 1
 	if args.DropUploadData == true {
 		// 3-1 等待上传结束再杀死
@@ -69,7 +69,7 @@ func WaitKillSelf() {
 
 func AddKillTimes(info string) {
 	MutexKill.Lock()
-
+	defer MutexKill.Unlock()
 	switch info {
 	case "1":
 		close(ChannelKillRosRecord)
@@ -93,7 +93,6 @@ func AddKillTimes(info string) {
 		KillTimes++
 		c_log.GlobalLogger.Infof("已杀死bag包消费goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 	}
-	MutexKill.Unlock()
 }
 
 func killDone(restart bool) {

aarch64/pjisuv/common/service/rosbag_clean.go

@@ -14,6 +14,7 @@ func BagCacheClean() {
 		// 收到自杀信号
 		select {
 		case signal := <-ChannelKillDiskClean:
+			c_log.GlobalLogger.Info("data目录bag清理线程接收到自杀信号")
 			if signal == 1 {
 				AddKillTimes("2")
 				return

aarch64/pjisuv/common/service/rosbag_upload.go

@@ -22,6 +22,7 @@ outLoop:
 		// 收到自杀信号
 		select {
 		case signal := <-ChannelKillConsume:
+			c_log.GlobalLogger.Info("消费者队列接收到自杀信号：", signal)
 			if signal == 1 {
 				ChannelKillConsume <- 1
 				if len(entity.TimeWindowConsumerQueue) == 0 {

aarch64/pjisuv/slave/package/service/move_bag.go

@@ -16,6 +16,7 @@ func RunTimeWindowProducerQueue() {
 	for { // 必须串行排队处理
 		select {
 		case signal := <-commonService.ChannelKillMove:
+			c_log.GlobalLogger.Info("生产者队列接收到自杀信号", signal)
 			if signal == 1 {
 				commonService.ChannelKillMove <- 1
 				if len(entity.TimeWindowProducerQueue) == 0 {