|
|
e6c38fe |
diff -up cups-1.4.7/scheduler/cupsd.h.avahi-3-timeouts cups-1.4.7/scheduler/cupsd.h
|
|
|
e6c38fe |
--- cups-1.4.7/scheduler/cupsd.h.avahi-3-timeouts 2011-01-11 07:05:58.000000000 +0000
|
|
|
e6c38fe |
+++ cups-1.4.7/scheduler/cupsd.h 2011-06-28 12:54:06.906728322 +0100
|
|
|
e6c38fe |
@@ -147,6 +147,15 @@ extern const char *cups_hstrerror(int);
|
|
|
e6c38fe |
|
|
|
e6c38fe |
typedef void (*cupsd_selfunc_t)(void *data);
|
|
|
e6c38fe |
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * Timeout callback function type...
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+typedef struct _cupsd_timeout_s cupsd_timeout_t;
|
|
|
e6c38fe |
+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
|
|
|
e6c38fe |
/*
|
|
|
e6c38fe |
* Globals...
|
|
|
e6c38fe |
@@ -188,6 +197,9 @@ VAR PSQUpdateQuotaProcPtr PSQUpdateQuota
|
|
|
e6c38fe |
/* Apple PrintService quota function */
|
|
|
e6c38fe |
#endif /* __APPLE__ && HAVE_DLFCN_H */
|
|
|
e6c38fe |
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
|
|
|
e6c38fe |
|
|
|
e6c38fe |
|
|
|
e6c38fe |
@@ -241,6 +253,18 @@ extern void cupsdRemoveSelect(int fd);
|
|
|
e6c38fe |
extern void cupsdStartSelect(void);
|
|
|
e6c38fe |
extern void cupsdStopSelect(void);
|
|
|
e6c38fe |
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+extern void cupsdInitTimeouts(void);
|
|
|
e6c38fe |
+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
|
|
|
e6c38fe |
+ cupsd_timeoutfunc_t cb,
|
|
|
e6c38fe |
+ void *data);
|
|
|
e6c38fe |
+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
|
|
|
e6c38fe |
+extern void cupsdRunTimeout (cupsd_timeout_t *timeout);
|
|
|
e6c38fe |
+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout,
|
|
|
e6c38fe |
+ const struct timeval *tv);
|
|
|
e6c38fe |
+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
extern int cupsdRemoveFile(const char *filename);
|
|
|
e6c38fe |
|
|
|
e6c38fe |
|
|
|
e6c38fe |
diff -up cups-1.4.7/scheduler/main.c.avahi-3-timeouts cups-1.4.7/scheduler/main.c
|
|
|
e6c38fe |
--- cups-1.4.7/scheduler/main.c.avahi-3-timeouts 2011-06-28 12:51:40.307369673 +0100
|
|
|
e6c38fe |
+++ cups-1.4.7/scheduler/main.c 2011-06-28 12:54:06.909728268 +0100
|
|
|
e6c38fe |
@@ -161,6 +161,10 @@ main(int argc, /* I - Number of comm
|
|
|
e6c38fe |
int launchd_idle_exit;
|
|
|
e6c38fe |
/* Idle exit on select timeout? */
|
|
|
e6c38fe |
#endif /* HAVE_LAUNCHD */
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */
|
|
|
e6c38fe |
+ long tmo_delay; /* Time before it must be called */
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
|
|
|
e6c38fe |
|
|
|
e6c38fe |
#ifdef HAVE_GETEUID
|
|
|
e6c38fe |
@@ -561,6 +565,14 @@ main(int argc, /* I - Number of comm
|
|
|
e6c38fe |
|
|
|
e6c38fe |
httpInitialize();
|
|
|
e6c38fe |
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+ /*
|
|
|
e6c38fe |
+ * Initialize timed callback structures.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ cupsdInitTimeouts();
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
cupsdStartServer();
|
|
|
e6c38fe |
|
|
|
e6c38fe |
/*
|
|
|
e6c38fe |
@@ -900,6 +912,16 @@ main(int argc, /* I - Number of comm
|
|
|
e6c38fe |
}
|
|
|
e6c38fe |
#endif /* __APPLE__ */
|
|
|
e6c38fe |
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+ /*
|
|
|
e6c38fe |
+ * If a timed callback is due, run it.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ tmo = cupsdNextTimeout (&tmo_delay);
|
|
|
e6c38fe |
+ if (tmo && tmo_delay == 0)
|
|
|
e6c38fe |
+ cupsdRunTimeout (tmo);
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
#ifndef __APPLE__
|
|
|
e6c38fe |
/*
|
|
|
e6c38fe |
* Update the network interfaces once a minute...
|
|
|
e6c38fe |
@@ -1925,6 +1947,10 @@ select_timeout(int fds) /* I - Number
|
|
|
e6c38fe |
cupsd_job_t *job; /* Job information */
|
|
|
e6c38fe |
cupsd_subscription_t *sub; /* Subscription information */
|
|
|
e6c38fe |
const char *why; /* Debugging aid */
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+ cupsd_timeout_t *tmo; /* Timed callback */
|
|
|
e6c38fe |
+ long tmo_delay; /* Seconds before calling it */
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
|
|
|
e6c38fe |
|
|
|
e6c38fe |
/*
|
|
|
e6c38fe |
@@ -1967,6 +1993,19 @@ select_timeout(int fds) /* I - Number
|
|
|
e6c38fe |
}
|
|
|
e6c38fe |
#endif /* __APPLE__ */
|
|
|
e6c38fe |
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+ /*
|
|
|
e6c38fe |
+ * See if there are any scheduled timed callbacks to run.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ tmo = cupsdNextTimeout (&tmo_delay);
|
|
|
e6c38fe |
+ if (tmo)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ timeout = tmo_delay;
|
|
|
e6c38fe |
+ why = "run a timed callback";
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
/*
|
|
|
e6c38fe |
* Check whether we are accepting new connections...
|
|
|
e6c38fe |
*/
|
|
|
e6c38fe |
diff -up cups-1.4.7/scheduler/Makefile.avahi-3-timeouts cups-1.4.7/scheduler/Makefile
|
|
|
e6c38fe |
--- cups-1.4.7/scheduler/Makefile.avahi-3-timeouts 2011-06-28 12:51:40.475366647 +0100
|
|
|
e6c38fe |
+++ cups-1.4.7/scheduler/Makefile 2011-06-28 12:54:06.906728322 +0100
|
|
|
e6c38fe |
@@ -39,7 +39,8 @@ CUPSDOBJS = \
|
|
|
e6c38fe |
server.o \
|
|
|
e6c38fe |
statbuf.o \
|
|
|
e6c38fe |
subscriptions.o \
|
|
|
e6c38fe |
- sysman.o
|
|
|
e6c38fe |
+ sysman.o \
|
|
|
e6c38fe |
+ timeout.o
|
|
|
e6c38fe |
LIBOBJS = \
|
|
|
e6c38fe |
filter.o \
|
|
|
e6c38fe |
mime.o \
|
|
|
e6c38fe |
diff -up cups-1.4.7/scheduler/timeout.c.avahi-3-timeouts cups-1.4.7/scheduler/timeout.c
|
|
|
e6c38fe |
--- cups-1.4.7/scheduler/timeout.c.avahi-3-timeouts 2011-06-28 12:54:06.910728250 +0100
|
|
|
e6c38fe |
+++ cups-1.4.7/scheduler/timeout.c 2011-06-28 12:54:06.910728250 +0100
|
|
|
e6c38fe |
@@ -0,0 +1,195 @@
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * "$Id$"
|
|
|
e6c38fe |
+ *
|
|
|
e6c38fe |
+ * Timeout functions for the Common UNIX Printing System (CUPS).
|
|
|
e6c38fe |
+ *
|
|
|
e6c38fe |
+ * Copyright (C) 2010 Red Hat, Inc.
|
|
|
e6c38fe |
+ * Authors:
|
|
|
e6c38fe |
+ * Tim Waugh <twaugh@redhat.com>
|
|
|
e6c38fe |
+ *
|
|
|
e6c38fe |
+ * Distribution and use rights are outlined in the file "LICENSE.txt"
|
|
|
e6c38fe |
+ * which should have been included with this file. If this file is
|
|
|
e6c38fe |
+ * file is missing or damaged, see the license at "http://www.cups.org/".
|
|
|
e6c38fe |
+ *
|
|
|
e6c38fe |
+ * Contents:
|
|
|
e6c38fe |
+ *
|
|
|
e6c38fe |
+ * cupsdInitTimeouts() - Initialise timeout structure.
|
|
|
e6c38fe |
+ * cupsdAddTimeout() - Add a timed callback.
|
|
|
e6c38fe |
+ * cupsdNextTimeout() - Find the next enabled timed callback.
|
|
|
e6c38fe |
+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
|
|
|
e6c38fe |
+ * cupsdRemoveTimeout() - Discard a timed callback.
|
|
|
e6c38fe |
+ * compare_timeouts() - Compare timed callbacks for array sorting.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+#include <config.h>
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI /* Applies to entire file... */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * Include necessary headers...
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+#include "cupsd.h"
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
|
|
|
e6c38fe |
+# include <malloc.h>
|
|
|
e6c38fe |
+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+#ifdef HAVE_AVAHI
|
|
|
e6c38fe |
+# include <avahi-common/timeval.h>
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+struct _cupsd_timeout_s
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ struct timeval when;
|
|
|
e6c38fe |
+ int enabled;
|
|
|
e6c38fe |
+ cupsd_timeoutfunc_t callback;
|
|
|
e6c38fe |
+ void *data;
|
|
|
e6c38fe |
+};
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * Local functions...
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+static int
|
|
|
e6c38fe |
+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ if (!p0->enabled || !p1->enabled)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ if (!p0->enabled && !p1->enabled)
|
|
|
e6c38fe |
+ return (0);
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ return (p0->enabled ? -1 : 1);
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ return (avahi_timeval_compare (&p0->when, &p1->when));
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+void
|
|
|
e6c38fe |
+cupsdInitTimeouts(void)
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'cupsdAddTimeout()' - Add a timed callback.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+cupsd_timeout_t * /* O - Timeout handle */
|
|
|
e6c38fe |
+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */
|
|
|
e6c38fe |
+ cupsd_timeoutfunc_t cb, /* I - Callback function */
|
|
|
e6c38fe |
+ void *data) /* I - User data */
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ cupsd_timeout_t *timeout;
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ timeout = malloc (sizeof(cupsd_timeout_t));
|
|
|
e6c38fe |
+ if (timeout != NULL)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ timeout->enabled = (tv != NULL);
|
|
|
e6c38fe |
+ if (tv)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ timeout->when.tv_sec = tv->tv_sec;
|
|
|
e6c38fe |
+ timeout->when.tv_usec = tv->tv_usec;
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ timeout->callback = cb;
|
|
|
e6c38fe |
+ timeout->data = data;
|
|
|
e6c38fe |
+ cupsArrayAdd (Timeouts, timeout);
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ return timeout;
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+cupsd_timeout_t * /* O - Next enabled timeout or NULL */
|
|
|
e6c38fe |
+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
|
|
|
e6c38fe |
+ struct timeval curtime;
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ if (first && !first->enabled)
|
|
|
e6c38fe |
+ first = NULL;
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ if (first && delay)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ gettimeofday (&curtime, NULL);
|
|
|
e6c38fe |
+ if (avahi_timeval_compare (&curtime, &first->when) > 0)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ *delay = 0;
|
|
|
e6c38fe |
+ } else {
|
|
|
e6c38fe |
+ *delay = 1 + first->when.tv_sec - curtime.tv_sec;
|
|
|
e6c38fe |
+ if (first->when.tv_usec < curtime.tv_usec)
|
|
|
e6c38fe |
+ (*delay)--;
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+ return (first);
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'cupsdRunTimeout()' - Run a timed callback.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+void
|
|
|
e6c38fe |
+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ if (!timeout)
|
|
|
e6c38fe |
+ return;
|
|
|
e6c38fe |
+ timeout->enabled = 0;
|
|
|
e6c38fe |
+ if (!timeout->callback)
|
|
|
e6c38fe |
+ return;
|
|
|
e6c38fe |
+ timeout->callback (timeout, timeout->data);
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+void
|
|
|
e6c38fe |
+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */
|
|
|
e6c38fe |
+ const struct timeval *tv) /* I - Absolute time or NULL */
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ cupsArrayRemove (Timeouts, timeout);
|
|
|
e6c38fe |
+ timeout->enabled = (tv != NULL);
|
|
|
e6c38fe |
+ if (tv)
|
|
|
e6c38fe |
+ {
|
|
|
e6c38fe |
+ timeout->when.tv_sec = tv->tv_sec;
|
|
|
e6c38fe |
+ timeout->when.tv_usec = tv->tv_usec;
|
|
|
e6c38fe |
+ }
|
|
|
e6c38fe |
+ cupsArrayAdd (Timeouts, timeout);
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
|
|
|
e6c38fe |
+ */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+void
|
|
|
e6c38fe |
+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
|
|
|
e6c38fe |
+{
|
|
|
e6c38fe |
+ cupsArrayRemove (Timeouts, timeout);
|
|
|
e6c38fe |
+ free (timeout);
|
|
|
e6c38fe |
+}
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+#endif /* HAVE_AVAHI ... from top of file */
|
|
|
e6c38fe |
+
|
|
|
e6c38fe |
+/*
|
|
|
e6c38fe |
+ * End of "$Id$".
|
|
|
e6c38fe |
+ */
|