From a396e6af3cd16530202f6cbecbd45c7a3f6ac893 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 24 Apr 2014 22:34:42 -0500
Subject: hw alarms

---
 include/datetime/alarm-queue-simple.h | 63 +++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 include/datetime/alarm-queue-simple.h

(limited to 'include/datetime/alarm-queue-simple.h')

diff --git a/include/datetime/alarm-queue-simple.h b/include/datetime/alarm-queue-simple.h
new file mode 100644
index 0000000..8461227
--- /dev/null
+++ b/include/datetime/alarm-queue-simple.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_ALARM_QUEUE_SIMPLE_H
+#define INDICATOR_DATETIME_ALARM_QUEUE_SIMPLE_H
+
+#include <datetime/alarm-queue.h>
+#include <datetime/clock.h>
+#include <datetime/planner.h>
+#include <datetime/wakeup-timer.h>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * \brief A #AlarmQueue implementation 
+ */
+class SimpleAlarmQueue: public AlarmQueue
+{
+public:
+    SimpleAlarmQueue(const std::shared_ptr<Clock>& clock,
+                     const std::shared_ptr<Planner>& upcoming_planner,
+                     const std::shared_ptr<WakeupTimer>& timer);
+    ~SimpleAlarmQueue();
+    core::Signal<const Appointment&>& alarm_reached();
+
+private:
+    void requeue();
+    bool find_next_alarm(Appointment& setme) const;
+    std::vector<Appointment> find_current_alarms() const;
+    void check_alarms();
+
+    std::set<std::string> m_triggered;
+    const std::shared_ptr<Clock> m_clock;
+    const std::shared_ptr<Planner> m_planner;
+    const std::shared_ptr<WakeupTimer> m_timer;
+    core::Signal<const Appointment&> m_alarm_reached;
+    DateTime m_time;
+};
+
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_ALARM_QUEUE_H
-- 
cgit v1.2.3


From 0e5acaedb9cb419b7fc607de175fce23025805c2 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 10 Jun 2014 09:01:39 -0500
Subject: in alarm-queue-simple, call requeue() if time skew is detected.

---
 include/datetime/alarm-queue-simple.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/datetime/alarm-queue-simple.h')

diff --git a/include/datetime/alarm-queue-simple.h b/include/datetime/alarm-queue-simple.h
index 8461227..af1145a 100644
--- a/include/datetime/alarm-queue-simple.h
+++ b/include/datetime/alarm-queue-simple.h
@@ -52,7 +52,7 @@ private:
     const std::shared_ptr<Planner> m_planner;
     const std::shared_ptr<WakeupTimer> m_timer;
     core::Signal<const Appointment&> m_alarm_reached;
-    DateTime m_time;
+    DateTime m_datetime;
 };
 
 
-- 
cgit v1.2.3


From 03a7615f1ff6f4bb1d8bf955c042151336edac9b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 10 Jun 2014 11:56:32 -0500
Subject: in SimpleAlarmQueue, the 'alarms we don't want to trigger' list needs
 to be composed of uid + timestamp. Keying off of only timestamp doesn't work
 because UIDs can be recycled as users edit and reuse alarms.

---
 include/datetime/alarm-queue-simple.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/datetime/alarm-queue-simple.h')

diff --git a/include/datetime/alarm-queue-simple.h b/include/datetime/alarm-queue-simple.h
index af1145a..d191aec 100644
--- a/include/datetime/alarm-queue-simple.h
+++ b/include/datetime/alarm-queue-simple.h
@@ -47,7 +47,7 @@ private:
     std::vector<Appointment> find_current_alarms() const;
     void check_alarms();
 
-    std::set<std::string> m_triggered;
+    std::set<std::pair<std::string,DateTime>> m_triggered;
     const std::shared_ptr<Clock> m_clock;
     const std::shared_ptr<Planner> m_planner;
     const std::shared_ptr<WakeupTimer> m_timer;
-- 
cgit v1.2.3