From 95249bc659a5617497aa6284cf1dbbcadf134eb4 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Sun, 3 May 2020 00:16:28 +0800
Subject: [PATCH] update

---
 src/job_manager.go        | 6 +++---
 src/scheduler.go          | 2 +-
 src/scheduler_FCFS.go     | 8 ++++----
 src/scheduler_priority.go | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/job_manager.go b/src/job_manager.go
index 255f70a..e767b64 100644
--- a/src/job_manager.go
+++ b/src/job_manager.go
@@ -80,7 +80,7 @@ func (jm *JobManager) start() {
 		}
 
 	}
-	jm.scheduler.UpdateProgress(jm.job.Name, Running)
+	jm.scheduler.UpdateProgress(jm.job, Running)
 
 	log.Info("ready to run job ", jm.job.Name, time.Now())
 
@@ -206,7 +206,7 @@ func (jm *JobManager) start() {
 	jm.scheduler.ReleaseNetwork(network)
 
 	if !jm.killedFlag {
-		jm.scheduler.UpdateProgress(jm.job.Name, Finished)
+		jm.scheduler.UpdateProgress(jm.job, Finished)
 		log.Info("finish job ", jm.job.Name)
 	}
 }
@@ -293,7 +293,7 @@ func (jm *JobManager) stop() MsgStop {
 		}
 	}()
 
-	jm.scheduler.UpdateProgress(jm.job.Name, Stopped)
+	jm.scheduler.UpdateProgress(jm.job, Stopped)
 	log.Info("kill job, ", jm.job.Name)
 	return MsgStop{Code: 0}
 }
diff --git a/src/scheduler.go b/src/scheduler.go
index 3cd1ffc..085a4d2 100644
--- a/src/scheduler.go
+++ b/src/scheduler.go
@@ -5,7 +5,7 @@ type Scheduler interface {
 
 	Schedule(Job)
 
-	UpdateProgress(jobName string, state State)
+	UpdateProgress(job Job, state State)
 
 	AcquireResource(Job, Task, []NodeStatus) NodeStatus
 
diff --git a/src/scheduler_FCFS.go b/src/scheduler_FCFS.go
index bf5c892..7e5ccc3 100644
--- a/src/scheduler_FCFS.go
+++ b/src/scheduler_FCFS.go
@@ -51,27 +51,27 @@ func (scheduler *SchedulerFCFS) Start() {
 	}()
 }
 
-func (scheduler *SchedulerFCFS) UpdateProgress(jobName string, state State) {
+func (scheduler *SchedulerFCFS) UpdateProgress(job Job, state State) {
 	switch state {
 	case Running:
 		scheduler.scheduling.Unlock()
 
 		for i := range scheduler.history {
-			if scheduler.history[i].Name == jobName {
+			if scheduler.history[i].Name == job.Name {
 				scheduler.history[i].Status = Running
 			}
 		}
 		break
 	case Finished:
 		for i := range scheduler.history {
-			if scheduler.history[i].Name == jobName {
+			if scheduler.history[i].Name == job.Name {
 				scheduler.history[i].Status = Finished
 			}
 		}
 		break
 	case Stopped:
 		for i := range scheduler.history {
-			if scheduler.history[i].Name == jobName {
+			if scheduler.history[i].Name == job.Name {
 				scheduler.history[i].Status = Stopped
 			}
 		}
diff --git a/src/scheduler_priority.go b/src/scheduler_priority.go
index ff7225c..faef69f 100644
--- a/src/scheduler_priority.go
+++ b/src/scheduler_priority.go
@@ -51,27 +51,27 @@ func (scheduler *SchedulerPriority) Start() {
 	}()
 }
 
-func (scheduler *SchedulerPriority) UpdateProgress(jobName string, state State) {
+func (scheduler *SchedulerPriority) UpdateProgress(job Job, state State) {
 	switch state {
 	case Running:
 		scheduler.scheduling.Unlock()
 
 		for i := range scheduler.history {
-			if scheduler.history[i].Name == jobName {
+			if scheduler.history[i].Name == job.Name {
 				scheduler.history[i].Status = Running
 			}
 		}
 		break
 	case Finished:
 		for i := range scheduler.history {
-			if scheduler.history[i].Name == jobName {
+			if scheduler.history[i].Name == job.Name {
 				scheduler.history[i].Status = Finished
 			}
 		}
 		break
 	case Stopped:
 		for i := range scheduler.history {
-			if scheduler.history[i].Name == jobName {
+			if scheduler.history[i].Name == job.Name {
 				scheduler.history[i].Status = Stopped
 			}
 		}