fix bug 0001185

and state that syncing system time depends on AlarmServer
using atd or opie-alarm

1 files changed, 13 insertions, 10 deletions

diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp
index 2ea4025..a75fc7e 100644
--- a/library/alarmserver.cpp
+++ b/library/alarmserver.cpp
@@ -179,271 +179,274 @@ static bool triggerAtd( bool writeHWClock = FALSE )
         }
         return FALSE;
 }
 
 #else
 
 static bool writeResumeAt ( time_t wakeup )
 {
         FILE *fp = ::fopen ( "/var/run/resumeat", "w" );
 
         if ( fp ) {
                 ::fprintf ( fp, "%d\n", (int) wakeup );
                 ::fclose ( fp );
         }
         else
                 qWarning ( "Failed to write wakeup time to /var/run/resumeat" );
 
         return ( fp );
 }
 
 #endif
 
 void TimerReceiverObject::deleteTimer()
 {
 #ifdef USE_ATD
         if ( !atfilename.isEmpty() ) {
                 unlink( atfilename );
                 atfilename = QString::null;
                 triggerAtd( FALSE );
         }
 #else
         writeResumeAt ( 0 );
 #endif
 }
 
 void TimerReceiverObject::resetTimer()
 {
         const int maxsecs = 2147000;
         QDateTime nearest = TimeConversion::fromUTC(nearestTimerEvent->UTCtime);
         QDateTime now = QDateTime::currentDateTime();
         if ( nearest < now )
                 nearest = now;
         int secs = TimeConversion::secsTo( now, nearest );
         if ( secs > maxsecs ) {
                 // too far for millisecond timing
                 secs = maxsecs;
         }
 
         // System timer (needed so that we wake from deep sleep),
         // from the Epoch in seconds.
         //
         int at_secs = TimeConversion::toUTC(nearest);
         // qDebug("reset timer to %d seconds from Epoch",at_secs);
 
 #ifdef USE_ATD
 
         QString fn = atdir + QString::number(at_secs) + "."
                      + QString::number(getpid());
         if ( fn != atfilename ) {
                 QFile atfile(fn + ".new");
                 if ( atfile.open(IO_WriteOnly | IO_Raw) ) {
                         int total_written;
 
                         // just wake up and delete the at file
                         QString cmd = "#!/bin/sh\nrm " + fn;
                         total_written = atfile.writeBlock(cmd.latin1(), cmd.length());
                         if ( total_written != int(cmd.length()) ) {
                                 QMessageBox::critical( 0, tr("Out of Space"),
                                                        tr("Unable to schedule alarm.\n"
                                                           "Please free up space and try again") );
                                 atfile.close();
                                 QFile::remove
                                         ( atfile.name() );
                                 return ;
                         }
                         atfile.close();
                         unlink( atfilename );
                         QDir d;
                         d.rename(fn + ".new", fn);
                         chmod(fn.latin1(), 0755);
                         atfilename = fn;
                         triggerAtd( FALSE );
                 }
                 else {
                         qWarning("Cannot open atd file %s", fn.latin1());
                 }
         }
 #else
     writeResumeAt ( at_secs );
 
 #endif
 
         // Qt timers (does the actual alarm)
         // from now in milliseconds
         //
         qDebug("AlarmServer waiting %d seconds", secs);
         startTimer( 1000 * secs + 500 );
 }
 
 void TimerReceiverObject::timerEvent( QTimerEvent * )
 {
         bool needSave = FALSE;
         killTimers();
         if (nearestTimerEvent) {
                 if ( nearestTimerEvent->UTCtime
                         <= TimeConversion::toUTC(QDateTime::currentDateTime()) ) {
 #ifndef QT_NO_COP
                         QCopEnvelope e( nearestTimerEvent->channel,
                                         nearestTimerEvent->message );
                         e << TimeConversion::fromUTC( nearestTimerEvent->UTCtime )
                         << nearestTimerEvent->data;
 #endif
 
                         timerEventList.remove( nearestTimerEvent );
                         needSave = TRUE;
                 }
                 setNearestTimerEvent();
         }
         else {
                 resetTimer();
         }
         if ( needSave )
                 saveState();
 }
 
 /*!
   \class AlarmServer alarmserver.h
   \brief The AlarmServer class allows alarms to be scheduled and unscheduled.
- 
+
     Applications can schedule alarms with addAlarm() and can
     unschedule alarms with deleteAlarm(). When the time for an alarm
     to go off is reached the specified \link qcop.html QCop\endlink
     message is sent on the specified channel (optionally with
     additional data).
- 
+
     Scheduling an alarm using this class is important (rather just using
     a QTimer) since the machine may be asleep and needs to get woken up using
     the Linux kernel which implements this at the kernel level to minimize
     battery usage while asleep.
- 
+
     \ingroup qtopiaemb
     \sa QCopEnvelope
 */
 
 /*!
   Schedules an alarm to go off at (or soon after) time \a when. When
   the alarm goes off, the \link qcop.html QCop\endlink \a message will
   be sent to \a channel, with \a data as a parameter.
- 
+
   If this function is called with exactly the same data as a previous
   call the subsequent call is ignored, so there is only ever one alarm
   with a given set of parameters.
- 
+
   \sa deleteAlarm()
 */
 void AlarmServer::addAlarm ( QDateTime when, const QCString& channel,
                              const QCString& message, int data)
 {
         if ( qApp->type() == QApplication::GuiServer ) {
                 bool needSave = FALSE;
                 // Here we are the server so either it has been directly called from
                 // within the server or it has been sent to us from a client via QCop
                 if (!timerEventReceiver)
                         timerEventReceiver = new TimerReceiverObject;
 
                 timerEventItem *newTimerEventItem = new timerEventItem;
                 newTimerEventItem->UTCtime = TimeConversion::toUTC( when );
                 newTimerEventItem->channel = channel;
                 newTimerEventItem->message = message;
                 newTimerEventItem->data = data;
                 // explore the case of already having the event in here...
                 QListIterator<timerEventItem> it( timerEventList );
                 for ( ; *it; ++it )
                         if ( *(*it) == *newTimerEventItem )
                                 return ;
                 // if we made it here, it is okay to add the item...
                 timerEventList.append( newTimerEventItem );
                 needSave = TRUE;
                 // quicker than using setNearestTimerEvent()
                 if ( nearestTimerEvent ) {
                         if (newTimerEventItem->UTCtime < nearestTimerEvent->UTCtime) {
                                 nearestTimerEvent = newTimerEventItem;
                                 timerEventReceiver->killTimers();
                                 timerEventReceiver->resetTimer();
                         }
                 }
                 else {
                         nearestTimerEvent = newTimerEventItem;
                         timerEventReceiver->resetTimer();
                 }
                 if ( needSave )
                         saveState();
         }
         else {
 #ifndef QT_NO_COP
                 QCopEnvelope e( "QPE/System", "addAlarm(QDateTime,QCString,QCString,int)" );
                 e << when << channel << message << data;
 #endif
 
         }
 }
 
 /*!
   Deletes previously scheduled alarms which match \a when, \a channel,
   \a message, and \a data.
- 
+
   Passing null values for \a when, \a channel, or for the \link
   qcop.html QCop\endlink \a message, acts as a wildcard meaning "any".
   Similarly, passing -1 for \a data indicates "any".
- 
+
   If there is no matching alarm, nothing happens.
- 
+
   \sa addAlarm()
- 
+
 */
 void AlarmServer::deleteAlarm (QDateTime when, const QCString& channel, const QCString& message, int data)
 {
         if ( qApp->type() == QApplication::GuiServer) {
                 bool needSave = FALSE;
                 if ( timerEventReceiver != NULL ) {
                         timerEventReceiver->killTimers();
 
                         // iterate over the list of events
                         QListIterator<timerEventItem> it( timerEventList );
                         time_t deleteTime = TimeConversion::toUTC( when );
                         for ( ; *it; ++it ) {
                                 // if its a match, delete it
                                 if ( ( (*it)->UTCtime == deleteTime || when.isNull() )
                                         && ( channel.isNull() || (*it)->channel == channel )
                                         && ( message.isNull() || (*it)->message == message )
                                         && ( data == -1 || (*it)->data == data ) ) {
                                         // if it's first, then we need to update the timer
                                         if ( (*it) == nearestTimerEvent ) {
                                                 timerEventList.remove(*it);
                                                 setNearestTimerEvent();
                                         }
                                         else {
                                                 timerEventList.remove(*it);
                                         }
                                         needSave = TRUE;
                                 }
                         }
                         if ( nearestTimerEvent )
                                 timerEventReceiver->resetTimer();
                 }
                 if ( needSave )
                         saveState();
         }
         else {
 #ifndef QT_NO_COP
                 QCopEnvelope e( "QPE/System", "deleteAlarm(QDateTime,QCString,QCString,int)" );
                 e << when << channel << message << data;
 #endif
 
         }
 }
 
 /*!
-  Writes the system clock to the hardware clock.
+  The implementation depends on the mode of AlarmServer. If the AlarmServer
+  uses atd the current system time will be written to the hardware clock.
+  If the AlarmServer relies on opie-alarm the time will be written once the
+  device gets suspended. opie-alarm is used by the Zaurus, iPAQs and SIMpad
 */
 void Global::writeHWClock()
 {
 #ifdef USE_ATD
         if ( !triggerAtd( TRUE ) ) {
                 // atd not running? set it ourselves
                 system("/sbin/hwclock --systohc"); // ##### UTC?
         }
 #else
         // hwclock is written on suspend
 #endif
 }