cups-avahi-no-threaded.patch

   1 diff -up cups-1.7.2/scheduler/avahi.c.avahi-no-threaded cups-1.7.2/scheduler/avahi.c
   2 --- cups-1.7.2/scheduler/avahi.c.avahi-no-threaded      2014-04-14 13:56:52.632617316 +0200
   3 +++ cups-1.7.2/scheduler/avahi.c        2014-04-14 13:56:52.631617331 +0200
   4 @@ -0,0 +1,441 @@
   5 +/*
   6 + * "$Id$"
   7 + *
   8 + *   Avahi poll implementation for the CUPS scheduler.
   9 + *
  10 + *   Copyright (C) 2010, 2011 Red Hat, Inc.
  11 + *   Authors:
  12 + *    Tim Waugh <twaugh@redhat.com>
  13 + *
  14 + *   Redistribution and use in source and binary forms, with or without
  15 + *   modification, are permitted provided that the following conditions
  16 + *   are met:
  17 + *
  18 + *   Redistributions of source code must retain the above copyright
  19 + *   notice, this list of conditions and the following disclaimer.
  20 + *
  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.
  24 + *
  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.
  37 + *
  38 + * Contents:
  39 + *
  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
  55 + */
  56 +
  57 +#include <config.h>
  58 +
  59 +#ifdef HAVE_AVAHI /* Applies to entire file... */
  60 +
  61 +/*
  62 + * Include necessary headers...
  63 + */
  64 +
  65 +#include "cupsd.h"
  66 +
  67 +#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
  68 +#  include <malloc.h>
  69 +#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
  70 +
  71 +#ifdef HAVE_AVAHI
  72 +#  include <avahi-common/timeval.h>
  73 +#endif /* HAVE_AVAHI */
  74 +
  75 +
  76 +typedef struct
  77 +{
  78 +  AvahiCupsPoll *cups_poll;
  79 +
  80 +  int fd;
  81 +  AvahiWatchEvent occurred;
  82 +  cups_array_t *watches;
  83 +} cupsd_watched_fd_t;
  84 +
  85 +struct AvahiWatch
  86 +{
  87 +  cupsd_watched_fd_t *watched_fd;
  88 +
  89 +  AvahiWatchEvent events;
  90 +  AvahiWatchCallback callback;
  91 +  void *userdata;
  92 +};
  93 +
  94 +struct AvahiTimeout
  95 +{
  96 +  AvahiCupsPoll *cups_poll;
  97 +  AvahiTimeoutCallback callback;
  98 +  void *userdata;
  99 +  cupsd_timeout_t *cupsd_timeout;
 100 +};
 101 +
 102 +/*
 103 + * Local functions...
 104 + */
 105 +
 106 +static AvahiWatch *    watch_new(const AvahiPoll *api,
 107 +                                 int fd,
 108 +                                 AvahiWatchEvent events,
 109 +                                 AvahiWatchCallback callback,
 110 +                                 void *userdata);
 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);
 115 +
 116 +
 117 +/*
 118 + * 'watch_read_cb' - Read callback for file descriptor
 119 + */
 120 +
 121 +static void
 122 +watch_read_cb (void *userdata)
 123 +{
 124 +  AvahiWatch *watch;
 125 +  cupsd_watched_fd_t *watched_fd = userdata;
 126 +  watched_fd->occurred |= AVAHI_WATCH_IN;
 127 +  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
 128 +       watch;
 129 +       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
 130 +  {
 131 +    if (watch->events & watched_fd->occurred)
 132 +    {
 133 +      (watch->callback) (watch, watched_fd->fd,
 134 +                        AVAHI_WATCH_IN, watch->userdata);
 135 +      watched_fd->occurred &= ~AVAHI_WATCH_IN;
 136 +      break;
 137 +    }
 138 +  }
 139 +}
 140 +
 141 +
 142 +/*
 143 + * 'watch_write_cb' - Write callback for file descriptor
 144 + */
 145 +
 146 +static void
 147 +watch_write_cb (void *userdata)
 148 +{
 149 +  AvahiWatch *watch;
 150 +  cupsd_watched_fd_t *watched_fd = userdata;
 151 +  watched_fd->occurred |= AVAHI_WATCH_OUT;
 152 +  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
 153 +       watch;
 154 +       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
 155 +  {
 156 +    if (watch->events & watched_fd->occurred)
 157 +    {
 158 +      (watch->callback) (watch, watched_fd->fd,
 159 +                        AVAHI_WATCH_OUT, watch->userdata);
 160 +      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
 161 +      break;
 162 +    }
 163 +  }
 164 +}
 165 +
 166 +
 167 +/*
 168 + * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
 169 + */
 170 +
 171 +static int                                             /* O - Watches? */
 172 +watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
 173 +{
 174 +  AvahiWatch *watch;
 175 +  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
 176 +  int any_watches = 0;
 177 +
 178 +  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
 179 +       watch;
 180 +       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
 181 +  {
 182 +    any_watches = 1;
 183 +    if (watch->events & (AVAHI_WATCH_IN |
 184 +                            AVAHI_WATCH_ERR |
 185 +                            AVAHI_WATCH_HUP))
 186 +    {
 187 +      read_cb = (cupsd_selfunc_t)watch_read_cb;
 188 +      if (write_cb != NULL)
 189 +       break;
 190 +    }
 191 +
 192 +    if (watch->events & AVAHI_WATCH_OUT)
 193 +    {
 194 +      write_cb = (cupsd_selfunc_t)watch_write_cb;
 195 +      if (read_cb != NULL)
 196 +       break;
 197 +    }
 198 +  }
 199 +
 200 +  if (read_cb || write_cb)
 201 +    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
 202 +  else
 203 +    cupsdRemoveSelect (watched_fd->fd);
 204 +
 205 +  return (any_watches);
 206 +}
 207 +
 208 +/*
 209 + * 'watch_new' - Create a new file descriptor watch
 210 + */
 211 +
 212 +static AvahiWatch *
 213 +watch_new (const AvahiPoll *api,
 214 +          int fd,
 215 +          AvahiWatchEvent events,
 216 +          AvahiWatchCallback callback,
 217 +          void *userdata)
 218 +{
 219 +  cupsd_watched_fd_t key, *watched_fd;
 220 +  AvahiCupsPoll *cups_poll = api->userdata;
 221 +  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
 222 +  if (watch == NULL)
 223 +    return (NULL);
 224 +
 225 +  watch->events = events;
 226 +  watch->callback = callback;
 227 +  watch->userdata = userdata;
 228 +
 229 +  key.fd = fd;
 230 +  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
 231 +  if (watched_fd == NULL)
 232 +  {
 233 +    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
 234 +    if (watched_fd == NULL)
 235 +    {
 236 +      free (watch);
 237 +      return (NULL);
 238 +    }
 239 +
 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);
 245 +  }
 246 +
 247 +  watch->watched_fd = watched_fd;
 248 +  cupsArrayAdd(watched_fd->watches, watch);
 249 +  watched_fd_add_select (watched_fd);
 250 +  return (watch);
 251 +}
 252 +
 253 +
 254 +/*
 255 + * 'watch_free' - Free a file descriptor watch
 256 + */
 257 +
 258 +static void
 259 +watch_free (AvahiWatch *watch)
 260 +{
 261 +  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
 262 +  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
 263 +
 264 +  cupsArrayRemove (watched_fd->watches, watch);
 265 +  free (watch);
 266 +
 267 +  if (!watched_fd_add_select (watched_fd))
 268 +  {
 269 +    /* No more watches */
 270 +    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
 271 +    free (watched_fd);
 272 +  }
 273 +}
 274 +
 275 +
 276 +/*
 277 + * 'watch_update' - Update watched events for a file descriptor
 278 + */
 279 +
 280 +static void
 281 +watch_update (AvahiWatch *watch,
 282 +             AvahiWatchEvent events)
 283 +{
 284 +  watch->events = events;
 285 +  watched_fd_add_select (watch->watched_fd);
 286 +}
 287 +
 288 +
 289 +/*
 290 + * 'watch_get_events' - Get events that happened for a file descriptor
 291 + */
 292 +
 293 +static AvahiWatchEvent
 294 +watch_get_events (AvahiWatch *watch)
 295 +{
 296 +  return (watch->watched_fd->occurred);
 297 +}
 298 +
 299 +
 300 +/*
 301 + * 'timeout_cb()' - Run a timed Avahi callback
 302 + */
 303 +
 304 +static void
 305 +timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
 306 +{
 307 +  AvahiTimeout *timeout = userdata;
 308 +  (timeout->callback) (timeout, timeout->userdata);
 309 +}
 310 +
 311 +
 312 +/*
 313 + * 'timeout_new' - Set a wakeup time
 314 + */
 315 +
 316 +static AvahiTimeout *
 317 +timeout_new (const AvahiPoll *api,
 318 +            const struct timeval *tv,
 319 +            AvahiTimeoutCallback callback,
 320 +            void *userdata)
 321 +{
 322 +  AvahiTimeout *timeout;
 323 +  AvahiCupsPoll *cups_poll = api->userdata;
 324 +
 325 +  timeout = malloc(sizeof(AvahiTimeout));
 326 +  if (timeout == NULL)
 327 +    return (NULL);
 328 +
 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,
 334 +                                           timeout);
 335 +  cupsArrayAdd (cups_poll->timeouts, timeout);
 336 +  return (timeout);
 337 +}
 338 +
 339 +
 340 +/*
 341 + * 'timeout_update' - Update the expiration time for a timeout
 342 + */
 343 +
 344 +static void
 345 +timeout_update (AvahiTimeout *timeout,
 346 +               const struct timeval *tv)
 347 +{
 348 +  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
 349 +}
 350 +
 351 +
 352 +/*
 353 + * ' timeout_free' - Free a timeout
 354 + */
 355 +
 356 +static void
 357 +timeout_free (AvahiTimeout *timeout)
 358 +{
 359 +  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
 360 +  cupsdRemoveTimeout (timeout->cupsd_timeout);
 361 +  free (timeout);
 362 +}
 363 +
 364 +
 365 +/*
 366 + * 'compare_watched_fds' - Compare watched file descriptors for array sorting
 367 + */
 368 +static int
 369 +compare_watched_fds(cupsd_watched_fd_t *p0,
 370 +                   cupsd_watched_fd_t *p1)
 371 +{
 372 +  /*
 373 +   * Compare by fd (no two elements have the same fd)
 374 +   */
 375 +
 376 +  if (p0->fd == p1->fd)
 377 +    return 0;
 378 +
 379 +  return (p0->fd < p1->fd ? -1 : 1);
 380 +}
 381 +
 382 +
 383 +/*
 384 + * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
 385 + */
 386 +
 387 +AvahiCupsPoll *
 388 +avahi_cups_poll_new (void)
 389 +{
 390 +  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
 391 +  if (cups_poll == NULL)
 392 +    return (NULL);
 393 +
 394 +  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
 395 +                                        NULL);
 396 +  cups_poll->timeouts = cupsArrayNew (NULL, NULL);
 397 +
 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;
 403 +
 404 +  cups_poll->api.timeout_new = timeout_new;
 405 +  cups_poll->api.timeout_update = timeout_update;
 406 +  cups_poll->api.timeout_free = timeout_free;
 407 +
 408 +  return (cups_poll);
 409 +}
 410 +
 411 +
 412 +/*
 413 + * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
 414 + */
 415 +void
 416 +avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
 417 +{
 418 +  cupsd_watched_fd_t *watched_fd;
 419 +
 420 +  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
 421 +       watched_fd;
 422 +       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
 423 +    cupsArrayClear (watched_fd->watches);
 424 +
 425 +  cupsArrayClear (cups_poll->watched_fds);
 426 +  cupsArrayClear (cups_poll->timeouts);
 427 +}
 428 +
 429 +
 430 +/*
 431 + * 'avahi_cups_poll_get' - Get the abstract poll API structure
 432 + */
 433 +
 434 +const AvahiPoll *
 435 +avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
 436 +{
 437 +  return (&cups_poll->api);
 438 +}
 439 +
 440 +
 441 +#endif /* HAVE_AVAHI ... from top of file */
 442 +
 443 +/*
 444 + * End of "$Id$".
 445 + */
 446 diff -up cups-1.7.2/scheduler/avahi.h.avahi-no-threaded cups-1.7.2/scheduler/avahi.h
 447 --- cups-1.7.2/scheduler/avahi.h.avahi-no-threaded      2014-04-14 13:56:52.632617316 +0200
 448 +++ cups-1.7.2/scheduler/avahi.h        2014-04-14 13:56:52.632617316 +0200
 449 @@ -0,0 +1,69 @@
 450 +/*
 451 + * "$Id$"
 452 + *
 453 + *   Avahi poll implementation for the CUPS scheduler.
 454 + *
 455 + *   Copyright (C) 2010, 2011 Red Hat, Inc.
 456 + *   Authors:
 457 + *    Tim Waugh <twaugh@redhat.com>
 458 + *
 459 + *   Redistribution and use in source and binary forms, with or without
 460 + *   modification, are permitted provided that the following conditions
 461 + *   are met:
 462 + *
 463 + *   Redistributions of source code must retain the above copyright
 464 + *   notice, this list of conditions and the following disclaimer.
 465 + *
 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.
 469 + *
 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.
 482 + */
 483 +
 484 +#include <config.h>
 485 +
 486 +#ifdef HAVE_AVAHI
 487 +#  include <avahi-client/client.h>
 488 +#  include <avahi-client/publish.h>
 489 +#endif /* HAVE_AVAHI */
 490 +
 491 +#ifdef HAVE_AUTHORIZATION_H
 492 +#  include <Security/Authorization.h>
 493 +#endif /* HAVE_AUTHORIZATION_H */
 494 +
 495 +
 496 +#ifdef HAVE_AVAHI
 497 +typedef struct
 498 +{
 499 +    AvahiPoll api;
 500 +    cups_array_t *watched_fds;
 501 +    cups_array_t *timeouts;
 502 +} AvahiCupsPoll;
 503 +#endif /* HAVE_AVAHI */
 504 +
 505 +/*
 506 + * Prototypes...
 507 + */
 508 +
 509 +#ifdef 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 */
 514 +
 515 +
 516 +/*
 517 + * End of "$Id$".
 518 + */
 519 diff -up cups-1.7.2/scheduler/cupsd.h.avahi-no-threaded cups-1.7.2/scheduler/cupsd.h
 520 --- cups-1.7.2/scheduler/cupsd.h.avahi-no-threaded      2013-05-29 13:51:34.000000000 +0200
 521 +++ cups-1.7.2/scheduler/cupsd.h        2014-04-14 13:56:52.632617316 +0200
 522 @@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int);
 523  #include "colorman.h"
 524  #include "conf.h"
 525  #include "banners.h"
 526 +#include "avahi.h"
 527  #include "dirsvc.h"
 528  #include "network.h"
 529  #include "subscriptions.h"
 530 @@ -139,6 +140,15 @@ extern const char *cups_hstrerror(int);
 531
 532  typedef void (*cupsd_selfunc_t)(void *data);
 533
 534 +#ifdef HAVE_AVAHI
 535 +/*
 536 + * Timeout callback function type...
 537 + */
 538 +
 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 */
 542 +
 543
 544  /*
 545   * Globals...
 546 @@ -165,6 +175,11 @@ VAR int                    Launchd         VALUE(0);
 547                                         /* Running from launchd */
 548  #endif /* HAVE_LAUNCH_H */
 549
 550 +#ifdef HAVE_AVAHI
 551 +VAR cups_array_t *Timeouts;            /* Timed callbacks for main loop */
 552 +#endif /* HAVE_AVAHI */
 553 +
 554 +
 555
 556  /*
 557   * Prototypes...
 558 @@ -229,6 +244,17 @@ extern void                cupsdStopSelect(void);
 559  extern void            cupsdStartServer(void);
 560  extern void            cupsdStopServer(void);
 561
 562 +#ifdef HAVE_AVAHI
 563 +extern void     cupsdInitTimeouts(void);
 564 +extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
 565 +                                        cupsd_timeoutfunc_t cb,
 566 +                                        void *data);
 567 +extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
 568 +extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
 569 +extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
 570 +                                   const struct timeval *tv);
 571 +extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
 572 +#endif /* HAVE_AVAHI */
 573
 574  /*
 575   * End of "$Id: cupsd.h 10996 2013-05-29 11:51:34Z msweet $".
 576 diff -up cups-1.7.2/scheduler/dirsvc.c.avahi-no-threaded cups-1.7.2/scheduler/dirsvc.c
 577 --- cups-1.7.2/scheduler/dirsvc.c.avahi-no-threaded     2014-03-05 22:11:32.000000000 +0100
 578 +++ cups-1.7.2/scheduler/dirsvc.c       2014-04-14 14:21:11.121344106 +0200
 579 @@ -195,7 +195,7 @@ cupsdStartBrowsing(void)
 580      cupsdUpdateDNSSDName();
 581
 582  #  else /* HAVE_AVAHI */
 583 -    if ((DNSSDMaster = avahi_threaded_poll_new()) == NULL)
 584 +    if ((DNSSDMaster = avahi_cups_poll_new()) == NULL)
 585      {
 586        cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread.");
 587
 588 @@ -206,7 +206,7 @@ cupsdStartBrowsing(void)
 589      {
 590        int error;                       /* Error code, if any */
 591
 592 -      DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
 593 +      DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
 594
 595        if (DNSSDClient == NULL)
 596        {
 597 @@ -217,11 +217,9 @@ cupsdStartBrowsing(void)
 598          if (FatalErrors & CUPSD_FATAL_BROWSE)
 599           cupsdEndProcess(getpid(), 0);
 600
 601 -        avahi_threaded_poll_free(DNSSDMaster);
 602 +        avahi_cups_poll_free(DNSSDMaster);
 603          DNSSDMaster = NULL;
 604        }
 605 -      else
 606 -       avahi_threaded_poll_start(DNSSDMaster);
 607      }
 608  #  endif /* HAVE_DNSSD */
 609    }
 610 @@ -606,7 +604,7 @@ dnssdClientCallback(
 611           * Renew Avahi client...
 612           */
 613
 614 -         DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
 615 +         DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error);
 616
 617           if (!DNSSDClient)
 618           {
 619 @@ -670,13 +668,7 @@ dnssdDeregisterInstance(
 620    DNSServiceRefDeallocate(*srv);
 621
 622  #  else /* HAVE_AVAHI */
 623 -  if (!from_callback)
 624 -    avahi_threaded_poll_lock(DNSSDMaster);
 625 -
 626    avahi_entry_group_free(*srv);
 627 -
 628 -  if (!from_callback)
 629 -    avahi_threaded_poll_unlock(DNSSDMaster);
 630  #  endif /* HAVE_DNSSD */
 631
 632    *srv = NULL;
 633 @@ -997,16 +989,10 @@ dnssdRegisterInstance(
 634    (void)commit;
 635
 636  #  else /* HAVE_AVAHI */
 637 -  if (!from_callback)
 638 -    avahi_threaded_poll_lock(DNSSDMaster);
 639 -
 640    if (!*srv)
 641      *srv = avahi_entry_group_new(DNSSDClient, dnssdRegisterCallback, NULL);
 642    if (!*srv)
 643    {
 644 -    if (!from_callback)
 645 -      avahi_threaded_poll_unlock(DNSSDMaster);
 646 -
 647      cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s",
 648                      name, dnssdErrorString(avahi_client_errno(DNSSDClient)));
 649      return (0);
 650 @@ -1121,9 +1107,6 @@ dnssdRegisterInstance(
 651        cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.",
 652                        name);
 653    }
 654 -
 655 -  if (!from_callback)
 656 -    avahi_threaded_poll_unlock(DNSSDMaster);
 657  #  endif /* HAVE_DNSSD */
 658
 659    if (error)
 660 @@ -1294,12 +1277,10 @@ dnssdStop(void)
 661    DNSSDMaster = NULL;
 662
 663  #  else /* HAVE_AVAHI */
 664 -  avahi_threaded_poll_stop(DNSSDMaster);
 665 -
 666    avahi_client_free(DNSSDClient);
 667    DNSSDClient = NULL;
 668
 669 -  avahi_threaded_poll_free(DNSSDMaster);
 670 +  avahi_cups_poll_free(DNSSDMaster);
 671    DNSSDMaster = NULL;
 672  #  endif /* HAVE_DNSSD */
 673
 674 diff -up cups-1.7.2/scheduler/dirsvc.h.avahi-no-threaded cups-1.7.2/scheduler/dirsvc.h
 675 --- cups-1.7.2/scheduler/dirsvc.h.avahi-no-threaded     2013-05-29 13:51:34.000000000 +0200
 676 +++ cups-1.7.2/scheduler/dirsvc.h       2014-04-14 13:56:52.633617302 +0200
 677 @@ -51,7 +51,7 @@ VAR cups_array_t      *DNSSDPrinters  VALUE(NU
 678  VAR DNSServiceRef      DNSSDMaster     VALUE(NULL);
 679                                         /* Master DNS-SD service reference */
 680  #  else /* HAVE_AVAHI */
 681 -VAR AvahiThreadedPoll  *DNSSDMaster    VALUE(NULL);
 682 +VAR AvahiCupsPoll      *DNSSDMaster    VALUE(NULL);
 683                                         /* Master polling interface for Avahi */
 684  VAR AvahiClient                *DNSSDClient    VALUE(NULL);
 685                                         /* Client information */
 686 diff -up cups-1.7.2/scheduler/main.c.avahi-no-threaded cups-1.7.2/scheduler/main.c
 687 --- cups-1.7.2/scheduler/main.c.avahi-no-threaded       2014-04-14 13:56:52.600617782 +0200
 688 +++ cups-1.7.2/scheduler/main.c 2014-04-14 13:56:52.634617287 +0200
 689 @@ -134,6 +134,10 @@ main(int  argc,                            /* I - Number of comm
 690    int                  launchd_idle_exit;
 691                                         /* Idle exit on select timeout? */
 692  #endif /* HAVE_LAUNCHD */
 693 +#ifdef HAVE_AVAHI
 694 +  cupsd_timeout_t      *tmo;           /* Next scheduled timed callback */
 695 +  long                 tmo_delay;      /* Time before it must be called */
 696 +#endif /* HAVE_AVAHI */
 697
 698
 699  #ifdef HAVE_GETEUID
 700 @@ -583,6 +587,14 @@ main(int  argc,                            /* I - Number of comm
 701
 702    httpInitialize();
 703
 704 +#ifdef HAVE_AVAHI
 705 + /*
 706 +  * Initialize timed callback structures.
 707 +  */
 708 +
 709 +  cupsdInitTimeouts();
 710 +#endif /* HAVE_AVAHI */
 711 +
 712    cupsdStartServer();
 713
 714   /*
 715 @@ -904,6 +916,16 @@ main(int  argc,                            /* I - Number of comm
 716      }
 717  #endif /* __APPLE__ */
 718
 719 +#ifdef HAVE_AVAHI
 720 +   /*
 721 +    * If a timed callback is due, run it.
 722 +    */
 723 +
 724 +    tmo = cupsdNextTimeout (&tmo_delay);
 725 +    if (tmo && tmo_delay == 0)
 726 +      cupsdRunTimeout (tmo);
 727 +#endif /* HAVE_AVAHI */
 728 +
 729  #ifndef __APPLE__
 730     /*
 731      * Update the network interfaces once a minute...
 732 @@ -1884,6 +1906,10 @@ select_timeout(int fds)                  /* I - Number
 733    cupsd_job_t          *job;           /* Job information */
 734    cupsd_subscription_t *sub;           /* Subscription information */
 735    const char           *why;           /* Debugging aid */
 736 +#ifdef HAVE_AVAHI
 737 +  cupsd_timeout_t      *tmo;           /* Timed callback */
 738 +  long                 tmo_delay;      /* Seconds before calling it */
 739 +#endif /* HAVE_AVAHI */
 740
 741
 742    cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
 743 @@ -1929,6 +1955,19 @@ select_timeout(int fds)                  /* I - Number
 744    }
 745  #endif /* __APPLE__ */
 746
 747 +#ifdef HAVE_AVAHI
 748 + /*
 749 +  * See if there are any scheduled timed callbacks to run.
 750 +  */
 751 +
 752 +  if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
 753 +      (now + tmo_delay) < timeout)
 754 +  {
 755 +    timeout = tmo_delay;
 756 +    why = "run a timed callback";
 757 +  }
 758 +#endif /* HAVE_AVAHI */
 759 +
 760   /*
 761    * Check whether we are accepting new connections...
 762    */
 763 diff -up cups-1.7.2/scheduler/Makefile.avahi-no-threaded cups-1.7.2/scheduler/Makefile
 764 --- cups-1.7.2/scheduler/Makefile.avahi-no-threaded     2014-04-14 13:56:52.600617782 +0200
 765 +++ cups-1.7.2/scheduler/Makefile       2014-04-14 13:56:52.631617331 +0200
 766 @@ -17,6 +17,7 @@ include ../Makedefs
 767
 768  CUPSDOBJS =    \
 769                 auth.o \
 770 +               avahi.o \
 771                 banners.o \
 772                 cert.o \
 773                 classes.o \
 774 @@ -41,6 +42,7 @@ CUPSDOBJS =   \
 775                 statbuf.o \
 776                 subscriptions.o \
 777                 sysman.o \
 778 +               timeout.o \
 779                 tls.o
 780  LIBOBJS =      \
 781                 filter.o \
 782 diff -up cups-1.7.2/scheduler/timeout.c.avahi-no-threaded cups-1.7.2/scheduler/timeout.c
 783 --- cups-1.7.2/scheduler/timeout.c.avahi-no-threaded    2014-04-14 13:56:52.634617287 +0200
 784 +++ cups-1.7.2/scheduler/timeout.c      2014-04-14 13:56:52.634617287 +0200
 785 @@ -0,0 +1,235 @@
 786 +/*
 787 + * "$Id$"
 788 + *
 789 + *   Timeout functions for the Common UNIX Printing System (CUPS).
 790 + *
 791 + *   Copyright (C) 2010, 2011 Red Hat, Inc.
 792 + *   Authors:
 793 + *     Tim Waugh <twaugh@redhat.com>
 794 + *
 795 + *   Redistribution and use in source and binary forms, with or without
 796 + *   modification, are permitted provided that the following conditions
 797 + *   are met:
 798 + *
 799 + *   Redistributions of source code must retain the above copyright
 800 + *   notice, this list of conditions and the following disclaimer.
 801 + *
 802 + *   Redistributions in binary form must reproduce the above copyright
 803 + *   notice, this list of conditions and the following disclaimer in the
 804 + *   documentation and/or other materials provided with the distribution.
 805 + *
 806 + *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 807 + *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 808 + *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 809 + *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 810 + *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
 811 + *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 812 + *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 813 + *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 814 + *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 815 + *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 816 + *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 817 + *   OF THE POSSIBILITY OF SUCH DAMAGE.
 818 + *
 819 + * Contents:
 820 + *
 821 + *   cupsdInitTimeouts()  - Initialise timeout structure.
 822 + *   cupsdAddTimeout()    - Add a timed callback.
 823 + *   cupsdNextTimeout()   - Find the next enabled timed callback.
 824 + *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
 825 + *   cupsdRemoveTimeout() - Discard a timed callback.
 826 + *   compare_timeouts()   - Compare timed callbacks for array sorting.
 827 + */
 828 +
 829 +#include <config.h>
 830 +
 831 +#ifdef HAVE_AVAHI /* Applies to entire file... */
 832 +
 833 +/*
 834 + * Include necessary headers...
 835 + */
 836 +
 837 +#include "cupsd.h"
 838 +
 839 +#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
 840 +#  include <malloc.h>
 841 +#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
 842 +
 843 +#ifdef HAVE_AVAHI
 844 +#  include <avahi-common/timeval.h>
 845 +#endif /* HAVE_AVAHI */
 846 +
 847 +
 848 +struct _cupsd_timeout_s
 849 +{
 850 +  struct timeval when;
 851 +  int enabled;
 852 +  cupsd_timeoutfunc_t callback;
 853 +  void *data;
 854 +};
 855 +
 856 +/*
 857 + * Local functions...
 858 + */
 859 +
 860 +/*
 861 + * 'compare_timeouts()' - Compare timed callbacks for array sorting.
 862 + */
 863 +
 864 +static int
 865 +compare_addrs (void *p0, void *p1)
 866 +{
 867 +  if (p0 == p1)
 868 +    return (0);
 869 +  if (p0 < p1)
 870 +    return (-1);
 871 +  return (1);
 872 +}
 873 +
 874 +static int
 875 +compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
 876 +{
 877 +  int addrsdiff = compare_addrs (p0, p1);
 878 +  int tvdiff;
 879 +
 880 +  if (addrsdiff == 0)
 881 +    return (0);
 882 +
 883 +  if (!p0->enabled || !p1->enabled)
 884 +  {
 885 +    if (!p0->enabled && !p1->enabled)
 886 +      return (addrsdiff);
 887 +
 888 +    return (p0->enabled ? -1 : 1);
 889 +  }
 890 +
 891 +  tvdiff = avahi_timeval_compare (&p0->when, &p1->when);
 892 +  if (tvdiff != 0)
 893 +    return (tvdiff);
 894 +
 895 +  return (addrsdiff);
 896 +}
 897 +
 898 +
 899 +/*
 900 + * 'cupsdInitTimeouts()' - Initialise timeout structures.
 901 + */
 902 +
 903 +void
 904 +cupsdInitTimeouts(void)
 905 +{
 906 +  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
 907 +}
 908 +
 909 +
 910 +/*
 911 + * 'cupsdAddTimeout()' - Add a timed callback.
 912 + */
 913 +
 914 +cupsd_timeout_t *                              /* O - Timeout handle */
 915 +cupsdAddTimeout(const struct timeval *tv,      /* I - Absolute time */
 916 +               cupsd_timeoutfunc_t cb,         /* I - Callback function */
 917 +               void *data)                     /* I - User data */
 918 +{
 919 +  cupsd_timeout_t *timeout;
 920 +
 921 +  timeout = malloc (sizeof(cupsd_timeout_t));
 922 +  if (timeout != NULL)
 923 +  {
 924 +    timeout->enabled = (tv != NULL);
 925 +    if (tv)
 926 +    {
 927 +      timeout->when.tv_sec = tv->tv_sec;
 928 +      timeout->when.tv_usec = tv->tv_usec;
 929 +    }
 930 +
 931 +    timeout->callback = cb;
 932 +    timeout->data = data;
 933 +    cupsArrayAdd (Timeouts, timeout);
 934 +  }
 935 +
 936 +  return timeout;
 937 +}
 938 +
 939 +
 940 +/*
 941 + * 'cupsdNextTimeout()' - Find the next enabled timed callback.
 942 + */
 943 +
 944 +cupsd_timeout_t *              /* O - Next enabled timeout or NULL */
 945 +cupsdNextTimeout(long *delay)  /* O - Seconds before scheduled */
 946 +{
 947 +  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
 948 +  struct timeval curtime;
 949 +
 950 +  if (first && !first->enabled)
 951 +    first = NULL;
 952 +
 953 +  if (first && delay)
 954 +  {
 955 +    gettimeofday (&curtime, NULL);
 956 +    if (avahi_timeval_compare (&curtime, &first->when) > 0)
 957 +    {
 958 +      *delay = 0;
 959 +    } else {
 960 +      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
 961 +      if (first->when.tv_usec < curtime.tv_usec)
 962 +       (*delay)--;
 963 +    }
 964 +  }
 965 +
 966 +  return (first);
 967 +}
 968 +
 969 +
 970 +/*
 971 + * 'cupsdRunTimeout()' - Run a timed callback.
 972 + */
 973 +
 974 +void
 975 +cupsdRunTimeout(cupsd_timeout_t *timeout)      /* I - Timeout */
 976 +{
 977 +  if (!timeout)
 978 +    return;
 979 +  timeout->enabled = 0;
 980 +  if (!timeout->callback)
 981 +    return;
 982 +  timeout->callback (timeout, timeout->data);
 983 +}
 984 +
 985 +/*
 986 + * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
 987 + */
 988 +
 989 +void
 990 +cupsdUpdateTimeout(cupsd_timeout_t *timeout,   /* I - Timeout */
 991 +                  const struct timeval *tv)    /* I - Absolute time or NULL */
 992 +{
 993 +  cupsArrayRemove (Timeouts, timeout);
 994 +  timeout->enabled = (tv != NULL);
 995 +  if (tv)
 996 +  {
 997 +    timeout->when.tv_sec = tv->tv_sec;
 998 +    timeout->when.tv_usec = tv->tv_usec;
 999 +  }
1000 +  cupsArrayAdd (Timeouts, timeout);
1001 +}
1002 +
1003 +
1004 +/*
1005 + * 'cupsdRemoveTimeout()' - Discard a timed callback.
1006 + */
1007 +
1008 +void
1009 +cupsdRemoveTimeout(cupsd_timeout_t *timeout)   /* I - Timeout */
1010 +{
1011 +  cupsArrayRemove (Timeouts, timeout);
1012 +  free (timeout);
1013 +}
1014 +
1015 +
1016 +#endif /* HAVE_AVAHI ... from top of file */
1017 +
1018 +/*
1019 + * End of "$Id$".
1020 + */