merge (23b79a31) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-loc-serv/server/loc-serv.go

+58 −29

Original line number	Original line	Diff line number	Diff line
	@@ -122,6 +122,7 @@ type ZoneStatusCheck struct {
	type DistanceCheck struct {		type DistanceCheck struct {
	NextTts int32 //next time to send, derived from frequency		NextTts int32 //next time to send, derived from frequency
	NbNotificationsSent int32		NbNotificationsSent int32
			NotificationCheckReady bool
	Subscription *DistanceNotificationSubscription		Subscription *DistanceNotificationSubscription
	}		}

	@@ -129,6 +130,7 @@ type AreaCircleCheck struct {
	NextTts int32 //next time to send, derived from frequency		NextTts int32 //next time to send, derived from frequency
	AddrInArea map[string]bool		AddrInArea map[string]bool
	NbNotificationsSent int32		NbNotificationsSent int32
			NotificationCheckReady bool
	Subscription *CircleNotificationSubscription		Subscription *CircleNotificationSubscription
	}		}

	@@ -280,6 +282,7 @@ func Run() (err error) {
	go func() {		go func() {
	for range periodicTicker.C {		for range periodicTicker.C {
	checkNotificationDistancePeriodicTrigger()		checkNotificationDistancePeriodicTrigger()
			updateNotificationAreaCirclePeriodicTrigger()
	checkNotificationPeriodicTrigger()		checkNotificationPeriodicTrigger()
	}		}
	}()		}()
	@@ -503,6 +506,25 @@ func registerUser(userAddress string, event []UserEventType, subsIdStr string) {
	userSubscriptionMap[subsId] = userAddress		userSubscriptionMap[subsId] = userAddress
	}		}

			func updateNotificationAreaCirclePeriodicTrigger() {
			//only check if there is at least one subscription
			mutex.Lock()
			defer mutex.Unlock()

			for _, areaCircleCheck := range areaCircleSubscriptionMap {
			if areaCircleCheck != nil {
			if areaCircleCheck.NextTts != 0 {
			areaCircleCheck.NextTts--
			}
			if areaCircleCheck.NextTts == 0 {
			areaCircleCheck.NotificationCheckReady = true
			} else {
			areaCircleCheck.NotificationCheckReady = false
			}
			}
			}
			}

	func checkNotificationDistancePeriodicTrigger() {		func checkNotificationDistancePeriodicTrigger() {

	//only check if there is at least one subscription		//only check if there is at least one subscription
	@@ -512,13 +534,19 @@ func checkNotificationDistancePeriodicTrigger() {
	for subsId, distanceCheck := range distanceSubscriptionMap {		for subsId, distanceCheck := range distanceSubscriptionMap {
	if distanceCheck != nil && distanceCheck.Subscription != nil {		if distanceCheck != nil && distanceCheck.Subscription != nil {
	if distanceCheck.Subscription.Count == 0 \|\| (distanceCheck.Subscription.Count != 0 && distanceCheck.NbNotificationsSent < distanceCheck.Subscription.Count) {		if distanceCheck.Subscription.Count == 0 \|\| (distanceCheck.Subscription.Count != 0 && distanceCheck.NbNotificationsSent < distanceCheck.Subscription.Count) {
	//decrement the next time to send a message		if distanceCheck.NextTts != 0 {
	distanceCheck.NextTts--		distanceCheck.NextTts--
	if distanceCheck.NextTts > 0 {		}
			if distanceCheck.NextTts == 0 {
			distanceCheck.NotificationCheckReady = true
			} else {
			distanceCheck.NotificationCheckReady = false
			}

			if !distanceCheck.NotificationCheckReady {
	continue		continue
	} else { //restart the nextTts and continue processing to send notification or not
	distanceCheck.NextTts = distanceCheck.Subscription.Frequency
	}		}

	//loop through every reference address		//loop through every reference address
	returnAddr := make(map[string]*gisClient.Distance)		returnAddr := make(map[string]*gisClient.Distance)
	skipThisSubscription := false		skipThisSubscription := false
	@@ -642,6 +670,8 @@ func checkNotificationDistancePeriodicTrigger() {
	distanceCheck.NbNotificationsSent++		distanceCheck.NbNotificationsSent++
	sendSubscriptionNotification(distanceCheck.Subscription.CallbackReference.NotifyURL, inlineDistanceSubscriptionNotification)		sendSubscriptionNotification(distanceCheck.Subscription.CallbackReference.NotifyURL, inlineDistanceSubscriptionNotification)
	log.Info("Distance Notification"+"("+subsIdStr+") For ", returnAddr)		log.Info("Distance Notification"+"("+subsIdStr+") For ", returnAddr)
			distanceSubscriptionMap[subsId].NextTts = distanceCheck.Subscription.Frequency
			distanceSubscriptionMap[subsId].NotificationCheckReady = false
	}		}
	}		}
	}		}
	@@ -656,13 +686,9 @@ func checkNotificationAreaCircle(addressToCheck string) {
	for subsId, areaCircleCheck := range areaCircleSubscriptionMap {		for subsId, areaCircleCheck := range areaCircleSubscriptionMap {
	if areaCircleCheck != nil && areaCircleCheck.Subscription != nil {		if areaCircleCheck != nil && areaCircleCheck.Subscription != nil {
	if areaCircleCheck.Subscription.Count == 0 \|\| (areaCircleCheck.Subscription.Count != 0 && areaCircleCheck.NbNotificationsSent < areaCircleCheck.Subscription.Count) {		if areaCircleCheck.Subscription.Count == 0 \|\| (areaCircleCheck.Subscription.Count != 0 && areaCircleCheck.NbNotificationsSent < areaCircleCheck.Subscription.Count) {
	//ignoring the frequency and checkImmediate for this subscription since it is considered event based, not periodic		if !areaCircleCheck.NotificationCheckReady {
	/* //decrement the next time to send a message
	if areaCircleCheck.NextTts > 0 {
	continue		continue
	} else { //restart the nextTts and continue processing to send notification or not		}
	areaCircleCheck.NextTts = areaCircleCheck.Subscription.Frequency
	}*/

	//loop through every reference address		//loop through every reference address
	for _, addr := range areaCircleCheck.Subscription.Address {		for _, addr := range areaCircleCheck.Subscription.Address {
	@@ -745,6 +771,8 @@ func checkNotificationAreaCircle(addressToCheck string) {
	areaCircleCheck.NbNotificationsSent++		areaCircleCheck.NbNotificationsSent++
	sendSubscriptionNotification(areaCircleCheck.Subscription.CallbackReference.NotifyURL, inlineCircleSubscriptionNotification)		sendSubscriptionNotification(areaCircleCheck.Subscription.CallbackReference.NotifyURL, inlineCircleSubscriptionNotification)
	log.Info("Area Circle Notification" + "(" + subsIdStr + ") For " + addr + " when " + string(*areaCircleCheck.Subscription.EnteringLeavingCriteria) + " area")		log.Info("Area Circle Notification" + "(" + subsIdStr + ") For " + addr + " when " + string(*areaCircleCheck.Subscription.EnteringLeavingCriteria) + " area")
			areaCircleSubscriptionMap[subsId].NextTts = areaCircleCheck.Subscription.Frequency
			areaCircleSubscriptionMap[subsId].NotificationCheckReady = false
	}		}
	}		}
	}		}
	@@ -838,11 +866,12 @@ func registerDistance(distanceSub *DistanceNotificationSubscription, subsIdStr s
	var distanceCheck DistanceCheck		var distanceCheck DistanceCheck
	distanceCheck.Subscription = distanceSub		distanceCheck.Subscription = distanceSub
	distanceCheck.NbNotificationsSent = 0		distanceCheck.NbNotificationsSent = 0
	if distanceSub.CheckImmediate {		//checkImmediate ignored, will be hit on next check anyway
			//if distanceSub.CheckImmediate {
	distanceCheck.NextTts = 0 //next time periodic trigger hits, will be forced to trigger		distanceCheck.NextTts = 0 //next time periodic trigger hits, will be forced to trigger
	} else {		//} else {
	distanceCheck.NextTts = distanceSub.Frequency		// distanceCheck.NextTts = distanceSub.Frequency
	}		// }
	distanceSubscriptionMap[subsId] = &distanceCheck		distanceSubscriptionMap[subsId] = &distanceCheck
	}		}

	@@ -870,12 +899,12 @@ func registerAreaCircle(areaCircleSub *CircleNotificationSubscription, subsIdStr
	areaCircleCheck.Subscription = areaCircleSub		areaCircleCheck.Subscription = areaCircleSub
	areaCircleCheck.NbNotificationsSent = 0		areaCircleCheck.NbNotificationsSent = 0
	areaCircleCheck.AddrInArea = map[string]bool{}		areaCircleCheck.AddrInArea = map[string]bool{}
	//checkImmediate and NextTts apply more to a periodic notification, setting them but ignoring both in notification code because of unclear spec on that matter		//checkImmediate ignored, will be hit on next check anyway
	if areaCircleSub.CheckImmediate {		//if areaCircleSub.CheckImmediate {
	areaCircleCheck.NextTts = 0 //next time periodic trigger hits, will be forced to trigger		areaCircleCheck.NextTts = 0 //next time periodic trigger hits, will be forced to trigger
	} else {		//} else {
	areaCircleCheck.NextTts = areaCircleSub.Frequency		// areaCircleCheck.NextTts = areaCircleSub.Frequency
	}		// }
	areaCircleSubscriptionMap[subsId] = &areaCircleCheck		areaCircleSubscriptionMap[subsId] = &areaCircleCheck
	}		}

go-apps/meep-wais/server/wais.go

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1599,6 +1599,12 @@ func populateStaData(key string, jsonInfo string, response interface{}) error {
	//timeStamp.Seconds = int32(seconds)		//timeStamp.Seconds = int32(seconds)
	//staInfo.TimeStamp = &timeStamp		//staInfo.TimeStamp = &timeStamp

			//do not show an empty object in the response since 0 do not show up in the json
			if staData.StaInfo.StaDataRate != nil {
			if staData.StaInfo.StaDataRate.StaId == nil && staData.StaInfo.StaDataRate.StaLastDataDownlinkRate == 0 && staData.StaInfo.StaDataRate.StaLastDataUplinkRate == 0 {
			staData.StaInfo.StaDataRate = nil
			}
			}
	resp.StaInfoList = append(resp.StaInfoList, *staData.StaInfo)		resp.StaInfoList = append(resp.StaInfoList, *staData.StaInfo)
	}		}
	return nil		return nil