1 diff -up cups-2.2.7/scheduler/avahi.c.avahi-no-threaded cups-2.2.7/scheduler/avahi.c
2 --- cups-2.2.7/scheduler/avahi.c.avahi-no-threaded 2018-04-03 14:27:17.067410826 +0200
3 +++ cups-2.2.7/scheduler/avahi.c 2018-04-03 14:27:17.067410826 +0200
8 + * Avahi poll implementation for the CUPS scheduler.
10 + * Copyright (C) 2010, 2011 Red Hat, Inc.
12 + * Tim Waugh <twaugh@redhat.com>
14 + * Redistribution and use in source and binary forms, with or without
15 + * modification, are permitted provided that the following conditions
18 + * Redistributions of source code must retain the above copyright
19 + * notice, this list of conditions and the following disclaimer.
21 + * Redistributions in binary form must reproduce the above copyright
22 + * notice, this list of conditions and the following disclaimer in the
23 + * documentation and/or other materials provided with the distribution.
25 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
26 + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27 + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
28 + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
29 + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
30 + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31 + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32 + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
34 + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
36 + * OF THE POSSIBILITY OF SUCH DAMAGE.
40 + * watch_read_cb - Read callback for file descriptor
41 + * watch_write_cb - Write callback for file descriptor
42 + * watched_fd_add_select() - Call cupsdAddSelect() as needed
43 + * watch_new() - Create a new file descriptor watch
44 + * watch_free() - Free a file descriptor watch
45 + * watch_update() - Update watched events for a file descriptor
46 + * watch_get_events() - Get events that happened for a file descriptor
47 + * timeout_cb() - Run a timed Avahi callback
48 + * timeout_new() - Set a wakeup time
49 + * timeout_update() - Update the expiration time for a timeout
50 + * timeout_free() - Free a timeout
51 + * compare_watched_fds() - Compare watched file descriptors for array sorting
52 + * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
53 + * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
54 + * avahi_cups_poll_get() - Get the abstract poll API structure
59 +#ifdef HAVE_AVAHI /* Applies to entire file... */
62 + * Include necessary headers...
67 +#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
69 +#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
72 +# include <avahi-common/timeval.h>
73 +#endif /* HAVE_AVAHI */
78 + AvahiCupsPoll *cups_poll;
81 + AvahiWatchEvent occurred;
82 + cups_array_t *watches;
83 +} cupsd_watched_fd_t;
87 + cupsd_watched_fd_t *watched_fd;
89 + AvahiWatchEvent events;
90 + AvahiWatchCallback callback;
96 + AvahiCupsPoll *cups_poll;
97 + AvahiTimeoutCallback callback;
99 + cupsd_timeout_t *cupsd_timeout;
103 + * Local functions...
106 +static AvahiWatch * watch_new(const AvahiPoll *api,
108 + AvahiWatchEvent events,
109 + AvahiWatchCallback callback,
111 +static void watch_free(AvahiWatch *watch);
112 +static void watch_update(AvahiWatch *watch,
113 + AvahiWatchEvent events);
114 +static AvahiWatchEvent watch_get_events(AvahiWatch *watch);
118 + * 'watch_read_cb' - Read callback for file descriptor
122 +watch_read_cb (void *userdata)
125 + cupsd_watched_fd_t *watched_fd = userdata;
126 + watched_fd->occurred |= AVAHI_WATCH_IN;
127 + for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
129 + watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
131 + if (watch->events & watched_fd->occurred)
133 + (watch->callback) (watch, watched_fd->fd,
134 + AVAHI_WATCH_IN, watch->userdata);
135 + watched_fd->occurred &= ~AVAHI_WATCH_IN;
143 + * 'watch_write_cb' - Write callback for file descriptor
147 +watch_write_cb (void *userdata)
150 + cupsd_watched_fd_t *watched_fd = userdata;
151 + watched_fd->occurred |= AVAHI_WATCH_OUT;
152 + for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
154 + watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
156 + if (watch->events & watched_fd->occurred)
158 + (watch->callback) (watch, watched_fd->fd,
159 + AVAHI_WATCH_OUT, watch->userdata);
160 + watched_fd->occurred &= ~AVAHI_WATCH_OUT;
168 + * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
171 +static int /* O - Watches? */
172 +watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
175 + cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
176 + int any_watches = 0;
178 + for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
180 + watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
183 + if (watch->events & (AVAHI_WATCH_IN |
187 + read_cb = (cupsd_selfunc_t)watch_read_cb;
188 + if (write_cb != NULL)
192 + if (watch->events & AVAHI_WATCH_OUT)
194 + write_cb = (cupsd_selfunc_t)watch_write_cb;
195 + if (read_cb != NULL)
200 + if (read_cb || write_cb)
201 + cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
203 + cupsdRemoveSelect (watched_fd->fd);
205 + return (any_watches);
209 + * 'watch_new' - Create a new file descriptor watch
213 +watch_new (const AvahiPoll *api,
215 + AvahiWatchEvent events,
216 + AvahiWatchCallback callback,
219 + cupsd_watched_fd_t key, *watched_fd;
220 + AvahiCupsPoll *cups_poll = api->userdata;
221 + AvahiWatch *watch = malloc(sizeof(AvahiWatch));
225 + watch->events = events;
226 + watch->callback = callback;
227 + watch->userdata = userdata;
230 + watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
231 + if (watched_fd == NULL)
233 + watched_fd = malloc(sizeof(cupsd_watched_fd_t));
234 + if (watched_fd == NULL)
240 + watched_fd->fd = fd;
241 + watched_fd->occurred = 0;
242 + watched_fd->cups_poll = cups_poll;
243 + watched_fd->watches = cupsArrayNew (NULL, NULL);
244 + cupsArrayAdd (cups_poll->watched_fds, watched_fd);
247 + watch->watched_fd = watched_fd;
248 + cupsArrayAdd(watched_fd->watches, watch);
249 + watched_fd_add_select (watched_fd);
255 + * 'watch_free' - Free a file descriptor watch
259 +watch_free (AvahiWatch *watch)
261 + cupsd_watched_fd_t *watched_fd = watch->watched_fd;
262 + AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
264 + cupsArrayRemove (watched_fd->watches, watch);
267 + if (!watched_fd_add_select (watched_fd))
269 + /* No more watches */
270 + cupsArrayRemove (cups_poll->watched_fds, watched_fd);
277 + * 'watch_update' - Update watched events for a file descriptor
281 +watch_update (AvahiWatch *watch,
282 + AvahiWatchEvent events)
284 + watch->events = events;
285 + watched_fd_add_select (watch->watched_fd);
290 + * 'watch_get_events' - Get events that happened for a file descriptor
293 +static AvahiWatchEvent
294 +watch_get_events (AvahiWatch *watch)
296 + return (watch->watched_fd->occurred);
301 + * 'timeout_cb()' - Run a timed Avahi callback
305 +timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
307 + AvahiTimeout *timeout = userdata;
308 + (timeout->callback) (timeout, timeout->userdata);
313 + * 'timeout_new' - Set a wakeup time
316 +static AvahiTimeout *
317 +timeout_new (const AvahiPoll *api,
318 + const struct timeval *tv,
319 + AvahiTimeoutCallback callback,
322 + AvahiTimeout *timeout;
323 + AvahiCupsPoll *cups_poll = api->userdata;
325 + timeout = malloc(sizeof(AvahiTimeout));
326 + if (timeout == NULL)
329 + timeout->cups_poll = cups_poll;
330 + timeout->callback = callback;
331 + timeout->userdata = userdata;
332 + timeout->cupsd_timeout = cupsdAddTimeout (tv,
333 + (cupsd_timeoutfunc_t)timeout_cb,
335 + cupsArrayAdd (cups_poll->timeouts, timeout);
341 + * 'timeout_update' - Update the expiration time for a timeout
345 +timeout_update (AvahiTimeout *timeout,
346 + const struct timeval *tv)
348 + cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
353 + * ' timeout_free' - Free a timeout
357 +timeout_free (AvahiTimeout *timeout)
359 + cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
360 + cupsdRemoveTimeout (timeout->cupsd_timeout);
366 + * 'compare_watched_fds' - Compare watched file descriptors for array sorting
369 +compare_watched_fds(cupsd_watched_fd_t *p0,
370 + cupsd_watched_fd_t *p1)
373 + * Compare by fd (no two elements have the same fd)
376 + if (p0->fd == p1->fd)
379 + return (p0->fd < p1->fd ? -1 : 1);
384 + * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
388 +avahi_cups_poll_new (void)
390 + AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
391 + if (cups_poll == NULL)
394 + cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
396 + cups_poll->timeouts = cupsArrayNew (NULL, NULL);
398 + cups_poll->api.userdata = cups_poll;
399 + cups_poll->api.watch_new = watch_new;
400 + cups_poll->api.watch_free = watch_free;
401 + cups_poll->api.watch_update = watch_update;
402 + cups_poll->api.watch_get_events = watch_get_events;
404 + cups_poll->api.timeout_new = timeout_new;
405 + cups_poll->api.timeout_update = timeout_update;
406 + cups_poll->api.timeout_free = timeout_free;
408 + return (cups_poll);
413 + * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
416 +avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
418 + cupsd_watched_fd_t *watched_fd;
420 + for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
422 + watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
423 + cupsArrayClear (watched_fd->watches);
425 + cupsArrayClear (cups_poll->watched_fds);
426 + cupsArrayClear (cups_poll->timeouts);
431 + * 'avahi_cups_poll_get' - Get the abstract poll API structure
435 +avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
437 + return (&cups_poll->api);
441 +#endif /* HAVE_AVAHI ... from top of file */
446 diff -up cups-2.2.7/scheduler/avahi.h.avahi-no-threaded cups-2.2.7/scheduler/avahi.h
447 --- cups-2.2.7/scheduler/avahi.h.avahi-no-threaded 2018-04-03 14:27:17.067410826 +0200
448 +++ cups-2.2.7/scheduler/avahi.h 2018-04-03 14:27:17.067410826 +0200
453 + * Avahi poll implementation for the CUPS scheduler.
455 + * Copyright (C) 2010, 2011 Red Hat, Inc.
457 + * Tim Waugh <twaugh@redhat.com>
459 + * Redistribution and use in source and binary forms, with or without
460 + * modification, are permitted provided that the following conditions
463 + * Redistributions of source code must retain the above copyright
464 + * notice, this list of conditions and the following disclaimer.
466 + * Redistributions in binary form must reproduce the above copyright
467 + * notice, this list of conditions and the following disclaimer in the
468 + * documentation and/or other materials provided with the distribution.
470 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
471 + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
472 + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
473 + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
474 + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
475 + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
476 + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
477 + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
478 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
479 + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
480 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
481 + * OF THE POSSIBILITY OF SUCH DAMAGE.
487 +# include <avahi-client/client.h>
488 +# include <avahi-client/publish.h>
489 +#endif /* HAVE_AVAHI */
491 +#ifdef HAVE_AUTHORIZATION_H
492 +# include <Security/Authorization.h>
493 +#endif /* HAVE_AUTHORIZATION_H */
500 + cups_array_t *watched_fds;
501 + cups_array_t *timeouts;
503 +#endif /* HAVE_AVAHI */
510 +extern AvahiCupsPoll * avahi_cups_poll_new(void);
511 +extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
512 +extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
513 +#endif /* HAVE_AVAHI */
519 diff -up cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded cups-2.2.7/scheduler/cupsd.h
520 --- cups-2.2.7/scheduler/cupsd.h.avahi-no-threaded 2018-03-23 04:48:36.000000000 +0100
521 +++ cups-2.2.7/scheduler/cupsd.h 2018-04-03 14:27:17.067410826 +0200
522 @@ -118,6 +118,7 @@ extern const char *cups_hstrerror(int);
523 #include "colorman.h"
529 #include "subscriptions.h"
530 @@ -138,6 +139,15 @@ extern const char *cups_hstrerror(int);
532 typedef void (*cupsd_selfunc_t)(void *data);
536 + * Timeout callback function type...
539 +typedef struct _cupsd_timeout_s cupsd_timeout_t;
540 +typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
541 +#endif /* HAVE_AVAHI */
546 @@ -162,6 +172,9 @@ VAR int OnDemand VALUE(0);
547 /* Launched on demand */
548 #endif /* HAVE_ONDEMAND */
551 +VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
552 +#endif /* HAVE_AVAHI */
556 @@ -224,3 +237,15 @@ extern void cupsdStopSelect(void);
558 extern void cupsdStartServer(void);
559 extern void cupsdStopServer(void);
562 +extern void cupsdInitTimeouts(void);
563 +extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
564 + cupsd_timeoutfunc_t cb,
566 +extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
567 +extern void cupsdRunTimeout (cupsd_timeout_t *timeout);
568 +extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout,
569 + const struct timeval *tv);
570 +extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
571 +#endif /* HAVE_AVAHI */
572 \ No newline at end of file
573 diff -up cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.7/scheduler/dirsvc.c
574 --- cups-2.2.7/scheduler/dirsvc.c.avahi-no-threaded 2018-03-23 04:48:36.000000000 +0100
575 +++ cups-2.2.7/scheduler/dirsvc.c 2018-04-03 14:30:13.099422499 +0200
576 @@ -193,7 +193,7 @@ cupsdStartBrowsing(void)
577 cupsdUpdateDNSSDName();
579 # else /* HAVE_AVAHI */
580 - if ((DNSSDMaster = avahi_threaded_poll_new()) == NULL)
581 + if ((DNSSDMaster = avahi_cups_poll_new()) == NULL)
583 cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread.");
585 @@ -204,7 +204,7 @@ cupsdStartBrowsing(void)
587 int error; /* Error code, if any */
589 - DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
590 + DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
592 if (DNSSDClient == NULL)
594 @@ -215,11 +215,9 @@ cupsdStartBrowsing(void)
595 if (FatalErrors & CUPSD_FATAL_BROWSE)
596 cupsdEndProcess(getpid(), 0);
598 - avahi_threaded_poll_free(DNSSDMaster);
599 + avahi_cups_poll_free(DNSSDMaster);
603 - avahi_threaded_poll_start(DNSSDMaster);
605 # endif /* HAVE_DNSSD */
607 @@ -635,7 +633,7 @@ dnssdClientCallback(
608 * Renew Avahi client...
611 - DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
612 + DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
616 @@ -701,17 +699,11 @@ dnssdDeregisterInstance(
619 # else /* HAVE_AVAHI */
620 - if (!from_callback)
621 - avahi_threaded_poll_lock(DNSSDMaster);
625 avahi_entry_group_free(*srv);
629 - if (!from_callback)
630 - avahi_threaded_poll_unlock(DNSSDMaster);
631 # endif /* HAVE_DNSSD */
634 @@ -1030,16 +1022,10 @@ dnssdRegisterInstance(
637 # else /* HAVE_AVAHI */
638 - if (!from_callback)
639 - avahi_threaded_poll_lock(DNSSDMaster);
642 *srv = avahi_entry_group_new(DNSSDClient, dnssdRegisterCallback, NULL);
645 - if (!from_callback)
646 - avahi_threaded_poll_unlock(DNSSDMaster);
648 cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s",
649 name, dnssdErrorString(avahi_client_errno(DNSSDClient)));
651 @@ -1154,9 +1140,6 @@ dnssdRegisterInstance(
652 cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.",
656 - if (!from_callback)
657 - avahi_threaded_poll_unlock(DNSSDMaster);
658 # endif /* HAVE_DNSSD */
661 @@ -1327,9 +1310,6 @@ dnssdStop(void)
664 # else /* HAVE_AVAHI */
666 - avahi_threaded_poll_stop(DNSSDMaster);
670 avahi_client_free(DNSSDClient);
671 @@ -1338,7 +1318,7 @@ dnssdStop(void)
675 - avahi_threaded_poll_free(DNSSDMaster);
676 + avahi_cups_poll_free(DNSSDMaster);
679 # endif /* HAVE_DNSSD */
680 diff -up cups-2.2.7/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.7/scheduler/dirsvc.h
681 --- cups-2.2.7/scheduler/dirsvc.h.avahi-no-threaded 2018-03-23 04:48:36.000000000 +0100
682 +++ cups-2.2.7/scheduler/dirsvc.h 2018-04-03 14:27:17.068410820 +0200
683 @@ -49,7 +49,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
684 VAR DNSServiceRef DNSSDMaster VALUE(NULL);
685 /* Master DNS-SD service reference */
686 # else /* HAVE_AVAHI */
687 -VAR AvahiThreadedPoll *DNSSDMaster VALUE(NULL);
688 +VAR AvahiCupsPoll *DNSSDMaster VALUE(NULL);
689 /* Master polling interface for Avahi */
690 VAR AvahiClient *DNSSDClient VALUE(NULL);
691 /* Client information */
692 diff -up cups-2.2.7/scheduler/main.c.avahi-no-threaded cups-2.2.7/scheduler/main.c
693 --- cups-2.2.7/scheduler/main.c.avahi-no-threaded 2018-04-03 14:27:17.057410882 +0200
694 +++ cups-2.2.7/scheduler/main.c 2018-04-03 14:27:17.069410814 +0200
695 @@ -131,7 +131,10 @@ main(int argc, /* I - Number of comm
696 int service_idle_exit;
697 /* Idle exit on select timeout? */
698 #endif /* HAVE_ONDEMAND */
701 + cupsd_timeout_t *tmo; /* Next scheduled timed callback */
702 + long tmo_delay; /* Time before it must be called */
703 +#endif /* HAVE_AVAHI */
707 @@ -610,6 +613,14 @@ main(int argc, /* I - Number of comm
713 + * Initialize timed callback structures.
716 + cupsdInitTimeouts();
717 +#endif /* HAVE_AVAHI */
722 @@ -928,6 +939,16 @@ main(int argc, /* I - Number of comm
724 #endif /* __APPLE__ */
728 + * If a timed callback is due, run it.
731 + tmo = cupsdNextTimeout (&tmo_delay);
732 + if (tmo && tmo_delay == 0)
733 + cupsdRunTimeout (tmo);
734 +#endif /* HAVE_AVAHI */
738 * Update the network interfaces once a minute...
739 @@ -1632,6 +1653,10 @@ select_timeout(int fds) /* I - Number
740 cupsd_job_t *job; /* Job information */
741 cupsd_printer_t *printer; /* Printer information */
742 const char *why; /* Debugging aid */
744 + cupsd_timeout_t *tmo; /* Timed callback */
745 + long tmo_delay; /* Seconds before calling it */
746 +#endif /* HAVE_AVAHI */
749 cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
750 @@ -1677,6 +1702,19 @@ select_timeout(int fds) /* I - Number
752 #endif /* __APPLE__ */
756 + * See if there are any scheduled timed callbacks to run.
759 + if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
760 + (now + tmo_delay) < timeout)
762 + timeout = tmo_delay;
763 + why = "run a timed callback";
765 +#endif /* HAVE_AVAHI */
768 * Check whether we are accepting new connections...
770 diff -up cups-2.2.7/scheduler/Makefile.avahi-no-threaded cups-2.2.7/scheduler/Makefile
771 --- cups-2.2.7/scheduler/Makefile.avahi-no-threaded 2018-03-23 04:48:36.000000000 +0100
772 +++ cups-2.2.7/scheduler/Makefile 2018-04-03 14:27:17.069410814 +0200
773 @@ -15,6 +15,7 @@ include ../Makedefs
781 @@ -38,7 +39,8 @@ CUPSDOBJS = \
791 diff -up cups-2.2.7/scheduler/timeout.c.avahi-no-threaded cups-2.2.7/scheduler/timeout.c
792 --- cups-2.2.7/scheduler/timeout.c.avahi-no-threaded 2018-04-03 14:27:17.069410814 +0200
793 +++ cups-2.2.7/scheduler/timeout.c 2018-04-03 14:27:17.069410814 +0200
798 + * Timeout functions for the Common UNIX Printing System (CUPS).
800 + * Copyright (C) 2010, 2011 Red Hat, Inc.
802 + * Tim Waugh <twaugh@redhat.com>
804 + * Redistribution and use in source and binary forms, with or without
805 + * modification, are permitted provided that the following conditions
808 + * Redistributions of source code must retain the above copyright
809 + * notice, this list of conditions and the following disclaimer.
811 + * Redistributions in binary form must reproduce the above copyright
812 + * notice, this list of conditions and the following disclaimer in the
813 + * documentation and/or other materials provided with the distribution.
815 + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
816 + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
817 + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
818 + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
819 + * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
820 + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
821 + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
822 + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
823 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
824 + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
825 + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
826 + * OF THE POSSIBILITY OF SUCH DAMAGE.
830 + * cupsdInitTimeouts() - Initialise timeout structure.
831 + * cupsdAddTimeout() - Add a timed callback.
832 + * cupsdNextTimeout() - Find the next enabled timed callback.
833 + * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
834 + * cupsdRemoveTimeout() - Discard a timed callback.
835 + * compare_timeouts() - Compare timed callbacks for array sorting.
840 +#ifdef HAVE_AVAHI /* Applies to entire file... */
843 + * Include necessary headers...
848 +#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
849 +# include <malloc.h>
850 +#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
853 +# include <avahi-common/timeval.h>
854 +#endif /* HAVE_AVAHI */
857 +struct _cupsd_timeout_s
859 + struct timeval when;
861 + cupsd_timeoutfunc_t callback;
866 + * Local functions...
870 + * 'compare_timeouts()' - Compare timed callbacks for array sorting.
874 +compare_addrs (void *p0, void *p1)
884 +compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
886 + int addrsdiff = compare_addrs (p0, p1);
889 + if (addrsdiff == 0)
892 + if (!p0->enabled || !p1->enabled)
894 + if (!p0->enabled && !p1->enabled)
895 + return (addrsdiff);
897 + return (p0->enabled ? -1 : 1);
900 + tvdiff = avahi_timeval_compare (&p0->when, &p1->when);
904 + return (addrsdiff);
909 + * 'cupsdInitTimeouts()' - Initialise timeout structures.
913 +cupsdInitTimeouts(void)
915 + Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
920 + * 'cupsdAddTimeout()' - Add a timed callback.
923 +cupsd_timeout_t * /* O - Timeout handle */
924 +cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */
925 + cupsd_timeoutfunc_t cb, /* I - Callback function */
926 + void *data) /* I - User data */
928 + cupsd_timeout_t *timeout;
930 + timeout = malloc (sizeof(cupsd_timeout_t));
931 + if (timeout != NULL)
933 + timeout->enabled = (tv != NULL);
936 + timeout->when.tv_sec = tv->tv_sec;
937 + timeout->when.tv_usec = tv->tv_usec;
940 + timeout->callback = cb;
941 + timeout->data = data;
942 + cupsArrayAdd (Timeouts, timeout);
950 + * 'cupsdNextTimeout()' - Find the next enabled timed callback.
953 +cupsd_timeout_t * /* O - Next enabled timeout or NULL */
954 +cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */
956 + cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
957 + struct timeval curtime;
959 + if (first && !first->enabled)
962 + if (first && delay)
964 + gettimeofday (&curtime, NULL);
965 + if (avahi_timeval_compare (&curtime, &first->when) > 0)
969 + *delay = 1 + first->when.tv_sec - curtime.tv_sec;
970 + if (first->when.tv_usec < curtime.tv_usec)
980 + * 'cupsdRunTimeout()' - Run a timed callback.
984 +cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
988 + timeout->enabled = 0;
989 + if (!timeout->callback)
991 + timeout->callback (timeout, timeout->data);
995 + * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
999 +cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */
1000 + const struct timeval *tv) /* I - Absolute time or NULL */
1002 + cupsArrayRemove (Timeouts, timeout);
1003 + timeout->enabled = (tv != NULL);
1006 + timeout->when.tv_sec = tv->tv_sec;
1007 + timeout->when.tv_usec = tv->tv_usec;
1009 + cupsArrayAdd (Timeouts, timeout);
1014 + * 'cupsdRemoveTimeout()' - Discard a timed callback.
1018 +cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
1020 + cupsArrayRemove (Timeouts, timeout);
1025 +#endif /* HAVE_AVAHI ... from top of file */