aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/alarm.c52
-rw-r--r--calendar/gui/alarm-notify/alarm.c52
-rw-r--r--calendar/gui/alarm.c52
4 files changed, 131 insertions, 30 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8b4bc937ab..2bd1b8aa42 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-02 Russell Steinthal <rms39@columbia.edu>
+
+ * alarm.c: Enhanced debug support: can be toggled on and off by
+ SIGUSR1, reports alarms which could not be added
+
1999-11-30 Eskil Heyn Olsen <deity@eskil.dk>
* calendar-conduit.c (compare): Fixed compare bug. Also neated up
diff --git a/calendar/alarm.c b/calendar/alarm.c
index 04e7c02e49..cf1cd8fb60 100644
--- a/calendar/alarm.c
+++ b/calendar/alarm.c
@@ -29,7 +29,13 @@ typedef struct {
CalendarAlarm *alarm;
} AlarmRecord;
-void debug_alarm (AlarmRecord* ar, int add);
+enum DebugAction {
+ ALARM_ACTIVATED,
+ ALARM_ADDED,
+ ALARM_NOT_ADDED
+};
+
+void debug_alarm (AlarmRecord* ar, enum DebugAction action);
void calendar_notify (time_t time, CalendarAlarm *which, void *data);
extern int debug_alarms;
@@ -44,6 +50,15 @@ alarm_activate ()
write (alarm_pipes [1], &c, 1);
}
+/*
+ * SIGUSR1 handler. Toggles debugging output
+ */
+static void
+toggle_debugging ()
+{
+ debug_alarms = !debug_alarms;
+}
+
static void
alarm_ready (void *closure, int fd, GdkInputCondition cond)
{
@@ -61,7 +76,7 @@ alarm_ready (void *closure, int fd, GdkInputCondition cond)
while (head_alarm){
if (debug_alarms)
- debug_alarm (ar, 0);
+ debug_alarm (ar, ALARM_ACTIVATED);
(*ar->fn)(ar->activation_time, ar->alarm, ar->closure);
alarms = g_list_remove (alarms, head_alarm);
@@ -116,16 +131,19 @@ alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
AlarmRecord *ar;
time_t alarm_time = alarm->trigger;
- /* If it already expired, do not add it */
- if (alarm_time < now)
- return FALSE;
-
ar = g_new0 (AlarmRecord, 1);
ar->activation_time = alarm_time;
ar->fn = fn;
ar->closure = closure;
ar->alarm = alarm;
+ /* If it already expired, do not add it */
+ if (alarm_time < now) {
+ if (debug_alarms)
+ debug_alarm (ar, ALARM_NOT_ADDED);
+ return FALSE;
+ }
+
alarms = g_list_insert_sorted (alarms, ar, alarm_compare_by_time);
/* If first alarm is not the previous first alarm, reschedule SIGALRM */
@@ -142,7 +160,7 @@ alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
head_alarm = alarms->data;
}
if (debug_alarms)
- debug_alarm (ar, 1);
+ debug_alarm (ar, ALARM_ADDED);
return TRUE;
}
@@ -170,6 +188,7 @@ void
alarm_init (void)
{
struct sigaction sa;
+ struct sigaction debug_sa;
int flags = 0;
pipe (alarm_pipes);
@@ -184,18 +203,31 @@ alarm_init (void)
sigemptyset (&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sigaction (SIGALRM, &sa, NULL);
+
+ /* Setup a signal handler to toggle debugging */
+ debug_sa.sa_handler = toggle_debugging;
+ sigemptyset (&debug_sa.sa_mask);
+ debug_sa.sa_flags = SA_RESTART;
+ sigaction (SIGUSR1, &debug_sa, NULL);
}
void
-debug_alarm (AlarmRecord* ar, int add)
+debug_alarm (AlarmRecord* ar, enum DebugAction action)
{
time_t now = time (NULL);
iCalObject *ico = ar->closure;
printf ("%s", ctime(&now));
- if (add)
+ switch (action) {
+ case ALARM_ADDED:
printf ("Added alarm for %s", ctime(&ar->activation_time));
- else
+ break;
+ case ALARM_NOT_ADDED:
+ printf ("Alarm not added for %s", ctime(&ar->activation_time));
+ break;
+ case ALARM_ACTIVATED:
printf ("Activated alarm\n");
+ break;
+ }
if (ar->fn!=&calendar_notify) return;
printf ("--- Summary: %s\n", ico->summary);
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 04e7c02e49..cf1cd8fb60 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -29,7 +29,13 @@ typedef struct {
CalendarAlarm *alarm;
} AlarmRecord;
-void debug_alarm (AlarmRecord* ar, int add);
+enum DebugAction {
+ ALARM_ACTIVATED,
+ ALARM_ADDED,
+ ALARM_NOT_ADDED
+};
+
+void debug_alarm (AlarmRecord* ar, enum DebugAction action);
void calendar_notify (time_t time, CalendarAlarm *which, void *data);
extern int debug_alarms;
@@ -44,6 +50,15 @@ alarm_activate ()
write (alarm_pipes [1], &c, 1);
}
+/*
+ * SIGUSR1 handler. Toggles debugging output
+ */
+static void
+toggle_debugging ()
+{
+ debug_alarms = !debug_alarms;
+}
+
static void
alarm_ready (void *closure, int fd, GdkInputCondition cond)
{
@@ -61,7 +76,7 @@ alarm_ready (void *closure, int fd, GdkInputCondition cond)
while (head_alarm){
if (debug_alarms)
- debug_alarm (ar, 0);
+ debug_alarm (ar, ALARM_ACTIVATED);
(*ar->fn)(ar->activation_time, ar->alarm, ar->closure);
alarms = g_list_remove (alarms, head_alarm);
@@ -116,16 +131,19 @@ alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
AlarmRecord *ar;
time_t alarm_time = alarm->trigger;
- /* If it already expired, do not add it */
- if (alarm_time < now)
- return FALSE;
-
ar = g_new0 (AlarmRecord, 1);
ar->activation_time = alarm_time;
ar->fn = fn;
ar->closure = closure;
ar->alarm = alarm;
+ /* If it already expired, do not add it */
+ if (alarm_time < now) {
+ if (debug_alarms)
+ debug_alarm (ar, ALARM_NOT_ADDED);
+ return FALSE;
+ }
+
alarms = g_list_insert_sorted (alarms, ar, alarm_compare_by_time);
/* If first alarm is not the previous first alarm, reschedule SIGALRM */
@@ -142,7 +160,7 @@ alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
head_alarm = alarms->data;
}
if (debug_alarms)
- debug_alarm (ar, 1);
+ debug_alarm (ar, ALARM_ADDED);
return TRUE;
}
@@ -170,6 +188,7 @@ void
alarm_init (void)
{
struct sigaction sa;
+ struct sigaction debug_sa;
int flags = 0;
pipe (alarm_pipes);
@@ -184,18 +203,31 @@ alarm_init (void)
sigemptyset (&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sigaction (SIGALRM, &sa, NULL);
+
+ /* Setup a signal handler to toggle debugging */
+ debug_sa.sa_handler = toggle_debugging;
+ sigemptyset (&debug_sa.sa_mask);
+ debug_sa.sa_flags = SA_RESTART;
+ sigaction (SIGUSR1, &debug_sa, NULL);
}
void
-debug_alarm (AlarmRecord* ar, int add)
+debug_alarm (AlarmRecord* ar, enum DebugAction action)
{
time_t now = time (NULL);
iCalObject *ico = ar->closure;
printf ("%s", ctime(&now));
- if (add)
+ switch (action) {
+ case ALARM_ADDED:
printf ("Added alarm for %s", ctime(&ar->activation_time));
- else
+ break;
+ case ALARM_NOT_ADDED:
+ printf ("Alarm not added for %s", ctime(&ar->activation_time));
+ break;
+ case ALARM_ACTIVATED:
printf ("Activated alarm\n");
+ break;
+ }
if (ar->fn!=&calendar_notify) return;
printf ("--- Summary: %s\n", ico->summary);
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
index 04e7c02e49..cf1cd8fb60 100644
--- a/calendar/gui/alarm.c
+++ b/calendar/gui/alarm.c
@@ -29,7 +29,13 @@ typedef struct {
CalendarAlarm *alarm;
} AlarmRecord;
-void debug_alarm (AlarmRecord* ar, int add);
+enum DebugAction {
+ ALARM_ACTIVATED,
+ ALARM_ADDED,
+ ALARM_NOT_ADDED
+};
+
+void debug_alarm (AlarmRecord* ar, enum DebugAction action);
void calendar_notify (time_t time, CalendarAlarm *which, void *data);
extern int debug_alarms;
@@ -44,6 +50,15 @@ alarm_activate ()
write (alarm_pipes [1], &c, 1);
}
+/*
+ * SIGUSR1 handler. Toggles debugging output
+ */
+static void
+toggle_debugging ()
+{
+ debug_alarms = !debug_alarms;
+}
+
static void
alarm_ready (void *closure, int fd, GdkInputCondition cond)
{
@@ -61,7 +76,7 @@ alarm_ready (void *closure, int fd, GdkInputCondition cond)
while (head_alarm){
if (debug_alarms)
- debug_alarm (ar, 0);
+ debug_alarm (ar, ALARM_ACTIVATED);
(*ar->fn)(ar->activation_time, ar->alarm, ar->closure);
alarms = g_list_remove (alarms, head_alarm);
@@ -116,16 +131,19 @@ alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
AlarmRecord *ar;
time_t alarm_time = alarm->trigger;
- /* If it already expired, do not add it */
- if (alarm_time < now)
- return FALSE;
-
ar = g_new0 (AlarmRecord, 1);
ar->activation_time = alarm_time;
ar->fn = fn;
ar->closure = closure;
ar->alarm = alarm;
+ /* If it already expired, do not add it */
+ if (alarm_time < now) {
+ if (debug_alarms)
+ debug_alarm (ar, ALARM_NOT_ADDED);
+ return FALSE;
+ }
+
alarms = g_list_insert_sorted (alarms, ar, alarm_compare_by_time);
/* If first alarm is not the previous first alarm, reschedule SIGALRM */
@@ -142,7 +160,7 @@ alarm_add (CalendarAlarm *alarm, AlarmFunction fn, void *closure)
head_alarm = alarms->data;
}
if (debug_alarms)
- debug_alarm (ar, 1);
+ debug_alarm (ar, ALARM_ADDED);
return TRUE;
}
@@ -170,6 +188,7 @@ void
alarm_init (void)
{
struct sigaction sa;
+ struct sigaction debug_sa;
int flags = 0;
pipe (alarm_pipes);
@@ -184,18 +203,31 @@ alarm_init (void)
sigemptyset (&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sigaction (SIGALRM, &sa, NULL);
+
+ /* Setup a signal handler to toggle debugging */
+ debug_sa.sa_handler = toggle_debugging;
+ sigemptyset (&debug_sa.sa_mask);
+ debug_sa.sa_flags = SA_RESTART;
+ sigaction (SIGUSR1, &debug_sa, NULL);
}
void
-debug_alarm (AlarmRecord* ar, int add)
+debug_alarm (AlarmRecord* ar, enum DebugAction action)
{
time_t now = time (NULL);
iCalObject *ico = ar->closure;
printf ("%s", ctime(&now));
- if (add)
+ switch (action) {
+ case ALARM_ADDED:
printf ("Added alarm for %s", ctime(&ar->activation_time));
- else
+ break;
+ case ALARM_NOT_ADDED:
+ printf ("Alarm not added for %s", ctime(&ar->activation_time));
+ break;
+ case ALARM_ACTIVATED:
printf ("Activated alarm\n");
+ break;
+ }
if (ar->fn!=&calendar_notify) return;
printf ("--- Summary: %s\n", ico->summary);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 22:50:20 +0800