[RFC] Shutdown rewrite for 1.5.x
Commit Message
On Sunday 31 December 2006 15:02, Helmut Auer wrote:
> Matthias Schwarzott schrieb:
> > On Sunday 31 December 2006 13:36, Joachim Wilke wrote:
> >> 2006/12/30, Udo Richter <udo_richter@gmx.de>:
> >>> However, it might be worth thinking about giving plugins the ability to
> >>> set a different wakeup time, so that a scheduled EPG scan plugin can be
> >>> written.
> >>
> >> I also think that this would be very helpful for some plugins. Manual
> >> start detection could also include a call to the plugins. A plugin
> >> that did "schedule" an EPG-scan or similar could tell VDR during start
> >> up, that VDR woke up because of this scheduled event set by this
> >> plugin.
> >> At the moment I use a relatively complex patch that does some
> >> "maintainance" task during the night. If it would be possible to
> >> modify the wakeup-time in a plugin I could re-implement the complete
> >> patch as a plugin.
> >
> > I think a much easier solution (implementable in runvdr/vdr-initscript)
> > is: Write down wakeup-time when shutting down and comparing that to time
> > when system/vdr starts (with some margin).
>
> That's exactly what my Gen2VDR distribution is doing, and it works fine.
> It's not the job of vdr to guess why it was started, but it would be nice
> if vdr offers an option to shutdown after next recording ( maybe via svdrp
> call ).
In gentoo vdr package we added a small hack (attached), which implements a
svdrp call "down" to tell vdr it is inactive and will shutdown in X minutes.
We call this from shutdown-scripts to let vdr retry shutdown in 5 min (or
other value if needed).
Matthias
Comments
Matthias Schwarzott wrote:
> In gentoo vdr package we added a small hack (attached), which implements a
> svdrp call "down" to tell vdr it is inactive and will shutdown in X minutes.
>
> We call this from shutdown-scripts to let vdr retry shutdown in 5 min (or
> other value if needed).
Question is: Is this still needed?
VDR already retries after an acceptable time, and VDR probably knows
better whether an user is currently active or not. The only reason I
could think of is that VDR was started without a timer nearby, and the
start script knows that this is not an user start. And sending a kPower
key press will also let VDR go inactive.
Things were different in old versions, where VDR retried shutdown after
3 hours or so, but that has changed.
Cheers,
Udo
Udo Richter wrote:
> Matthias Schwarzott wrote:
>> In gentoo vdr package we added a small hack (attached), which
>> implements a svdrp call "down" to tell vdr it is inactive and will
>> shutdown in X minutes.
>>
>> We call this from shutdown-scripts to let vdr retry shutdown in 5 min
>> (or other value if needed).
>
> Question is: Is this still needed?
>
> VDR already retries after an acceptable time, and VDR probably knows
> better whether an user is currently active or not. The only reason I
> could think of is that VDR was started without a timer nearby, and the
> start script knows that this is not an user start. And sending a kPower
> key press will also let VDR go inactive.
>
> Things were different in old versions, where VDR retried shutdown after
> 3 hours or so, but that has changed.
I assume that with the ability to force a reload by sending SIGHUP
to the vdr process (which will be included in the upcoming version 1.5.1)
this should not be necessary any more.
Klaus
Written by Matthias Schwarzott <zzam@gentoo.org>
GENTOO_NO_PREPARE
@@ -293,6 +293,9 @@
" Updates a timer. Settings must be in the same format as returned\n"
" by the LSTT command. If a timer with the same channel, day, start\n"
" and stop time does not yet exists, it will be created.",
+ "DOWN [ <minutes> ]\n"
+ " Starts an automatic shutdown (with 5 minutes waiting time) in given\n"
+ " minutes or now if no number was given.",
"VOLU [ <number> | + | - | mute ]\n"
" Set the audio volume to the given number (which is limited to the range\n"
" 0...255). If the special options '+' or '-' are given, the volume will\n"
@@ -1342,6 +1345,16 @@
Reply(501, "Missing timer settings");
}
+extern time_t LastActivity;
+void cSVDRP::CmdDOWN(const char *Option)
+{
+ if (isnumber(Option))
+ LastActivity = time(NULL) - Setup.MinUserInactivity*60 + strtol(Option, NULL, 10)*60;
+ else
+ LastActivity = time(NULL) - Setup.MinUserInactivity*60;
+ Reply(250, "Automatic shutdown triggered");
+}
+
void cSVDRP::CmdVOLU(const char *Option)
{
if (*Option) {
@@ -1413,6 +1426,7 @@
else if (CMD("STAT")) CmdSTAT(s);
else if (CMD("UPDT")) CmdUPDT(s);
else if (CMD("VOLU")) CmdVOLU(s);
+ else if (CMD("DOWN")) CmdDOWN(s);
else if (CMD("QUIT")) Close(true);
else Reply(500, "Command unrecognized: \"%s\"", Cmd);
}
@@ -59,6 +59,7 @@
void CmdDELC(const char *Option);
void CmdDELR(const char *Option);
void CmdDELT(const char *Option);
+ void CmdDOWN(const char *Option);
void CmdEDIT(const char *Option);
void CmdGRAB(const char *Option);
void CmdHELP(const char *Option);
@@ -89,6 +89,8 @@
exit(1);
}
+time_t LastActivity;
+
int main(int argc, char *argv[])
{
// Save terminal settings:
@@ -395,7 +397,7 @@
int PreviousChannel[2] = { 1, 1 };
int PreviousChannelIndex = 0;
time_t LastChannelChanged = time(NULL);
- time_t LastActivity = 0;
+ LastActivity = 0; // now being a global variable
time_t LastCamMenu = 0;
int MaxLatencyTime = 0;
bool ForceShutdown = false;