Kristyna Streitova
35c3ee1fda
- at-3.1.14-usePOSIXtimers.patch (from Fedora) Use Posix timers, this avoid the need of horrible suspend/resume hacks like at.sleep with pm-utils/systemd OBS-URL: https://build.opensuse.org/request/show/253816 OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=92
111 lines
2.4 KiB
Diff
111 lines
2.4 KiB
Diff
--- at-3.1.15.orig/atd.c
|
|
+++ at-3.1.15/atd.c
|
|
@@ -919,6 +919,54 @@ run_loop()
|
|
return next_job;
|
|
}
|
|
|
|
+#ifdef HAVE_CLOCK_GETTIME
|
|
+timer_t timer;
|
|
+struct itimerspec timeout;
|
|
+
|
|
+void timer_setup()
|
|
+{
|
|
+ struct sigevent sev;
|
|
+
|
|
+ sev.sigev_notify = SIGEV_SIGNAL;
|
|
+ sev.sigev_signo = SIGHUP;
|
|
+ sev.sigev_value.sival_ptr = &timer;
|
|
+
|
|
+ memset(&timeout, 0, sizeof(timeout));
|
|
+
|
|
+ if (timer_create(CLOCK_REALTIME, &sev, &timer) < 0)
|
|
+ pabort("unable to create timer");
|
|
+}
|
|
+
|
|
+time_t atd_gettime()
|
|
+{
|
|
+ struct timespec curtime;
|
|
+
|
|
+ clock_gettime(CLOCK_REALTIME, &curtime);
|
|
+
|
|
+ return curtime.tv_sec;
|
|
+}
|
|
+
|
|
+void atd_setalarm(time_t next)
|
|
+{
|
|
+ timeout.it_value.tv_sec = next;
|
|
+ timer_settime(timer, TIMER_ABSTIME, &timeout, NULL);
|
|
+ pause();
|
|
+}
|
|
+#else
|
|
+void timer_setup()
|
|
+{
|
|
+}
|
|
+
|
|
+time_t atd_gettime()
|
|
+{
|
|
+ return time(NULL);
|
|
+}
|
|
+
|
|
+void atd_setalarm(time_t next)
|
|
+{
|
|
+ sleep(next - atd_gettime());
|
|
+}
|
|
+#endif
|
|
/* Global functions */
|
|
|
|
int
|
|
@@ -1032,7 +1080,7 @@ main(int argc, char *argv[])
|
|
sigaction(SIGCHLD, &act, NULL);
|
|
|
|
if (!run_as_daemon) {
|
|
- now = time(NULL);
|
|
+ now = atd_gettime();
|
|
run_loop();
|
|
exit(EXIT_SUCCESS);
|
|
}
|
|
@@ -1055,13 +1103,14 @@ main(int argc, char *argv[])
|
|
act.sa_handler = set_term;
|
|
sigaction(SIGINT, &act, NULL);
|
|
|
|
+ timer_setup();
|
|
daemon_setup();
|
|
|
|
do {
|
|
- now = time(NULL);
|
|
+ now = atd_gettime();
|
|
next_invocation = run_loop();
|
|
if ((next_invocation > now) && (!hupped)) {
|
|
- sleep(next_invocation - now);
|
|
+ atd_setalarm(next_invocation);
|
|
}
|
|
hupped = 0;
|
|
} while (!term_signal);
|
|
--- at-3.1.15.orig/config.h.in
|
|
+++ at-3.1.15/config.h.in
|
|
@@ -38,6 +38,9 @@
|
|
/* Define to 1 if you have the `getloadavg' function. */
|
|
#undef HAVE_GETLOADAVG
|
|
|
|
+/* Define to 1 if you have the `clock_gettime' function. */
|
|
+#undef HAVE_TIMER_CREATE
|
|
+
|
|
/* Define to 1 if you have the <getopt.h> header file. */
|
|
#undef HAVE_GETOPT_H
|
|
|
|
--- at-3.1.15.orig/configure.ac
|
|
+++ at-3.1.15/configure.ac
|
|
@@ -254,6 +254,12 @@ AC_ARG_WITH(daemon_username,
|
|
)
|
|
AC_SUBST(DAEMON_USERNAME)
|
|
|
|
+dnl check for POSIX timer functions
|
|
+AC_SEARCH_LIBS([timer_create],[rt])
|
|
+AC_CHECK_FUNCS([timer_create])
|
|
+AC_SEARCH_LIBS([clock_gettime],[rt])
|
|
+AC_CHECK_FUNCS([clock_gettime])
|
|
+
|
|
AC_MSG_CHECKING(groupname to run under)
|
|
AC_ARG_WITH(daemon_groupname,
|
|
[ --with-daemon_groupname=DAEMON_GROUPNAME Groupname to run under (default daemon) ],
|