diff --git a/schedulers/bpMaxMinProacCC.go b/schedulers/bpMaxMinProacCC.go index 1f834da..fe44f60 100644 --- a/schedulers/bpMaxMinProacCC.go +++ b/schedulers/bpMaxMinProacCC.go @@ -3,7 +3,7 @@ package schedulers import ( "bitbucket.org/sunybingcloud/electron/constants" "bitbucket.org/sunybingcloud/electron/def" - "bitbucket.org/sunybingcloud/electron/pcp" + powCap "bitbucket.org/sunybingcloud/electron/powerCapping" "bitbucket.org/sunybingcloud/electron/rapl" "bitbucket.org/sunybingcloud/electron/utilities/mesosUtils" "bitbucket.org/sunybingcloud/electron/utilities/offerUtils" @@ -45,7 +45,7 @@ type BPMaxMinProacCC struct { availablePower map[string]float64 totalPower map[string]float64 ignoreWatts bool - capper *pcp.ClusterwideCapper + capper *powCap.ClusterwideCapper ticker *time.Ticker recapTicker *time.Ticker isCapping bool // indicate whether we are currently performing cluster-wide capping. @@ -88,7 +88,7 @@ func NewBPMaxMinProacCC(tasks []def.Task, ignoreWatts bool, schedTracePrefix str availablePower: make(map[string]float64), totalPower: make(map[string]float64), RecordPCP: false, - capper: pcp.GetClusterwideCapperInstance(), + capper: powCap.GetClusterwideCapperInstance(), ticker: time.NewTicker(10 * time.Second), recapTicker: time.NewTicker(20 * time.Second), isCapping: false, diff --git a/schedulers/bpswClassMapWattsProacCC.go b/schedulers/bpswClassMapWattsProacCC.go index d94df90..9a50a69 100644 --- a/schedulers/bpswClassMapWattsProacCC.go +++ b/schedulers/bpswClassMapWattsProacCC.go @@ -3,7 +3,7 @@ package schedulers import ( "bitbucket.org/sunybingcloud/electron/constants" "bitbucket.org/sunybingcloud/electron/def" - "bitbucket.org/sunybingcloud/electron/pcp" + powCap "bitbucket.org/sunybingcloud/electron/powerCapping" "bitbucket.org/sunybingcloud/electron/rapl" "bitbucket.org/sunybingcloud/electron/utilities/mesosUtils" "bitbucket.org/sunybingcloud/electron/utilities/offerUtils" @@ -45,7 +45,7 @@ type BPSWClassMapWattsProacCC struct { availablePower map[string]float64 totalPower map[string]float64 ignoreWatts bool - capper *pcp.ClusterwideCapper + capper *powCap.ClusterwideCapper ticker *time.Ticker recapTicker *time.Ticker isCapping bool // indicate whether we are currently performing cluster-wide capping. @@ -88,7 +88,7 @@ func NewBPSWClassMapWattsProacCC(tasks []def.Task, ignoreWatts bool, schedTraceP availablePower: make(map[string]float64), totalPower: make(map[string]float64), RecordPCP: false, - capper: pcp.GetClusterwideCapperInstance(), + capper: powCap.GetClusterwideCapperInstance(), ticker: time.NewTicker(10 * time.Second), recapTicker: time.NewTicker(20 * time.Second), isCapping: false, diff --git a/schedulers/firstfitSortedWattsClassMapWattsProacCC.go b/schedulers/firstfitSortedWattsClassMapWattsProacCC.go index f822b9a..f3a09d2 100644 --- a/schedulers/firstfitSortedWattsClassMapWattsProacCC.go +++ b/schedulers/firstfitSortedWattsClassMapWattsProacCC.go @@ -3,7 +3,7 @@ package schedulers import ( "bitbucket.org/sunybingcloud/electron/constants" "bitbucket.org/sunybingcloud/electron/def" - "bitbucket.org/sunybingcloud/electron/pcp" + powCap "bitbucket.org/sunybingcloud/electron/powerCapping" "bitbucket.org/sunybingcloud/electron/rapl" "bitbucket.org/sunybingcloud/electron/utilities/mesosUtils" "bitbucket.org/sunybingcloud/electron/utilities/offerUtils" @@ -33,7 +33,7 @@ type FirstFitSortedWattsClassMapWattsProacCC struct { availablePower map[string]float64 totalPower map[string]float64 ignoreWatts bool - capper *pcp.ClusterwideCapper + capper *powCap.ClusterwideCapper ticker *time.Ticker recapTicker *time.Ticker isCapping bool // indicate whether we are currently performing cluster-wide capping. @@ -76,7 +76,7 @@ func NewFirstFitSortedWattsClassMapWattsProacCC(tasks []def.Task, ignoreWatts bo availablePower: make(map[string]float64), totalPower: make(map[string]float64), RecordPCP: false, - capper: pcp.GetClusterwideCapperInstance(), + capper: powCap.GetClusterwideCapperInstance(), ticker: time.NewTicker(10 * time.Second), recapTicker: time.NewTicker(20 * time.Second), isCapping: false, diff --git a/schedulers/proactiveclusterwidecappingfcfs.go b/schedulers/proactiveclusterwidecappingfcfs.go index 9fc5695..c48c9de 100644 --- a/schedulers/proactiveclusterwidecappingfcfs.go +++ b/schedulers/proactiveclusterwidecappingfcfs.go @@ -3,7 +3,7 @@ package schedulers import ( "bitbucket.org/sunybingcloud/electron/constants" "bitbucket.org/sunybingcloud/electron/def" - "bitbucket.org/sunybingcloud/electron/pcp" + powCap "bitbucket.org/sunybingcloud/electron/powerCapping" "bitbucket.org/sunybingcloud/electron/rapl" "bitbucket.org/sunybingcloud/electron/utilities/mesosUtils" "bitbucket.org/sunybingcloud/electron/utilities/offerUtils" @@ -42,7 +42,7 @@ type ProactiveClusterwideCapFCFS struct { availablePower map[string]float64 // available power for each node in the cluster. totalPower map[string]float64 // total power for each node in the cluster. ignoreWatts bool - capper *pcp.ClusterwideCapper + capper *powCap.ClusterwideCapper ticker *time.Ticker recapTicker *time.Ticker isCapping bool // indicate whether we are currently performing cluster wide capping. @@ -85,7 +85,7 @@ func NewProactiveClusterwideCapFCFS(tasks []def.Task, ignoreWatts bool, schedTra availablePower: make(map[string]float64), totalPower: make(map[string]float64), RecordPCP: false, - capper: pcp.GetClusterwideCapperInstance(), + capper: powCap.GetClusterwideCapperInstance(), ticker: time.NewTicker(10 * time.Second), recapTicker: time.NewTicker(20 * time.Second), isCapping: false, diff --git a/schedulers/proactiveclusterwidecappingranked.go b/schedulers/proactiveclusterwidecappingranked.go index 9a8e4c4..c39f1c4 100644 --- a/schedulers/proactiveclusterwidecappingranked.go +++ b/schedulers/proactiveclusterwidecappingranked.go @@ -13,7 +13,7 @@ package schedulers import ( "bitbucket.org/sunybingcloud/electron/constants" "bitbucket.org/sunybingcloud/electron/def" - "bitbucket.org/sunybingcloud/electron/pcp" + powCap "bitbucket.org/sunybingcloud/electron/powerCapping" "bitbucket.org/sunybingcloud/electron/rapl" "bitbucket.org/sunybingcloud/electron/utilities/mesosUtils" "bitbucket.org/sunybingcloud/electron/utilities/offerUtils" @@ -53,7 +53,7 @@ type ProactiveClusterwideCapRanked struct { availablePower map[string]float64 // available power for each node in the cluster. totalPower map[string]float64 // total power for each node in the cluster. ignoreWatts bool - capper *pcp.ClusterwideCapper + capper *powCap.ClusterwideCapper ticker *time.Ticker recapTicker *time.Ticker isCapping bool // indicate whether we are currently performing cluster wide capping. @@ -96,7 +96,7 @@ func NewProactiveClusterwideCapRanked(tasks []def.Task, ignoreWatts bool, schedT availablePower: make(map[string]float64), totalPower: make(map[string]float64), RecordPCP: false, - capper: pcp.GetClusterwideCapperInstance(), + capper: powCap.GetClusterwideCapperInstance(), ticker: time.NewTicker(10 * time.Second), recapTicker: time.NewTicker(20 * time.Second), isCapping: false,