style comments

Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
vhive-serverless · Aug 13, 2020 · d0b6708 · d0b6708
1 parent c8fc4cb
commit d0b6708
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/memory/manager/manager.go b/memory/manager/manager.go
@@ -128,11 +128,11 @@ func (m *MemoryManager) Activate(vmID string, userFaultFDFile *os.File) (err err
 	state.isActive = true
 	state.isEverActivated = true
 	state.firstPageFaultOnce = new(sync.Once)
-	state.servedNum = 0
 	state.quitCh = make(chan int)
 
 	if state.metricsModeOn {
 		state.uniqueNum = 0
+		state.servedNum = 0
 		state.currentMetric = metrics.NewMetric()
 	}
 

diff --git a/memory/manager/snapshot_state.go b/memory/manager/snapshot_state.go
@@ -240,12 +240,11 @@ func (s *SnapshotState) pollUserPageFaults(readyCh chan int) {
 	if s.isRecordReady && !s.IsLazyMode {
 		if s.metricsModeOn {
 			tStart = time.Now()
-			s.fetchState()
+		}
+		s.fetchState()
+		if s.metricsModeOn {
 			s.currentMetric.MetricMap["FetchState"] = metrics.ToUS(time.Since(tStart))
-		} else {
-			s.fetchState()
 		}
-
 	}
 	// }
 
@@ -302,7 +301,7 @@ func (s *SnapshotState) pollUserPageFaults(readyCh chan int) {
 func (s *SnapshotState) servePageFault(fd int, address uint64) error {
 	var (
 		tStart              time.Time
-		serveUnique         string = "ServeUnique"
+		serveUnique         = "ServeUnique"
 		workingSetInstalled bool
 	)
 
@@ -314,11 +313,11 @@ func (s *SnapshotState) servePageFault(fd int, address uint64) error {
 			if s.isRecordReady && !s.IsLazyMode {
 				if s.metricsModeOn {
 					tStart = time.Now()
-					s.installWorkingSetPages(fd)
+				}
+				s.installWorkingSetPages(fd)
+				if s.metricsModeOn {
 					s.currentMetric.MetricMap["InstallWS"] = metrics.ToUS(time.Since(tStart))
 					s.currentMetric.MetricMap[serveUnique] = float64(0)
-				} else {
-					s.installWorkingSetPages(fd)
 				}
 
 				workingSetInstalled = true