Skip to content

fix(power): restart idle tasks from now #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(power): restart idle tasks from now #1169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions session/power1/power_save_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import (
"strings"
"sync"

"github.com/linuxdeepin/dde-daemon/common/fileutil"
"time"

"github.com/linuxdeepin/dde-daemon/common/fileutil"

"github.com/godbus/dbus/v5"
ConfigManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
"github.com/linuxdeepin/go-lib/dbusutil"
Expand Down Expand Up @@ -204,7 +205,7 @@ func (psp *powerSavePlan) Start() error {

// OnBattery changed will effect current PowerSavePlan
err := power.OnBattery().ConnectChanged(func(hasValue bool, value bool) {
psp.Reset()
psp.ResetFromNow()
})
if err != nil {
logger.Warning("failed to connectChanged OnBattery:", err)
Expand Down Expand Up @@ -456,8 +457,20 @@ func (mts metaTasks) setRealDelay(min int32) {
}
}

func (mts metaTasks) setRealDelayFromNow() {
for idx := range mts {
t := &mts[idx]
t.realDelay = time.Second * time.Duration(t.delay)
}
}

func (psp *powerSavePlan) Update(screenSaverStartDelay, lockDelay,
screenBlackDelay, sleepDelay, shortIdleDelay int32) {
psp.doUpdate(screenSaverStartDelay, lockDelay, screenBlackDelay, sleepDelay, shortIdleDelay, false)
}

func (psp *powerSavePlan) doUpdate(screenSaverStartDelay, lockDelay,
screenBlackDelay, sleepDelay, shortIdleDelay int32, resetFromNow bool) {
psp.mu.Lock()
defer psp.mu.Unlock()

Expand Down Expand Up @@ -517,13 +530,33 @@ func (psp *powerSavePlan) Update(screenSaverStartDelay, lockDelay,
psp.metaTasks = tasks

if psp.isIdle {
if resetFromNow {
psp.metaTasks.setRealDelayFromNow()
}
logger.Info("System is already idle, restarting power delay tasks.")
psp.startIdleTasksLocked()
psp.startIdleTasksLocked(!resetFromNow)
} else {
psp.metaTasks.setRealDelay(min)
}
}

func (psp *powerSavePlan) ResetFromNow() {
m := psp.manager
if m.OnBattery {
psp.doUpdate(int32(m.BatteryScreensaverDelay), int32(m.BatteryLockDelay),
int32(m.BatteryScreenBlackDelay),
int32(m.BatterySleepDelay),
int32(m.BatteryShortIdleDelay),
true)
} else {
psp.doUpdate(int32(m.LinePowerScreensaverDelay), int32(m.LinePowerLockDelay),
int32(m.LinePowerScreenBlackDelay),
int32(m.LinePowerSleepDelay),
int32(m.LinePowerShortIdleDelay),
true)
}
}

func (psp *powerSavePlan) setScreenSaverTimeout(seconds int32) error {
psp.screenSaverTimeout = seconds
logger.Debugf("set ScreenSaver timeout to %d", seconds)
Expand Down Expand Up @@ -1006,12 +1039,12 @@ func (psp *powerSavePlan) HandleIdleOn() {
logger.Info("HandleIdleOn")

psp.isIdle = true
psp.startIdleTasksLocked()
psp.startIdleTasksLocked(true)
}

func (psp *powerSavePlan) startIdleTasksLocked() {
func (psp *powerSavePlan) startIdleTasksLocked(useElapsedIdle bool) {
// check window, only x11 is supported, not apply to wayland
if !psp.manager.UseWayland {
if useElapsedIdle && !psp.manager.UseWayland {
preventIdle, err := psp.shouldPreventIdle()
if err != nil {
logger.Warning(err)
Expand Down
Loading