/*
- * "$Id: main.c 5042 2006-02-01 18:17:34Z mike $"
+ * "$Id$"
*
- * Scheduler main loop for the Common UNIX Printing System (CUPS).
+ * Main loop for the CUPS scheduler.
*
- * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2012 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
- * main() - Main entry for the CUPS scheduler.
- * cupsdClosePipe() - Close a pipe as necessary.
- * cupsdOpenPipe() - Create a pipe which is closed on exec.
- * cupsdCatchChildSignals() - Catch SIGCHLD signals...
- * cupsdHoldSignals() - Hold child and termination signals.
- * cupsdIgnoreChildSignals() - Ignore SIGCHLD signals...
- * cupsdReleaseSignals() - Release signals for delivery.
- * cupsdSetString() - Set a string value.
- * cupsdSetStringf() - Set a formatted string value.
- * launchd_checkin() - Check-in with launchd and collect the
- * listening fds.
- * launchd_reload() - Tell launchd to reload the configuration
- * file to pick up the new listening directives.
- * launchd_sync_conf() - Re-write the launchd(8) config file
- * com.easysw.cupsd.plist based on cupsd.conf.
- * parent_handler() - Catch USR1/CHLD signals...
- * process_children() - Process all dead children...
- * sigchld_handler() - Handle 'child' signals from old processes.
- * sighup_handler() - Handle 'hangup' signals to reconfigure the
- * scheduler.
- * sigterm_handler() - Handle 'terminate' signals that stop the
- * scheduler.
- * select_timeout() - Calculate the select timeout value.
- * usage() - Show scheduler usage.
+ * main() - Main entry for the CUPS scheduler.
+ * cupsdAddString() - Copy and add a string to an array.
+ * cupsdCheckProcess() - Tell the main loop to check for dead children.
+ * cupsdClearString() - Clear a string.
+ * cupsdFreeStrings() - Free an array of strings.
+ * cupsdHoldSignals() - Hold child and termination signals.
+ * cupsdReleaseSignals() - Release signals for delivery.
+ * cupsdSetString() - Set a string value.
+ * cupsdSetStringf() - Set a formatted string value.
+ * launchd_checkin() - Check-in with launchd and collect the listening
+ * fds.
+ * launchd_checkout() - Update the launchd KeepAlive file as needed.
+ * parent_handler() - Catch USR1/CHLD signals...
+ * process_children() - Process all dead children...
+ * select_timeout() - Calculate the select timeout value.
+ * sigchld_handler() - Handle 'child' signals from old processes.
+ * sighup_handler() - Handle 'hangup' signals to reconfigure the
+ * scheduler.
+ * sigterm_handler() - Handle 'terminate' signals that stop the scheduler.
+ * usage() - Show scheduler usage.
*/
/*
#ifdef HAVE_LAUNCH_H
# include <launch.h>
# include <libgen.h>
+# define CUPS_KEEPALIVE CUPS_CACHEDIR "/org.cups.cupsd"
+ /* Name of the launchd KeepAlive file */
+# ifndef LAUNCH_JOBKEY_KEEPALIVE
+# define LAUNCH_JOBKEY_KEEPALIVE "KeepAlive"
+# endif /* !LAUNCH_JOBKEY_KEEPALIVE */
+# ifndef LAUNCH_JOBKEY_PATHSTATE
+# define LAUNCH_JOBKEY_PATHSTATE "PathState"
+# endif /* !LAUNCH_JOBKEY_PATHSTATE */
+# ifndef LAUNCH_JOBKEY_SERVICEIPC
+# define LAUNCH_JOBKEY_SERVICEIPC "ServiceIPC"
+# endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+
#ifdef HAVE_NOTIFY_H
# include <notify.h>
#endif /* HAVE_NOTIFY_H */
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif /* HAVE_SYS_PARAM_H */
+
/*
* Local functions...
*/
#ifdef HAVE_LAUNCHD
-static void launchd_checkin(void);
-static void launchd_reload(void);
-static int launchd_sync_conf(void);
+static void launchd_checkin(void);
+static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
-
-static void parent_handler(int sig);
-static void process_children(void);
-static void sigchld_handler(int sig);
-static void sighup_handler(int sig);
-static void sigterm_handler(int sig);
-static long select_timeout(int fds);
-static void usage(int status);
+static void parent_handler(int sig);
+static void process_children(void);
+static void sigchld_handler(int sig);
+static void sighup_handler(int sig);
+static void sigterm_handler(int sig);
+static long select_timeout(int fds);
+static void usage(int status) __attribute__((noreturn));
/*
* Local globals...
*/
-static int parent_signal = 0; /* Set to signal number from child */
-static int holdcount = 0; /* Number of times "hold" was called */
+static int parent_signal = 0;
+ /* Set to signal number from child */
+static int holdcount = 0; /* Number of times "hold" was called */
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-static sigset_t holdmask; /* Old POSIX signal mask */
+static sigset_t holdmask; /* Old POSIX signal mask */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-static int dead_children = 0; /* Dead children? */
-static int stop_scheduler = 0; /* Should the scheduler stop? */
+static int dead_children = 0;
+ /* Dead children? */
+static int stop_scheduler = 0;
+ /* Should the scheduler stop? */
/*
*/
int /* O - Exit status */
-main(int argc, /* I - Number of command-line arguments */
+main(int argc, /* I - Number of command-line args */
char *argv[]) /* I - Command-line arguments */
{
int i; /* Looping var */
char *opt; /* Option character */
int fg; /* Run in the foreground */
- int fds; /* Number of ready descriptors select returns */
- fd_set *input, /* Input set for select() */
- *output; /* Output set for select() */
+ int fds; /* Number of ready descriptors */
cupsd_client_t *con; /* Current client */
cupsd_job_t *job; /* Current job */
cupsd_listener_t *lis; /* Current listener */
time_t current_time, /* Current time */
activity, /* Client activity timer */
- browse_time, /* Next browse send time */
senddoc_time, /* Send-Document time */
- expire_time; /* Subscription expire time */
-#ifdef HAVE_MALLINFO
- time_t mallinfo_time; /* Malloc information time */
-#endif /* HAVE_MALLINFO */
- struct timeval timeout; /* select() timeout */
+ expire_time, /* Subscription expire time */
+ report_time, /* Malloc/client/job report time */
+ event_time; /* Last event notification time */
+ long timeout; /* Timeout for cupsdDoSelect() */
struct rlimit limit; /* Runtime limit */
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#ifdef __sgi
- cups_file_t *fp; /* Fake lpsched lock file */
- struct stat statbuf; /* Needed for checking lpsched FIFO */
-#endif /* __sgi */
+ int run_as_child = 0;
+ /* Needed for background fork/exec */
+#ifdef __APPLE__
+ int use_sysman = !getuid();
+ /* Use system management functions? */
+#else
+ time_t netif_time = 0; /* Time since last network update */
+#endif /* __APPLE__ */
#if HAVE_LAUNCHD
- int launchd, /* Started with the -l option? */
- launchd_idle_exit;
+ int launchd_idle_exit;
/* Idle exit on select timeout? */
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_GETEUID
+ /*
+ * Check for setuid invocation, which we do not support!
+ */
+
+ if (getuid() != geteuid())
+ {
+ fputs("cupsd: Cannot run as a setuid program\n", stderr);
+ return (1);
+ }
+#endif /* HAVE_GETEUID */
+
/*
* Check for command-line arguments...
*/
- fg = 0;
-#if HAVE_LAUNCHD
- launchd = 0;
+ fg = 0;
+
+#ifdef HAVE_LAUNCHD
+ if (getenv("CUPSD_LAUNCHD"))
+ {
+ Launchd = 1;
+ fg = 1;
+ }
#endif /* HAVE_LAUNCHD */
for (i = 1; i < argc; i ++)
for (opt = argv[i] + 1; *opt != '\0'; opt ++)
switch (*opt)
{
+ case 'C' : /* Run as child with config file */
+ run_as_child = 1;
+ fg = -1;
+
case 'c' : /* Configuration file */
i ++;
if (i >= argc)
{
_cupsLangPuts(stderr, _("cupsd: Expected config filename "
- "after \"-c\" option!\n"));
+ "after \"-c\" option."));
usage(1);
}
char *current; /* Current directory */
-
/*
* Allocate a buffer for the current working directory to
* reduce run-time stack usage; this approximates the
* are passed a NULL pointer.
*/
- current = malloc(1024);
- getcwd(current, 1024);
+ if ((current = malloc(1024)) == NULL)
+ {
+ _cupsLangPuts(stderr,
+ _("cupsd: Unable to get current directory."));
+ return (1);
+ }
+
+ if (!getcwd(current, 1024))
+ {
+ _cupsLangPuts(stderr,
+ _("cupsd: Unable to get current directory."));
+ free(current);
+ return (1);
+ }
cupsdSetStringf(&ConfigurationFile, "%s/%s", current, argv[i]);
-
free(current);
}
break;
fg = 1;
break;
- case 'F' : /* Run in foreground, but still disconnect from terminal... */
+ case 'F' : /* Run in foreground, but disconnect from terminal... */
fg = -1;
break;
case 'l' : /* Started by launchd... */
#ifdef HAVE_LAUNCHD
- launchd = 1;
+ Launchd = 1;
fg = 1;
#else
_cupsLangPuts(stderr, _("cupsd: launchd(8) support not compiled "
- "in, running in normal mode.\n"));
+ "in, running in normal mode."));
fg = 0;
#endif /* HAVE_LAUNCHD */
break;
+ case 'p' : /* Stop immediately for profiling */
+ fputs("cupsd: -p (startup profiling) is for internal testing "
+ "use only!\n", stderr);
+ stop_scheduler = 1;
+ fg = 1;
+ break;
+
+ case 'P' : /* Disable security profiles */
+ fputs("cupsd: -P (disable security profiles) is for internal "
+ "testing use only!\n", stderr);
+ UseProfiles = 0;
+ break;
+
+ case 's' : /* Set cups-files.conf location */
+ i ++;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("cupsd: Expected cups-files.conf "
+ "filename after \"-s\" option."));
+ usage(1);
+ }
+
+ if (argv[i][0] != '/')
+ {
+ /*
+ * Relative filename not allowed...
+ */
+
+ _cupsLangPuts(stderr, _("cupsd: Relative cups-files.conf "
+ "filename not allowed."));
+ usage(1);
+ }
+
+ cupsdSetString(&CupsFilesFile, argv[i]);
+ break;
+
+#ifdef __APPLE__
+ case 'S' : /* Disable system management functions */
+ fputs("cupsd: -S (disable system management) for internal "
+ "testing use only!\n", stderr);
+ use_sysman = 0;
+ break;
+#endif /* __APPLE__ */
+
+ case 't' : /* Test the cupsd.conf file... */
+ TestConfigFile = 1;
+ fg = 1;
+ break;
+
default : /* Unknown option */
_cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
- "aborting!\n"), *opt);
+ "aborting."), *opt);
usage(1);
break;
}
else
{
- _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"),
+ _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting."),
argv[i]);
usage(1);
}
if (!ConfigurationFile)
cupsdSetString(&ConfigurationFile, CUPS_SERVERROOT "/cupsd.conf");
+ if (!CupsFilesFile)
+ {
+ char *filename, /* Copy of cupsd.conf filename */
+ *slash; /* Final slash in cupsd.conf filename */
+ size_t len; /* Size of buffer */
+
+ len = strlen(ConfigurationFile) + 15;
+ if ((filename = malloc(len)) == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("cupsd: Unable to get path to "
+ "cups-files.conf file."));
+ return (1);
+ }
+
+ strlcpy(filename, ConfigurationFile, len);
+ if ((slash = strrchr(filename, '/')) == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("cupsd: Unable to get path to "
+ "cups-files.conf file."));
+ return (1);
+ }
+
+ strlcpy(slash, "/cups-files.conf", len - (slash - filename));
+ cupsdSetString(&CupsFilesFile, filename);
+ free(filename);
+ }
+
/*
* If the user hasn't specified "-f", run in the background...
*/
}
else if (WIFEXITED(i))
{
- fprintf(stderr, "cupsd: Child exited with status %d!\n", WEXITSTATUS(i));
+ fprintf(stderr, "cupsd: Child exited with status %d\n",
+ WEXITSTATUS(i));
return (2);
}
else
{
- fprintf(stderr, "cupsd: Child exited on signal %d!\n", WTERMSIG(i));
+ fprintf(stderr, "cupsd: Child exited on signal %d\n", WTERMSIG(i));
return (3);
}
}
+
+#if defined(__OpenBSD__) && OpenBSD < 201211
+ /*
+ * Call _thread_sys_closefrom() so the child process doesn't reset the
+ * parent's file descriptors to be blocking. This is a workaround for a
+ * limitation of userland libpthread on older versions of OpenBSD.
+ */
+
+ _thread_sys_closefrom(0);
+#endif /* __OpenBSD__ && OpenBSD < 201211 */
+
+ /*
+ * Since CoreFoundation and DBUS both create fork-unsafe data on execution of
+ * a program, and since this kind of really unfriendly behavior seems to be
+ * more common these days in system libraries, we need to re-execute the
+ * background cupsd with the "-C" option to avoid problems. Unfortunately,
+ * we also have to assume that argv[0] contains the name of the cupsd
+ * executable - there is no portable way to get the real pathname...
+ */
+
+ execlp(argv[0], argv[0], "-C", ConfigurationFile, (char *)0);
+ exit(errno);
}
if (fg < 1)
getrlimit(RLIMIT_NOFILE, &limit);
- for (i = 0; i < limit.rlim_cur; i ++)
+ for (i = 0; i < limit.rlim_cur && i < 1024; i ++)
+ close(i);
+
+ /*
+ * Redirect stdin/out/err to /dev/null...
+ */
+
+ if ((i = open("/dev/null", O_RDONLY)) != 0)
+ {
+ dup2(i, 0);
+ close(i);
+ }
+
+ if ((i = open("/dev/null", O_WRONLY)) != 1)
+ {
+ dup2(i, 1);
+ close(i);
+ }
+
+ if ((i = open("/dev/null", O_WRONLY)) != 2)
+ {
+ dup2(i, 2);
close(i);
+ }
#endif /* DEBUG */
}
getrlimit(RLIMIT_NOFILE, &limit);
- if (limit.rlim_max > CUPS_MAX_FDS)
- MaxFDs = CUPS_MAX_FDS;
+#if !defined(HAVE_POLL) && !defined(HAVE_EPOLL) && !defined(HAVE_KQUEUE)
+ if (limit.rlim_max > FD_SETSIZE)
+ MaxFDs = FD_SETSIZE;
else
+#endif /* !HAVE_POLL && !HAVE_EPOLL && !HAVE_KQUEUE */
+#ifdef RLIM_INFINITY
+ if (limit.rlim_max == RLIM_INFINITY)
+ MaxFDs = 16384;
+ else
+#endif /* RLIM_INFINITY */
MaxFDs = limit.rlim_max;
limit.rlim_cur = MaxFDs;
setrlimit(RLIMIT_NOFILE, &limit);
+ cupsdStartSelect();
+
/*
- * Allocate memory for the input and output sets...
+ * Read configuration...
*/
- SetSize = (MaxFDs + 31) / 8 + 4;
- if (SetSize < sizeof(fd_set))
- SetSize = sizeof(fd_set);
-
- InputSet = (fd_set *)calloc(1, SetSize);
- OutputSet = (fd_set *)calloc(1, SetSize);
- input = (fd_set *)calloc(1, SetSize);
- output = (fd_set *)calloc(1, SetSize);
-
- if (InputSet == NULL || OutputSet == NULL || input == NULL || output == NULL)
- {
- syslog(LOG_LPR, "Unable to allocate memory for select() sets - exiting!");
+ if (!cupsdReadConfiguration())
return (1);
+ else if (TestConfigFile)
+ {
+ printf("\"%s\" is OK.\n", CupsFilesFile);
+ printf("\"%s\" is OK.\n", ConfigurationFile);
+ return (0);
}
/*
- * Read configuration...
+ * Clean out old temp files and printer cache data.
*/
- if (!cupsdReadConfiguration())
- {
- syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
- ConfigurationFile);
- return (1);
- }
+ if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
+ cupsdCleanFiles(TempDir, NULL);
+
+ cupsdCleanFiles(CacheDir, "*.ipp");
#if HAVE_LAUNCHD
- if (launchd)
+ if (Launchd)
{
/*
- * If we were started by launchd make sure the cupsd plist file contains the
- * same listeners as cupsd.conf; If it didn't then reload it before getting
- * the list of listening file descriptors...
+ * If we were started by launchd get the listen sockets file descriptors...
*/
- if (launchd_sync_conf())
- {
- launchd_reload();
-
- /*
- * Until rdar://3854821 is fixed we have to exit after the reload...
- */
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "Exiting on launchd_reload");
- exit(0);
- }
-
launchd_checkin();
+ launchd_checkout();
}
#endif /* HAVE_LAUNCHD */
* Startup the server...
*/
+ httpInitialize();
+
cupsdStartServer();
/*
*/
#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- if (RunAsUser)
- sigset(SIGHUP, sigterm_handler);
- else
- sigset(SIGHUP, sighup_handler);
-
+ sigset(SIGCHLD, sigchld_handler);
+ sigset(SIGHUP, sighup_handler);
sigset(SIGPIPE, SIG_IGN);
sigset(SIGTERM, sigterm_handler);
#elif defined(HAVE_SIGACTION)
memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask);
- sigaddset(&action.sa_mask, SIGHUP);
-
- if (RunAsUser)
- action.sa_handler = sigterm_handler;
- else
- action.sa_handler = sighup_handler;
+ sigaddset(&action.sa_mask, SIGTERM);
+ sigaddset(&action.sa_mask, SIGCHLD);
+ action.sa_handler = sigchld_handler;
+ sigaction(SIGCHLD, &action, NULL);
+ sigemptyset(&action.sa_mask);
+ sigaddset(&action.sa_mask, SIGHUP);
+ action.sa_handler = sighup_handler;
sigaction(SIGHUP, &action, NULL);
sigemptyset(&action.sa_mask);
action.sa_handler = sigterm_handler;
sigaction(SIGTERM, &action, NULL);
#else
- if (RunAsUser)
- signal(SIGHUP, sigterm_handler);
- else
- signal(SIGHUP, sighup_handler);
-
+ signal(SIGCLD, sigchld_handler); /* No, SIGCLD isn't a typo... */
+ signal(SIGHUP, sighup_handler);
signal(SIGPIPE, SIG_IGN);
signal(SIGTERM, sigterm_handler);
#endif /* HAVE_SIGSET */
-#ifdef __sgi
- /*
- * Try to create a fake lpsched lock file if one is not already there.
- * Some Adobe applications need it under IRIX in order to enable
- * printing...
- */
-
- if ((fp = cupsFileOpen("/var/spool/lp/SCHEDLOCK", "w")) == NULL)
- {
- syslog(LOG_LPR, "Unable to create fake lpsched lock file "
- "\"/var/spool/lp/SCHEDLOCK\"\' - %s!",
- strerror(errno));
- }
- else
- {
- fchmod(cupsFileNumber(fp), 0644);
- fchown(cupsFileNumber(fp), User, Group);
-
- cupsFileClose(fp);
- }
-#endif /* __sgi */
-
/*
* Initialize authentication certificates...
*/
* we are up and running...
*/
- if (!fg)
+ if (!fg || run_as_child)
{
/*
* Send a signal to the parent process, but only if the parent is
kill(i, SIGUSR1);
}
+#ifdef __APPLE__
/*
* Start power management framework...
*/
- cupsdStartSystemMonitor();
-
- /*
- * If the administrator has configured the server to run as an unpriviledged
- * user, change to that user now...
- */
-
- if (RunAsUser)
- {
- setgid(Group);
- setgroups(1, &Group);
- setuid(User);
- }
+ if (use_sysman)
+ cupsdStartSystemMonitor();
+#endif /* __APPLE__ */
/*
- * Catch signals...
+ * Send server-started event...
*/
- cupsdCatchChildSignals();
+#ifdef HAVE_LAUNCHD
+ if (Launchd)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+ "Scheduler started via launchd.");
+ else
+#endif /* HAVE_LAUNCHD */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+ "Scheduler started in foreground.");
+ else
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+ "Scheduler started in background.");
/*
* Start any pending print jobs...
* Loop forever...
*/
-#ifdef HAVE_MALLINFO
- mallinfo_time = 0;
-#endif /* HAVE_MALLINFO */
- browse_time = time(NULL);
- senddoc_time = time(NULL);
- expire_time = time(NULL);
+ current_time = time(NULL);
+ event_time = current_time;
+ expire_time = current_time;
fds = 1;
+ report_time = 0;
+ senddoc_time = current_time;
while (!stop_scheduler)
{
-#ifdef DEBUG
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "main: Top of loop, dead_children=%d, NeedReload=%d",
- dead_children, NeedReload);
-#endif /* DEBUG */
-
/*
* Check if there are dead children to handle...
*/
* Close any idle clients...
*/
- if (NumClients > 0)
+ if (cupsArrayCount(Clients) > 0)
{
- for (i = NumClients, con = Clients; i > 0; i --, con ++)
+ for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+ con;
+ con = (cupsd_client_t *)cupsArrayNext(Clients))
if (con->http.state == HTTP_WAITING)
- {
cupsdCloseClient(con);
- con --;
- }
else
con->http.keep_alive = HTTP_KEEPALIVE_OFF;
cupsdPauseListening();
}
- /*
- * Check for any active jobs...
- */
-
- for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
- job;
- job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
- if (job->state->values[0].integer == IPP_JOB_PROCESSING)
- break;
-
/*
* Restart if all clients are closed and all jobs finished, or
* if the reload timeout has elapsed...
*/
- if ((NumClients == 0 && (!job || NeedReload != RELOAD_ALL)) ||
+ if ((cupsArrayCount(Clients) == 0 &&
+ (cupsArrayCount(PrintingJobs) == 0 || NeedReload != RELOAD_ALL)) ||
(time(NULL) - ReloadTime) >= ReloadTimeout)
{
/*
* Shutdown the server...
*/
+ DoingShutdown = 1;
+
cupsdStopServer();
/*
}
#if HAVE_LAUNCHD
- if (launchd)
+ if (Launchd)
{
- if (launchd_sync_conf())
- {
- launchd_reload();
-
- /*
- * Until rdar://3854821 is fixed we have to exit after the reload...
- */
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "Exiting on launchd_reload");
- stop_scheduler = 1;
- break;
- }
+ /*
+ * If we were started by launchd, get the listen socket file
+ * descriptors...
+ */
launchd_checkin();
+ launchd_checkout();
}
#endif /* HAVE_LAUNCHD */
* Startup the server...
*/
+ DoingShutdown = 0;
+
cupsdStartServer();
+
+ /*
+ * Send a server-restarted event...
+ */
+
+ cupsdAddEvent(CUPSD_EVENT_SERVER_RESTARTED, NULL, NULL,
+ "Scheduler restarted.");
}
}
/*
- * Check for available input or ready output. If select() returns
- * 0 or -1, something bad happened and we should exit immediately.
+ * Check for available input or ready output. If cupsdDoSelect()
+ * returns 0 or -1, something bad happened and we should exit
+ * immediately.
*
* Note that we at least have one listening socket open at all
* times.
*/
- memcpy(input, InputSet, SetSize);
- memcpy(output, OutputSet, SetSize);
-
- timeout.tv_sec = select_timeout(fds);
- timeout.tv_usec = 0;
+ if ((timeout = select_timeout(fds)) > 1 && LastEvent)
+ timeout = 1;
#if HAVE_LAUNCHD
/*
* If no other work is scheduled and we're being controlled by
- * launchd(8) then timeout after 'LaunchdTimeout' seconds of
+ * launchd then timeout after 'LaunchdTimeout' seconds of
* inactivity...
*/
- if (timeout.tv_sec == 86400 && launchd && LaunchdTimeout &&
- (!Browsing || !(BrowseLocalProtocols & BROWSE_DNSSD) ||
- cupsArrayCount(Printers) == 0))
+ if (timeout == 86400 && Launchd && LaunchdTimeout &&
+ !cupsArrayCount(ActiveJobs) &&
+ (!Browsing || !BrowseLocalProtocols || !cupsArrayCount(Printers)))
{
- timeout.tv_sec = LaunchdTimeout;
+ timeout = LaunchdTimeout;
launchd_idle_exit = 1;
}
else
launchd_idle_exit = 0;
#endif /* HAVE_LAUNCHD */
- if (timeout.tv_sec < 86400) /* Only use timeout for < 1 day */
- fds = select(MaxFDs, input, output, NULL, &timeout);
- else
- fds = select(MaxFDs, input, output, NULL, NULL);
-
- if (fds < 0)
+ if ((fds = cupsdDoSelect(timeout)) < 0)
{
- char s[16384], /* String buffer */
- *sptr; /* Pointer into buffer */
- int slen; /* Length of string buffer */
-
-
/*
* Got an error from select!
*/
- if (errno == EINTR) /* Just interrupted by a signal */
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ cupsd_printer_t *p; /* Current printer */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+
+ if (errno == EINTR) /* Just interrupted by a signal */
continue;
/*
* Log all sorts of debug info to help track down the problem.
*/
- cupsdLogMessage(CUPSD_LOG_EMERG, "select() failed - %s!",
+ cupsdLogMessage(CUPSD_LOG_EMERG, "cupsdDoSelect() failed - %s!",
strerror(errno));
- strcpy(s, "InputSet =");
- slen = 10;
- sptr = s + 10;
-
- for (i = 0; i < MaxFDs; i ++)
- if (FD_ISSET(i, InputSet))
- {
- snprintf(sptr, sizeof(s) - slen, " %d", i);
- slen += strlen(sptr);
- sptr += strlen(sptr);
- }
-
- cupsdLogMessage(CUPSD_LOG_EMERG, s);
-
- strcpy(s, "OutputSet =");
- slen = 11;
- sptr = s + 11;
-
- for (i = 0; i < MaxFDs; i ++)
- if (FD_ISSET(i, OutputSet))
- {
- snprintf(sptr, sizeof(s) - slen, " %d", i);
- slen += strlen(sptr);
- sptr += strlen(sptr);
- }
-
- cupsdLogMessage(CUPSD_LOG_EMERG, s);
-
- for (i = 0, con = Clients; i < NumClients; i ++, con ++)
+ for (i = 0, con = (cupsd_client_t *)cupsArrayFirst(Clients);
+ con;
+ i ++, con = (cupsd_client_t *)cupsArrayNext(Clients))
cupsdLogMessage(CUPSD_LOG_EMERG,
"Clients[%d] = %d, file = %d, state = %d",
i, con->http.fd, con->file, con->http.state);
- for (i = 0, lis = Listeners; i < NumListeners; i ++, lis ++)
+ for (i = 0, lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+ lis;
+ i ++, lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
cupsdLogMessage(CUPSD_LOG_EMERG, "Listeners[%d] = %d", i, lis->fd);
- cupsdLogMessage(CUPSD_LOG_EMERG, "BrowseSocket = %d", BrowseSocket);
-
cupsdLogMessage(CUPSD_LOG_EMERG, "CGIPipes[0] = %d", CGIPipes[0]);
#ifdef __APPLE__
job->status_buffer ? job->status_buffer->fd : -1,
job->print_pipes[0], job->print_pipes[1],
job->back_pipes[0], job->back_pipes[1]);
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+ p;
+ p = (cupsd_printer_t *)cupsArrayNext(Printers))
+ cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
+ p->reg_name ? p->reg_name : "(null)");
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
break;
}
current_time = time(NULL);
-#if HAVE_LAUNCHD
/*
- * If no other work was scheduled and we're being controlled by launchd(8)
- * then timeout after 'LaunchdTimeout' seconds of inactivity...
+ * Write dirty config/state files...
*/
- if (!fds && launchd_idle_exit)
- {
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Printer sharing is off and there are no jobs pending, "
- "will restart on demand.");
- stop_scheduler = 1;
- break;
- }
-#endif /* HAVE_LAUNCHD */
+ if (DirtyCleanTime && current_time >= DirtyCleanTime)
+ cupsdCleanDirty();
+#ifdef __APPLE__
/*
- * Check for status info from job filters...
+ * If we are going to sleep and still have pending jobs, stop them after
+ * a period of time...
*/
- for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
- job;
- job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
- if (job->status_buffer && FD_ISSET(job->status_buffer->fd, input))
- {
- /*
- * Clear the input bit to avoid updating the next job
- * using the same status pipe file descriptor...
- */
-
- FD_CLR(job->status_buffer->fd, input);
-
- /*
- * Read any status messages from the filters...
- */
-
- cupsdUpdateJob(job);
- }
+ if (SleepJobs > 0 && current_time >= SleepJobs &&
+ cupsArrayCount(PrintingJobs) > 0)
+ {
+ SleepJobs = 0;
+ cupsdStopAllJobs(CUPSD_JOB_DEFAULT, 5);
+ }
+#endif /* __APPLE__ */
+#ifndef __APPLE__
/*
- * Update CGI messages as needed...
+ * Update the network interfaces once a minute...
*/
- if (CGIPipes[0] >= 0 && FD_ISSET(CGIPipes[0], input))
- cupsdUpdateCGI();
+ if ((current_time - netif_time) >= 60)
+ {
+ netif_time = current_time;
+ NetIFUpdate = 1;
+ }
+#endif /* !__APPLE__ */
+#if HAVE_LAUNCHD
/*
- * Handle system management events as needed...
+ * If no other work was scheduled and we're being controlled by launchd
+ * then timeout after 'LaunchdTimeout' seconds of inactivity...
*/
-#ifdef __APPLE__
- if (SysEventPipes[0] >= 0 && FD_ISSET(SysEventPipes[0], input))
- cupsdUpdateSystemMonitor();
-#endif /* __APPLE__ */
+ if (!fds && launchd_idle_exit)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Printer sharing is off and there are no jobs pending, "
+ "will restart on demand.");
+ stop_scheduler = 1;
+ break;
+ }
+#endif /* HAVE_LAUNCHD */
/*
- * Update notifier messages as needed...
+ * Resume listening for new connections as needed...
*/
- if (NotifierPipes[0] >= 0 && FD_ISSET(NotifierPipes[0], input))
- cupsdUpdateNotifierStatus();
+ if (ListeningPaused && ListeningPaused <= current_time &&
+ cupsArrayCount(Clients) < MaxClients)
+ cupsdResumeListening();
/*
- * Expire subscriptions as needed...
+ * Expire subscriptions and unload completed jobs as needed...
*/
- if (cupsArrayCount(Subscriptions) > 0 && current_time > expire_time)
+ if (current_time > expire_time)
{
- cupsdExpireSubscriptions(NULL, NULL);
+ if (cupsArrayCount(Subscriptions) > 0)
+ cupsdExpireSubscriptions(NULL, NULL);
+
+ cupsdUnloadCompletedJobs();
expire_time = current_time;
}
+#ifndef HAVE_AUTHORIZATION_H
/*
- * Update the browse list as needed...
+ * Update the root certificate once every 5 minutes if we have client
+ * connections...
*/
- if (Browsing && BrowseRemoteProtocols)
+ if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
+ !RunUser && cupsArrayCount(Clients))
{
- if (BrowseSocket >= 0 && FD_ISSET(BrowseSocket, input))
- cupsdUpdateCUPSBrowse();
-
- if (PollPipe >= 0 && FD_ISSET(PollPipe, input))
- cupsdUpdatePolling();
-
-#ifdef HAVE_LIBSLP
- if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
- BrowseSLPRefresh <= current_time)
- cupsdUpdateSLPBrowse();
-#endif /* HAVE_LIBSLP */
- }
+ /*
+ * Update the root certificate...
+ */
- if (Browsing && BrowseLocalProtocols && current_time > browse_time)
- {
- cupsdSendBrowseList();
- browse_time = current_time;
+ cupsdDeleteCert(0);
+ cupsdAddCert(0, "root", cupsdDefaultAuthType());
}
-
- /*
- * Check for new connections on the "listen" sockets...
- */
-
- for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
- if (lis->fd >= 0 && FD_ISSET(lis->fd, input))
- {
- FD_CLR(lis->fd, input);
- cupsdAcceptClient(lis);
- }
+#endif /* !HAVE_AUTHORIZATION_H */
/*
* Check for new data on the client sockets...
*/
- for (i = NumClients, con = Clients; i > 0; i --, con ++)
+ for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+ con;
+ con = (cupsd_client_t *)cupsArrayNext(Clients))
{
/*
- * Process the input buffer...
+ * Process pending data in the input buffer...
*/
- if (FD_ISSET(con->http.fd, input) || con->http.used)
+ if (con->http.used)
{
- FD_CLR(con->http.fd, input);
-
- if (!cupsdReadClient(con))
- {
- if (con->pipe_pid)
- FD_CLR(con->file, input);
-
- con --;
- continue;
- }
+ cupsdReadClient(con);
+ continue;
}
/*
- * Write data as needed...
- */
-
- if (con->pipe_pid && FD_ISSET(con->file, input))
- {
- /*
- * Keep track of pending input from the file/pipe separately
- * so that we don't needlessly spin on select() when the web
- * client is not ready to receive data...
- */
-
- FD_CLR(con->file, input);
- con->file_ready = 1;
-
-#ifdef DEBUG
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "main: Data ready file %d!",
- con->file);
-#endif /* DEBUG */
-
- if (!FD_ISSET(con->http.fd, output))
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "main: Removing fd %d from InputSet...", con->file);
- FD_CLR(con->file, input);
- FD_CLR(con->file, InputSet);
- }
- }
-
- if (FD_ISSET(con->http.fd, output))
- {
- FD_CLR(con->http.fd, output);
-
- if (!con->pipe_pid || con->file_ready)
- if (!cupsdWriteClient(con))
- {
- con --;
- continue;
- }
- }
-
- /*
- * Check the activity and close old clients...
+ * Check the activity and close old clients...
*/
activity = current_time - Timeout;
con->http.fd, Timeout);
cupsdCloseClient(con);
- con --;
continue;
}
}
senddoc_time = current_time;
}
-#ifdef HAVE_MALLINFO
/*
- * Log memory usage every minute...
+ * Clean job history...
+ */
+
+ if (JobHistoryUpdate && current_time >= JobHistoryUpdate)
+ cupsdCleanJobs();
+
+ /*
+ * Log statistics at most once a minute when in debug mode...
*/
- if ((current_time - mallinfo_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG)
+ if ((current_time - report_time) >= 60 && LogLevel >= CUPSD_LOG_DEBUG)
{
- struct mallinfo mem; /* Malloc information */
+ size_t string_count, /* String count */
+ alloc_bytes, /* Allocated string bytes */
+ total_bytes; /* Total string bytes */
+#ifdef HAVE_MALLINFO
+ struct mallinfo mem; /* Malloc information */
mem = mallinfo();
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "mallinfo: arena = %d, used = %d, free = %d\n",
- mem.arena, mem.usmblks + mem.uordblks,
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-arena=%lu", mem.arena);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-used=%lu",
+ mem.usmblks + mem.uordblks);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: malloc-free=%lu",
mem.fsmblks + mem.fordblks);
- mallinfo_time = current_time;
- }
#endif /* HAVE_MALLINFO */
- /*
- * Update the root certificate once every 5 minutes...
- */
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: clients=%d",
+ cupsArrayCount(Clients));
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs=%d",
+ cupsArrayCount(Jobs));
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: jobs-active=%d",
+ cupsArrayCount(ActiveJobs));
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Report: printers=%d",
+ cupsArrayCount(Printers));
- if ((current_time - RootCertTime) >= RootCertDuration && RootCertDuration &&
- !RunUser)
- {
- /*
- * Update the root certificate...
- */
+ string_count = _cupsStrStatistics(&alloc_bytes, &total_bytes);
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Report: stringpool-string-count=" CUPS_LLFMT,
+ CUPS_LLCAST string_count);
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Report: stringpool-alloc-bytes=" CUPS_LLFMT,
+ CUPS_LLCAST alloc_bytes);
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Report: stringpool-total-bytes=" CUPS_LLFMT,
+ CUPS_LLCAST total_bytes);
- cupsdDeleteCert(0);
- cupsdAddCert(0, "root");
+ report_time = current_time;
}
/*
* accumulated. Don't send these more than once a second...
*/
- if (LastEvent && (time(NULL) - LastEventTime) > 1)
+ if (LastEvent && (current_time - event_time) >= 1)
{
#ifdef HAVE_NOTIFY_POST
- if (LastEvent & CUPSD_EVENT_PRINTER_CHANGED)
+ if (LastEvent & (CUPSD_EVENT_PRINTER_ADDED |
+ CUPSD_EVENT_PRINTER_DELETED |
+ CUPSD_EVENT_PRINTER_MODIFIED))
{
cupsdLogMessage(CUPSD_LOG_DEBUG2,
"notify_post(\"com.apple.printerListChange\")");
#endif /* HAVE_NOTIFY_POST */
/*
- * Reset the accumulated events and notification time...
+ * Reset the accumulated events...
*/
- LastEventTime = time(NULL);
- LastEvent = CUPSD_EVENT_NONE;
+ LastEvent = CUPSD_EVENT_NONE;
+ event_time = current_time;
}
}
*/
if (stop_scheduler)
+ {
cupsdLogMessage(CUPSD_LOG_INFO, "Scheduler shutting down normally.");
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STOPPED, NULL, NULL,
+ "Scheduler shutting down normally.");
+ }
else
+ {
cupsdLogMessage(CUPSD_LOG_ERROR,
"Scheduler shutting down due to program error.");
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STOPPED, NULL, NULL,
+ "Scheduler shutting down due to program error.");
+ }
/*
- * Close all network clients and stop all jobs...
+ * Close all network clients...
*/
- cupsdStopServer();
-
- cupsdStopAllJobs();
+ DoingShutdown = 1;
- cupsdStopSystemMonitor();
+ cupsdStopServer();
#ifdef HAVE_LAUNCHD
/*
- * Update the launchd config file as needed...
+ * Update the launchd KeepAlive file as needed...
*/
- launchd_sync_conf();
+ if (Launchd)
+ launchd_checkout();
#endif /* HAVE_LAUNCHD */
-#ifdef __sgi
/*
- * Remove the fake IRIX lpsched lock file, but only if the existing
- * file is not a FIFO which indicates that the real IRIX lpsched is
- * running...
+ * Stop all jobs...
*/
- if (!stat("/var/spool/lp/FIFO", &statbuf))
- if (!S_ISFIFO(statbuf.st_mode))
- unlink("/var/spool/lp/SCHEDLOCK");
-#endif /* __sgi */
+ cupsdFreeAllJobs();
+#ifdef __APPLE__
/*
- * Free memory used by FD sets and return...
+ * Stop monitoring system event monitoring...
*/
- free(InputSet);
- free(OutputSet);
- free(input);
- free(output);
+ if (use_sysman)
+ cupsdStopSystemMonitor();
+#endif /* __APPLE__ */
+
+ cupsdStopSelect();
return (!stop_scheduler);
}
/*
- * 'cupsdClosePipe()' - Close a pipe as necessary.
+ * 'cupsdAddString()' - Copy and add a string to an array.
*/
-void
-cupsdClosePipe(int *fds) /* I - Pipe file descriptors (2) */
+int /* O - 1 on success, 0 on failure */
+cupsdAddString(cups_array_t **a, /* IO - String array */
+ const char *s) /* I - String to copy and add */
{
- /*
- * Close file descriptors as needed...
- */
+ if (!*a)
+ *a = cupsArrayNew3((cups_array_func_t)strcmp, NULL,
+ (cups_ahash_func_t)NULL, 0,
+ (cups_acopy_func_t)_cupsStrAlloc,
+ (cups_afree_func_t)_cupsStrFree);
- if (fds[0] >= 0)
- {
- close(fds[0]);
- fds[0] = -1;
- }
-
- if (fds[1] >= 0)
- {
- close(fds[1]);
- fds[1] = -1;
- }
+ return (cupsArrayAdd(*a, (char *)s));
}
/*
- * 'cupsdOpenPipe()' - Create a pipe which is closed on exec.
+ * 'cupsdCheckProcess()' - Tell the main loop to check for dead children.
*/
-int /* O - 0 on success, -1 on error */
-cupsdOpenPipe(int *fds) /* O - Pipe file descriptors (2) */
+void
+cupsdCheckProcess(void)
{
/*
- * Create the pipe...
- */
-
- if (pipe(fds))
- return (-1);
-
- /*
- * Set the "close on exec" flag on each end of the pipe...
- */
-
- if (fcntl(fds[0], F_SETFD, fcntl(fds[0], F_GETFD) | FD_CLOEXEC))
- {
- close(fds[0]);
- close(fds[1]);
- return (-1);
- }
-
- if (fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC))
- {
- close(fds[0]);
- close(fds[1]);
- return (-1);
- }
-
- /*
- * Return 0 indicating success...
+ * Flag that we have dead children...
*/
- return (0);
+ dead_children = 1;
}
/*
- * 'cupsdCatchChildSignals()' - Catch SIGCHLD signals...
+ * 'cupsdClearString()' - Clear a string.
*/
void
-cupsdCatchChildSignals(void)
+cupsdClearString(char **s) /* O - String value */
{
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
- struct sigaction action; /* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- sigset(SIGCHLD, sigchld_handler);
-#elif defined(HAVE_SIGACTION)
- memset(&action, 0, sizeof(action));
-
- sigemptyset(&action.sa_mask);
- sigaddset(&action.sa_mask, SIGTERM);
- sigaddset(&action.sa_mask, SIGCHLD);
- action.sa_handler = sigchld_handler;
- sigaction(SIGCHLD, &action, NULL);
-#else
- signal(SIGCLD, sigchld_handler); /* No, SIGCLD isn't a typo... */
-#endif /* HAVE_SIGSET */
+ if (s && *s)
+ {
+ _cupsStrFree(*s);
+ *s = NULL;
+ }
}
/*
- * 'cupsdClearString()' - Clear a string.
+ * 'cupsdFreeStrings()' - Free an array of strings.
*/
void
-cupsdClearString(char **s) /* O - String value */
+cupsdFreeStrings(cups_array_t **a) /* IO - String array */
{
- if (s && *s)
+ if (*a)
{
- free(*s);
- *s = NULL;
+ cupsArrayDelete(*a);
+ *a = NULL;
}
}
}
-/*
- * 'cupsdIgnoreChildSignals()' - Ignore SIGCHLD signals...
- *
- * We don't really ignore them, we set the signal handler to SIG_DFL,
- * since some OS's rely on signals for the wait4() function to work.
- */
-
-void
-cupsdIgnoreChildSignals(void)
-{
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
- struct sigaction action; /* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- sigset(SIGCHLD, SIG_DFL);
-#elif defined(HAVE_SIGACTION)
- memset(&action, 0, sizeof(action));
-
- sigemptyset(&action.sa_mask);
- sigaddset(&action.sa_mask, SIGCHLD);
- action.sa_handler = SIG_DFL;
- sigaction(SIGCHLD, &action, NULL);
-#else
- signal(SIGCLD, SIG_DFL); /* No, SIGCLD isn't a typo... */
-#endif /* HAVE_SIGSET */
-}
-
-
/*
* 'cupsdReleaseSignals()' - Release signals for delivery.
*/
return;
if (*s)
- free(*s);
+ _cupsStrFree(*s);
if (v)
- *s = strdup(v);
+ *s = _cupsStrAlloc(v);
else
*s = NULL;
}
const char *f, /* I - Printf-style format string */
...) /* I - Additional args as needed */
{
- char v[4096]; /* Formatting string value */
+ char v[65536 + 64]; /* Formatting string value */
va_list ap; /* Argument pointer */
char *olds; /* Old string */
vsnprintf(v, sizeof(v), f, ap);
va_end(ap);
- *s = strdup(v);
+ *s = _cupsStrAlloc(v);
}
else
*s = NULL;
if (olds)
- free(olds);
+ _cupsStrFree(olds);
}
static void
launchd_checkin(void)
{
- int i, /* Looping var */
- portnum; /* Port number */
+ size_t i, /* Looping var */
+ count; /* Number of listeners */
launch_data_t ld_msg, /* Launch data message */
ld_resp, /* Launch data response */
ld_array, /* Launch data array */
ld_sockets, /* Launch data sockets dictionary */
- ld_runatload, /* Run-at-load setting */
tmp; /* Launch data */
cupsd_listener_t *lis; /* Listeners array */
http_addr_t addr; /* Address variable */
socklen_t addrlen; /* Length of address */
- bool runatload; /* Run-at-load setting value */
+ int fd; /* File descriptor */
+ char s[256]; /* String addresss */
cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: pid=%d", (int)getpid());
ld_msg = launch_data_new_string(LAUNCH_KEY_CHECKIN);
if ((ld_resp = launch_msg(ld_msg)) == NULL)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
+ cupsdLogMessage(CUPSD_LOG_ERROR,
"launchd_checkin: launch_msg(\"" LAUNCH_KEY_CHECKIN
"\") IPC failure");
exit(EXIT_FAILURE);
+ return; /* anti-compiler-warning */
}
-
+
if (launch_data_get_type(ld_resp) == LAUNCH_DATA_ERRNO)
{
errno = launch_data_get_errno(ld_resp);
cupsdLogMessage(CUPSD_LOG_ERROR, "launchd_checkin: Check-in failed: %s",
strerror(errno));
exit(EXIT_FAILURE);
+ return; /* anti-compiler-warning */
}
- /*
- * Get the "run-at-load" setting...
- */
-
- if ((ld_runatload = launch_data_dict_lookup(ld_resp,
- LAUNCH_JOBKEY_RUNATLOAD)) != NULL &&
- launch_data_get_type(ld_runatload) == LAUNCH_DATA_BOOL)
- runatload = launch_data_get_bool(ld_runatload);
- else
- {
- errno = launch_data_get_errno(ld_resp);
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "launchd_checkin: Unable to find Run-at-load setting: %s",
- strerror(errno));
- exit(EXIT_FAILURE);
- }
-
- cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: Run-at-load=%s",
- runatload ? "true" : "false");
-
/*
* Get the sockets dictionary...
*/
- if (!(ld_sockets = launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_SOCKETS)))
+ if ((ld_sockets = launch_data_dict_lookup(ld_resp, LAUNCH_JOBKEY_SOCKETS))
+ == NULL)
{
cupsdLogMessage(CUPSD_LOG_ERROR,
"launchd_checkin: No sockets found to answer requests on!");
exit(EXIT_FAILURE);
+ return; /* anti-compiler-warning */
}
-
+
/*
* Get the array of listener sockets...
*/
- if (!(ld_array = launch_data_dict_lookup(ld_sockets, "Listeners")))
+ if ((ld_array = launch_data_dict_lookup(ld_sockets, "Listeners")) == NULL)
{
cupsdLogMessage(CUPSD_LOG_ERROR,
"launchd_checkin: No sockets found to answer requests on!");
exit(EXIT_FAILURE);
+ return; /* anti-compiler-warning */
}
/*
if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
{
- /*
- * Free the listeners array built from cupsd.conf...
- */
-
- if (NumListeners > 0)
- free(Listeners);
-
- NumListeners = launch_data_array_get_count(ld_array);
- Listeners = calloc(NumListeners, sizeof(cupsd_listener_t));
-
- if (!Listeners)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "launchd_checkin: Unable to allocate new Listeners - %s.",
- strerror(errno));
- exit(EXIT_FAILURE);
- }
+ count = launch_data_array_get_count(ld_array);
- /*
- * Note: launchd wants us to access the array in ascending order,
- * thus "i" counts up and not down as we normally do elsewhere...
- */
-
- for (i = 0, lis = Listeners; i < NumListeners; i ++, lis ++)
+ for (i = 0; i < count; i ++)
{
/*
- * Copy the current address and log it...
+ * Get the launchd file descriptor and address...
*/
-
- tmp = launch_data_array_get_index(ld_array, i);
- lis->fd = launch_data_get_fd(tmp);
- addrlen = sizeof(lis->address);
- if (getsockname(lis->fd, (struct sockaddr *)&(lis->address), &addrlen))
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "launchd_checkin: Unable to get local address - %s",
- strerror(errno));
- }
-
-# ifdef HAVE_SSL
- portnum = 0;
-
-# ifdef AF_INET6
- if (addr.addr.sa_family == AF_INET6)
- portnum = ntohs(addr.ipv6.sin6_port);
- else
-# endif /* AF_INET6 */
-# ifdef AF_LOCAL
- if (addr.addr.sa_family == AF_LOCAL)
+ if ((tmp = launch_data_array_get_index(ld_array, i)) != NULL)
{
+ fd = launch_data_get_fd(tmp);
+ addrlen = sizeof(addr);
+
+ if (getsockname(fd, (struct sockaddr *)&addr, &addrlen))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "launchd_checkin: Unable to get local address - %s",
+ strerror(errno));
+ continue;
+ }
+
/*
- * Make sure the domain socket is accessible to all...
+ * Try to match the launchd socket address to one of the listeners...
*/
- fchmod(lis->fd, 0140777);
- }
- else
-# endif /* AF_LOCAL */
- if (addr.addr.sa_family == AF_INET)
- portnum = ntohs(addr.ipv4.sin_port);
+ for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
+ lis;
+ lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+ if (httpAddrEqual(&lis->address, &addr))
+ break;
- if (portnum == 443)
- lis->encryption = HTTP_ENCRYPT_ALWAYS;
-# endif /* HAVE_SSL */
- }
- }
+ /*
+ * Add a new listener If there's no match...
+ */
- /*
- * Collect the browse socket (if there is one)...
- */
+ if (lis)
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "launchd_checkin: Matched existing listener %s with fd %d...",
+ httpAddrString(&(lis->address), s, sizeof(s)), fd);
+ }
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "launchd_checkin: Adding new listener %s with fd %d...",
+ httpAddrString(&addr, s, sizeof(s)), fd);
- if ((ld_array = launch_data_dict_lookup(ld_sockets, "BrowseSockets")))
- {
- if (launch_data_get_type(ld_array) == LAUNCH_DATA_ARRAY)
- {
- tmp = launch_data_array_get_index(ld_array, 0);
+ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "launchd_checkin: Unable to allocate listener - "
+ "%s.", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
- if (launch_data_get_type(tmp) == LAUNCH_DATA_FD)
- {
- if (BrowseSocket != -1)
- close(BrowseSocket);
+ cupsArrayAdd(Listeners, lis);
+
+ memcpy(&lis->address, &addr, sizeof(lis->address));
+ }
- BrowseSocket = launch_data_get_fd(tmp);
+ lis->fd = fd;
+
+# ifdef HAVE_SSL
+ if (httpAddrPort(&(lis->address)) == 443)
+ lis->encryption = HTTP_ENCRYPT_ALWAYS;
+# endif /* HAVE_SSL */
}
- else
- cupsdLogMessage(CUPSD_LOG_WARN,
- "launchd_checkin: BrowseSocket not a fd!");
- }
- else
- cupsdLogMessage(CUPSD_LOG_WARN,
- "launchd_checkin: BrowseSockets is not an array!");
+ }
}
- else
- cupsdLogMessage(CUPSD_LOG_DEBUG, "launchd_checkin: No BrowseSockets");
launch_data_free(ld_msg);
launch_data_free(ld_resp);
/*
- * 'launchd_reload()' - Tell launchd to reload the configuration file to pick
- * up the new listening directives.
+ * 'launchd_checkout()' - Update the launchd KeepAlive file as needed.
*/
static void
-launchd_reload(void)
+launchd_checkout(void)
{
- int child_status; /* Exit status of child process */
- pid_t child_pid, /* Child PID */
- waitpid_status; /* Child process exit status */
- char *argv[4]; /* Argument strings */
-
-
- /*
- * The current launchd doesn't support a reload option (rdar://3854821).
- * Until this is fixed we need to reload the config file by execing launchctl
- * twice (to unload then load). NOTE: This will cause us to exit on SIGTERM
- * which will cancel all client & job activity.
- *
- * After this is fixed we'll be able to tell launchd to reload the file
- * and pick up the new listening descriptors without disrupting current
- * activity.
- */
-
- /*
- * Unloading the current configuration will cause launchd to send us a SIGTERM;
- * block it for now so we can get our work done...
- */
+ int fd; /* File descriptor */
- cupsdHoldSignals();
/*
- * Set up the unload arguments to launchctl...
+ * Create or remove the launchd KeepAlive file based on whether
+ * there are active jobs, polling, browsing for remote printers or
+ * shared printers to advertise...
*/
- argv[0] = "/bin/launchctl";
- argv[1] = "unload";
- argv[2] = LaunchdConf;
- argv[3] = NULL;
+ if (cupsArrayCount(ActiveJobs) ||
+ (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
+ {
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Creating launchd keepalive file \"" CUPS_KEEPALIVE
+ "\"...");
- if (cupsdStartProcess(argv[0], argv, NULL, -1, -1, -1, -1, 1, &child_pid) < 0)
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "launchd_reload: Unable to execute %s - %s", argv[0],
- strerror(errno));
+ if ((fd = open(CUPS_KEEPALIVE, O_RDONLY | O_CREAT | O_EXCL, S_IRUSR)) >= 0)
+ close(fd);
+ }
else
{
- do
- {
- waitpid_status = waitpid(child_pid, &child_status, 0);
- }
- while (waitpid_status == (pid_t)-1 && errno == EINTR);
-
- if (WIFSIGNALED(child_status))
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "launchd_reload: %s pid %d crashed on signal %d!",
- basename(argv[0]), child_pid, WTERMSIG(child_status));
- else
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "launchd_reload: %s pid %d stopped with status %d!",
- basename(argv[0]), child_pid, WEXITSTATUS(child_status));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Removing launchd keepalive file \"" CUPS_KEEPALIVE
+ "\"...");
- /*
- * Do it again with the load command...
- */
-
- argv[1] = "load";
+ unlink(CUPS_KEEPALIVE);
+ }
+}
+#endif /* HAVE_LAUNCHD */
- if (cupsdStartProcess(argv[0], argv, NULL, -1, -1, -1, -1, 1,
- &child_pid) < 0)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "launchd_reload: Unable to fork for %s - %s", argv[0],
- strerror(errno));
- }
- else
- {
- do
- {
- waitpid_status = waitpid(child_pid, &child_status, 0);
- } while (waitpid_status == (pid_t)-1 && errno == EINTR);
- if (WIFSIGNALED(child_status))
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "launchd_reload: %s pid %d crashed on signal %d!",
- basename(argv[0]), child_pid, WTERMSIG(child_status));
- else
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "launchd_reload: %s pid %d stopped with status %d",
- basename(argv[0]), child_pid,
- WEXITSTATUS(child_status));
- }
- }
+/*
+ * 'parent_handler()' - Catch USR1/CHLD signals...
+ */
+static void
+parent_handler(int sig) /* I - Signal */
+{
/*
- * Leave signals blocked since exit() will be called momentarily anyways...
+ * Store the signal we got from the OS and return...
*/
+
+ parent_signal = sig;
}
/*
- * 'launchd_sync_conf()' - Re-write the launchd(8) config file
- * org.cups.cupsd.plist based on cupsd.conf.
+ * 'process_children()' - Process all dead children...
*/
-static int /* O - 1 if the file was updated */
-launchd_sync_conf(void)
+static void
+process_children(void)
{
- int i, /* Looping var */
- portnum; /* Port number */
- CFMutableDictionaryRef cupsd_dict, /* com.easysw.cupsd.plist dictionary */
- sockets, /* Sockets dictionary */
- listener; /* Listener dictionary */
- CFDataRef resourceData; /* XML representation of the property list */
- CFMutableArrayRef array; /* Array */
- CFNumberRef socket_mode; /* Domain socket mode bits */
- CFStringRef socket_path; /* Domain socket path */
- CFTypeRef value; /* CF value */
- CFURLRef fileURL; /* File URL */
- SInt32 errorCode; /* Error code */
- cupsd_listener_t *lis; /* Current listening socket */
- struct servent *service; /* Services data base entry */
- char temp[1024]; /* Temporary buffer for value */
- struct stat cupsd_sb, /* File info for cupsd.conf */
- launchd_sb; /* File info for com.easysw.cupsd.plist */
+ int status; /* Exit status of child */
+ int pid, /* Process ID of child */
+ job_id; /* Job ID of child */
+ cupsd_job_t *job; /* Current job */
+ int i; /* Looping var */
+ char name[1024]; /* Process name */
+ const char *type; /* Type of program */
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "process_children()");
/*
- * If the launchd conf file modification time is newer than the cupsd.conf
- * time then there's nothing to do...
+ * Reset the dead_children flag...
*/
- if (!stat(ConfigurationFile, &cupsd_sb) &&
- !stat(LaunchdConf, &launchd_sb) &&
- launchd_sb.st_mtimespec.tv_sec >= cupsd_sb.st_mtimespec.tv_sec)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "launchd_sync_conf: Nothing to do, pid=%d.",
- (int)getpid());
- return (0);
- }
+ dead_children = 0;
/*
- * Time to write a new 'com.easysw.cupsd.plist' file.
- * Create the new dictionary and populate it with values...
+ * Collect the exit status of some children...
*/
- if ((cupsd_dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks)) != NULL)
+#ifdef HAVE_WAITPID
+ while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
+#elif defined(HAVE_WAIT3)
+ while ((pid = wait3(&status, WNOHANG, NULL)) > 0)
+#else
+ if ((pid = wait(&status)) > 0)
+#endif /* HAVE_WAITPID */
{
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_LABEL),
- CFSTR("org.cups.cupsd"));
- CFDictionaryAddValue(cupsd_dict, CFSTR("Enabled"), kCFBooleanTrue);
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_ONDEMAND),
- kCFBooleanTrue);
-
- if ((Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)) ||
- cupsArrayCount(ActiveJobs))
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_RUNATLOAD),
- kCFBooleanTrue);
- else
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_RUNATLOAD),
- kCFBooleanFalse);
-
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_SERVICEIPC),
- kCFBooleanTrue);
+ /*
+ * Collect the name of the process that finished...
+ */
- if ((array = CFArrayCreateMutable(kCFAllocatorDefault, 2,
- &kCFTypeArrayCallBacks)) != NULL)
- {
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_PROGRAMARGUMENTS),
- array);
- CFArrayAppendValue(array, CFSTR("/usr/sbin/cupsd"));
- CFArrayAppendValue(array, CFSTR("-l"));
- CFRelease(array);
- }
+ cupsdFinishProcess(pid, name, sizeof(name), &job_id);
/*
- * Add a sockets dictionary...
+ * Delete certificates for CGI processes...
*/
-
- if ((sockets = (CFMutableDictionaryRef)CFDictionaryCreateMutable(
- kCFAllocatorDefault, 0,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks)) != NULL)
- {
- CFDictionaryAddValue(cupsd_dict, CFSTR(LAUNCH_JOBKEY_SOCKETS), sockets);
- /*
- * Add a Listeners array to the sockets dictionary...
- */
-
- if ((array = CFArrayCreateMutable(kCFAllocatorDefault, 0,
- &kCFTypeArrayCallBacks)) != NULL)
- {
- CFDictionaryAddValue(sockets, CFSTR("Listeners"), array);
+ if (pid)
+ cupsdDeleteCert(pid);
- /*
- * For each listener add a dictionary to the listeners array...
- */
-
- for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
- {
- if ((listener = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks)) != NULL)
- {
- CFArrayAppendValue(array, listener);
+ /*
+ * Handle completed job filters...
+ */
-# ifdef AF_LOCAL
- if (lis->address.addr.sa_family == AF_LOCAL)
- {
- if ((socket_path = CFStringCreateWithCString(kCFAllocatorDefault,
- lis->address.un.sun_path,
- kCFStringEncodingUTF8)))
- {
- CFDictionaryAddValue(listener,
- CFSTR(LAUNCH_JOBSOCKETKEY_PATHNAME),
- socket_path);
- CFRelease(socket_path);
- }
- portnum = 0140777; /* (S_IFSOCK|S_IRWXU|S_IRWXG|S_IRWXO) or *
- * 49663d decimal */
- if ((socket_mode = CFNumberCreate(kCFAllocatorDefault,
- kCFNumberIntType, &portnum)))
- {
- CFDictionaryAddValue(listener, CFSTR("SockPathMode"),
- socket_mode);
- CFRelease(socket_mode);
- }
- }
- else
-# endif /* AF_LOCAL */
- {
-# ifdef AF_INET6
- if (lis->address.addr.sa_family == AF_INET6)
- {
- CFDictionaryAddValue(listener,
- CFSTR(LAUNCH_JOBSOCKETKEY_FAMILY),
- CFSTR("IPv6"));
- portnum = lis->address.ipv6.sin6_port;
- }
- else
-# endif /* AF_INET6 */
- {
- CFDictionaryAddValue(listener,
- CFSTR(LAUNCH_JOBSOCKETKEY_FAMILY),
- CFSTR("IPv4"));
- portnum = lis->address.ipv4.sin_port;
- }
+ if (job_id > 0)
+ job = cupsdFindJob(job_id);
+ else
+ job = NULL;
- if ((service = getservbyport(portnum, NULL)))
- value = CFStringCreateWithCString(kCFAllocatorDefault,
- service->s_name,
- kCFStringEncodingUTF8);
- else
- value = CFNumberCreate(kCFAllocatorDefault,
- kCFNumberIntType, &portnum);
+ if (job)
+ {
+ for (i = 0; job->filters[i]; i ++)
+ if (job->filters[i] == pid)
+ break;
- if (value)
- {
- CFDictionaryAddValue(listener,
- CFSTR(LAUNCH_JOBSOCKETKEY_SERVICENAME),
- value);
- CFRelease(value);
- }
-
- httpAddrString(&lis->address, temp, sizeof(temp));
- if ((value = CFStringCreateWithCString(kCFAllocatorDefault, temp,
- kCFStringEncodingUTF8)))
- {
- CFDictionaryAddValue(listener,
- CFSTR(LAUNCH_JOBSOCKETKEY_NODENAME),
- value);
- CFRelease(value);
- }
- }
+ if (job->filters[i] || job->backend == pid)
+ {
+ /*
+ * OK, this process has gone away; what's left?
+ */
- CFRelease(listener);
- }
+ if (job->filters[i])
+ {
+ job->filters[i] = -pid;
+ type = "Filter";
}
-
- CFRelease(array);
- }
-
- /*
- * Add the BrowseSocket to the sockets dictionary...
- */
-
- if (Browsing && (BrowseRemoteProtocols & BROWSE_CUPS))
- {
- if ((array = CFArrayCreateMutable(kCFAllocatorDefault, 0,
- &kCFTypeArrayCallBacks)) != NULL)
+ else
{
- CFDictionaryAddValue(sockets, CFSTR("BrowseSockets"), array);
-
- if ((listener = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
- &kCFTypeDictionaryKeyCallBacks,
- &kCFTypeDictionaryValueCallBacks)) != NULL)
- {
- CFArrayAppendValue(array, listener);
-
- CFDictionaryAddValue(listener, CFSTR(LAUNCH_JOBSOCKETKEY_FAMILY),
- CFSTR("IPv4"));
- CFDictionaryAddValue(listener, CFSTR(LAUNCH_JOBSOCKETKEY_TYPE),
- CFSTR("dgram"));
-
- if ((service = getservbyport(BrowsePort, NULL)))
- value = CFStringCreateWithCString(kCFAllocatorDefault,
- service->s_name,
- kCFStringEncodingUTF8);
- else
- value = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType,
- &BrowsePort);
-
- CFDictionaryAddValue(listener,
- CFSTR(LAUNCH_JOBSOCKETKEY_SERVICENAME), value);
- CFRelease(value);
-
- CFRelease(listener);
- }
-
- CFRelease(array);
+ job->backend = -pid;
+ type = "Backend";
}
- }
-
- CFRelease(sockets);
- }
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "launchd_sync_conf: Updating \"%s\", pid=%d\n",
- LaunchdConf, (int)getpid());
-
- if ((fileURL = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,
- (const unsigned char *)LaunchdConf,
- strlen(LaunchdConf), false)))
- {
- if ((resourceData = CFPropertyListCreateXMLData(kCFAllocatorDefault,
- cupsd_dict)))
- {
- if (!CFURLWriteDataAndPropertiesToResource(fileURL, resourceData,
- NULL, &errorCode))
+ if (status && status != SIGTERM && status != SIGKILL &&
+ status != SIGPIPE)
{
- cupsdLogMessage(CUPSD_LOG_WARN,
- "launchd_sync_conf: "
- "CFURLWriteDataAndPropertiesToResource(\"%s\") "
- "failed: %d\n",
- LaunchdConf, (int)errorCode);
- }
-
- CFRelease(resourceData);
- }
-
- CFRelease(fileURL);
- }
-
- CFRelease(cupsd_dict);
- }
-
- /*
- * Let the caller know we updated the file...
- */
-
- return (1);
-}
-#endif /* HAVE_LAUNCHD */
-
-
-/*
- * 'parent_handler()' - Catch USR1/CHLD signals...
- */
-
-static void
-parent_handler(int sig) /* I - Signal */
-{
- /*
- * Store the signal we got from the OS and return...
- */
-
- parent_signal = sig;
-}
-
-
-/*
- * 'process_children()' - Process all dead children...
- */
-
-static void
-process_children(void)
-{
- int status; /* Exit status of child */
- int pid; /* Process ID of child */
- cupsd_job_t *job; /* Current job */
- int i; /* Looping var */
- char name[1024]; /* Process name */
-
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "process_children()");
-
- /*
- * Reset the dead_children flag...
- */
+ /*
+ * An error occurred; save the exit status so we know to stop
+ * the printer or cancel the job when all of the filters finish...
+ *
+ * A negative status indicates that the backend failed and the
+ * printer needs to be stopped.
+ *
+ * In order to preserve the most serious status, we always log
+ * when a process dies due to a signal (e.g. SIGABRT, SIGSEGV,
+ * and SIGBUS) and prefer to log the backend exit status over a
+ * filter's.
+ */
- dead_children = 0;
+ int old_status = abs(job->status);
- /*
- * Collect the exit status of some children...
- */
+ if (WIFSIGNALED(status) || /* This process crashed, or */
+ !job->status || /* No process had a status, or */
+ (!job->filters[i] && WIFEXITED(old_status)))
+ { /* Backend and filter didn't crash */
+ if (job->filters[i])
+ job->status = status; /* Filter failed */
+ else
+ job->status = -status; /* Backend failed */
+ }
-#ifdef HAVE_WAITPID
- while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
-#elif defined(HAVE_WAIT3)
- while ((pid = wait3(&status, WNOHANG, NULL)) > 0)
-#else
- if ((pid = wait(&status)) > 0)
-#endif /* HAVE_WAITPID */
- {
- /*
- * Ignore SIGTERM errors - that comes when a job is cancelled...
- */
+ if (job->state_value == IPP_JOB_PROCESSING &&
+ job->status_level > CUPSD_LOG_ERROR &&
+ (job->filters[i] || !WIFEXITED(status)))
+ {
+ char message[1024]; /* New printer-state-message */
- cupsdFinishProcess(pid, name, sizeof(name));
- if (status == SIGTERM)
- status = 0;
+ job->status_level = CUPSD_LOG_ERROR;
- if (status)
- {
- if (WIFEXITED(status))
- cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d (%s) stopped with status %d!",
- pid, name, WEXITSTATUS(status));
- else
- cupsdLogMessage(CUPSD_LOG_ERROR, "PID %d (%s) crashed on signal %d!",
- pid, name, WTERMSIG(status));
+ snprintf(message, sizeof(message), "%s failed", type);
- if (LogLevel < CUPSD_LOG_DEBUG)
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Hint: Try setting the LogLevel to \"debug\" to find out more.");
- }
- else
- cupsdLogMessage(CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
- pid, name);
+ if (job->printer)
+ {
+ strlcpy(job->printer->state_message, message,
+ sizeof(job->printer->state_message));
+ }
- /*
- * Delete certificates for CGI processes...
- */
+ if (!job->attrs)
+ cupsdLoadJob(job);
- if (pid)
- cupsdDeleteCert(pid);
+ if (!job->printer_message && job->attrs)
+ {
+ if ((job->printer_message =
+ ippFindAttribute(job->attrs, "job-printer-state-message",
+ IPP_TAG_TEXT)) == NULL)
+ job->printer_message = ippAddString(job->attrs, IPP_TAG_JOB,
+ IPP_TAG_TEXT,
+ "job-printer-state-message",
+ NULL, NULL);
+ }
- /*
- * Lookup the PID in the jobs list...
- */
+ if (job->printer_message)
+ cupsdSetString(&(job->printer_message->values[0].string.text),
+ message);
+ }
+ }
- for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
- job;
- job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
- if (job->state != NULL &&
- job->state->values[0].integer == IPP_JOB_PROCESSING)
- {
- for (i = 0; job->filters[i]; i ++)
- if (job->filters[i] == pid)
- break;
+ /*
+ * If this is not the last file in a job, see if all of the
+ * filters are done, and if so move to the next file.
+ */
- if (job->filters[i] || job->backend == pid)
+ if (job->current_file < job->num_files && job->printer)
{
- /*
- * OK, this process has gone away; what's left?
- */
+ for (i = 0; job->filters[i] < 0; i ++);
- if (job->filters[i])
- job->filters[i] = -pid;
- else
- job->backend = -pid;
-
- if (status && job->status >= 0)
+ if (!job->filters[i] &&
+ (!job->printer->pc || !job->printer->pc->single_file ||
+ job->backend <= 0))
{
/*
- * An error occurred; save the exit status so we know to stop
- * the printer or cancel the job when all of the filters finish...
- *
- * A negative status indicates that the backend failed and the
- * printer needs to be stopped.
+ * Process the next file...
*/
- if (job->filters[i])
- job->status = status; /* Filter failed */
- else
- job->status = -status; /* Backend failed */
-
- if (job->printer && !(job->printer->type & CUPS_PRINTER_FAX))
- {
- snprintf(job->printer->state_message,
- sizeof(job->printer->state_message), "%s failed", name);
- cupsdAddPrinterHistory(job->printer);
- }
+ cupsdContinueJob(job);
}
-
+ }
+ else if (job->state_value >= IPP_JOB_CANCELED)
+ {
/*
- * If this is not the last file in a job, see if all of the
- * filters are done, and if so move to the next file.
+ * Remove the job from the active list if there are no processes still
+ * running for it...
*/
- if (job->current_file < job->num_files)
- {
- for (i = 0; job->filters[i] < 0; i ++);
+ for (i = 0; job->filters[i] < 0; i++);
- if (!job->filters[i])
- {
- /*
- * Process the next file...
- */
-
- cupsdFinishJob(job);
- }
- }
- break;
+ if (!job->filters[i] && job->backend <= 0)
+ cupsArrayRemove(ActiveJobs, job);
}
}
- }
-}
-
-
-/*
- * 'sigchld_handler()' - Handle 'child' signals from old processes.
- */
-
-static void
-sigchld_handler(int sig) /* I - Signal number */
-{
- (void)sig;
-
- /*
- * Flag that we have dead children...
- */
-
- dead_children = 1;
-
- /*
- * Reset the signal handler as needed...
- */
-
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
- signal(SIGCLD, sigchld_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
-
-
-/*
- * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
- */
-
-static void
-sighup_handler(int sig) /* I - Signal number */
-{
- (void)sig;
-
- NeedReload = RELOAD_ALL;
- ReloadTime = time(NULL);
-
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
- signal(SIGHUP, sighup_handler);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
+ }
+ /*
+ * Show the exit status as needed, ignoring SIGTERM and SIGKILL errors
+ * since they come when we kill/end a process...
+ */
-/*
- * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
- */
+ if (status == SIGTERM || status == SIGKILL)
+ {
+ cupsdLogJob(job, CUPSD_LOG_DEBUG,
+ "PID %d (%s) was terminated normally with signal %d.", pid,
+ name, status);
+ }
+ else if (status == SIGPIPE)
+ {
+ cupsdLogJob(job, CUPSD_LOG_DEBUG,
+ "PID %d (%s) did not catch or ignore signal %d.", pid, name,
+ status);
+ }
+ else if (status)
+ {
+ if (WIFEXITED(status))
+ {
+ int code = WEXITSTATUS(status); /* Exit code */
+
+ if (code > 100)
+ cupsdLogJob(job, CUPSD_LOG_DEBUG,
+ "PID %d (%s) stopped with status %d (%s)", pid, name,
+ code, strerror(code - 100));
+ else
+ cupsdLogJob(job, CUPSD_LOG_DEBUG,
+ "PID %d (%s) stopped with status %d.", pid, name, code);
+ }
+ else
+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) crashed on signal %d.",
+ pid, name, WTERMSIG(status));
-static void
-sigterm_handler(int sig) /* I - Signal */
-{
- (void)sig; /* remove compiler warnings... */
+ if (LogLevel < CUPSD_LOG_DEBUG)
+ cupsdLogJob(job, CUPSD_LOG_INFO,
+ "Hint: Try setting the LogLevel to \"debug\" to find out "
+ "more.");
+ }
+ else
+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "PID %d (%s) exited with no errors.",
+ pid, name);
+ }
/*
- * Flag that we should stop and return...
+ * If wait*() is interrupted by a signal, tell main() to call us again...
*/
- stop_scheduler = 1;
+ if (pid < 0 && errno == EINTR)
+ dead_children = 1;
}
*/
static long /* O - Number of seconds */
-select_timeout(int fds) /* I - Number of ready descriptors select returned */
+select_timeout(int fds) /* I - Number of descriptors returned */
{
- int i; /* Looping var */
long timeout; /* Timeout for select */
time_t now; /* Current time */
cupsd_client_t *con; /* Client information */
- cupsd_printer_t *p; /* Printer information */
cupsd_job_t *job; /* Job information */
cupsd_subscription_t *sub; /* Subscription information */
const char *why; /* Debugging aid */
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
+ (long)JobHistoryUpdate);
+
/*
* Check to see if any of the clients have pending data to be
* processed; if so, the timeout should be 0...
*/
- for (i = NumClients, con = Clients; i > 0; i --, con ++)
+ for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+ con;
+ con = (cupsd_client_t *)cupsArrayNext(Clients))
if (con->http.used > 0)
return (0);
/*
- * If select has been active in the last second (fds != 0) or we have
+ * If select has been active in the last second (fds > 0) or we have
* many resources in use then don't bother trying to optimize the
* timeout, just make it 1 second.
*/
- if (fds || NumClients > 50)
- return (1);
-
- /*
- * If we had a recent event notification, timeout in 1 second...
- */
-
- if (LastEvent)
+ if (fds > 0 || cupsArrayCount(Clients) > 50)
return (1);
/*
timeout = now + 86400; /* 86400 == 1 day */
why = "do nothing";
+#ifdef __APPLE__
+ /*
+ * When going to sleep, wake up to cancel jobs that don't complete in time.
+ */
+
+ if (SleepJobs > 0 && SleepJobs < timeout)
+ {
+ timeout = SleepJobs;
+ why = "cancel jobs before sleeping";
+ }
+#endif /* __APPLE__ */
+
+ /*
+ * Check whether we are accepting new connections...
+ */
+
+ if (ListeningPaused > 0 && cupsArrayCount(Clients) < MaxClients &&
+ ListeningPaused < timeout)
+ {
+ if (ListeningPaused <= now)
+ timeout = now;
+ else
+ timeout = ListeningPaused;
+
+ why = "resume listening";
+ }
+
/*
* Check the activity and close old clients...
*/
- for (i = NumClients, con = Clients; i > 0; i --, con ++)
+ for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
+ con;
+ con = (cupsd_client_t *)cupsArrayNext(Clients))
if ((con->http.activity + Timeout) < timeout)
{
timeout = con->http.activity + Timeout;
}
/*
- * Update the browse list as needed...
+ * Write out changes to configuration and state files...
+ */
+
+ if (DirtyCleanTime && timeout > DirtyCleanTime)
+ {
+ timeout = DirtyCleanTime;
+ why = "write dirty config/state files";
+ }
+
+ /*
+ * Check for any job activity...
*/
- if (Browsing && BrowseLocalProtocols)
+ if (JobHistoryUpdate && timeout > JobHistoryUpdate)
{
-#ifdef HAVE_LIBSLP
- if ((BrowseLocalProtocols & BROWSE_SLP) && (BrowseSLPRefresh < timeout))
+ timeout = JobHistoryUpdate;
+ why = "update job history";
+ }
+
+ for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
+ job;
+ job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
+ {
+ if (job->cancel_time && job->cancel_time < timeout)
{
- timeout = BrowseSLPRefresh;
- why = "update SLP browsing";
+ timeout = job->cancel_time;
+ why = "cancel stuck jobs";
}
-#endif /* HAVE_LIBSLP */
- if (BrowseLocalProtocols & BROWSE_CUPS)
+ if (job->kill_time && job->kill_time < timeout)
{
- for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- p;
- p = (cupsd_printer_t *)cupsArrayNext(Printers))
- {
- if (p->type & CUPS_PRINTER_REMOTE)
- {
- if ((p->browse_time + BrowseTimeout) < timeout)
- {
- timeout = p->browse_time + BrowseTimeout;
- why = "browse timeout a printer";
- }
- }
- else if (!(p->type & CUPS_PRINTER_IMPLICIT))
- {
- if (BrowseInterval && (p->browse_time + BrowseInterval) < timeout)
- {
- timeout = p->browse_time + BrowseInterval;
- why = "send browse update";
- }
- }
- }
+ timeout = job->kill_time;
+ why = "kill unresponsive jobs";
}
- }
- /*
- * Check for any active jobs...
- */
+ if (job->state_value == IPP_JOB_HELD && job->hold_until < timeout)
+ {
+ timeout = job->hold_until;
+ why = "release held jobs";
+ }
- if (timeout > (now + 10) && ActiveJobs)
- {
- for (job = (cupsd_job_t *)cupsArrayFirst(ActiveJobs);
- job;
- job = (cupsd_job_t *)cupsArrayNext(ActiveJobs))
- if (job->state->values[0].integer <= IPP_JOB_PROCESSING)
- {
- timeout = now + 10;
- why = "process active jobs";
- break;
- }
+ if (job->state_value == IPP_JOB_PENDING && timeout > (now + 10))
+ {
+ timeout = now + 10;
+ why = "start pending jobs";
+ break;
+ }
}
#ifdef HAVE_MALLINFO
for (sub = (cupsd_subscription_t *)cupsArrayFirst(Subscriptions);
sub;
sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions))
- if (!sub->job && sub->expire < timeout)
+ if (!sub->job && sub->expire && sub->expire < timeout)
{
timeout = sub->expire;
why = "expire subscription";
}
/*
- * Adjust from absolute to relative time. If p->browse_time above
- * was 0 then we can end up with a negative value here, so check.
- * We add 1 second to the timeout since events occur after the
- * timeout expires, and limit the timeout to 86400 seconds (1 day)
- * to avoid select() timeout limits present on some operating
+ * Adjust from absolute to relative time. We add 1 second to the timeout since
+ * events occur after the timeout expires, and limit the timeout to 86400
+ * seconds (1 day) to avoid select() timeout limits present on some operating
* systems...
*/
* Log and return the timeout value...
*/
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: %ld seconds to %s",
- timeout, why);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout(%d): %ld seconds to %s",
+ fds, timeout, why);
return (timeout);
}
+/*
+ * 'sigchld_handler()' - Handle 'child' signals from old processes.
+ */
+
+static void
+sigchld_handler(int sig) /* I - Signal number */
+{
+ (void)sig;
+
+ /*
+ * Flag that we have dead children...
+ */
+
+ dead_children = 1;
+
+ /*
+ * Reset the signal handler as needed...
+ */
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+ signal(SIGCLD, sigchld_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
+/*
+ * 'sighup_handler()' - Handle 'hangup' signals to reconfigure the scheduler.
+ */
+
+static void
+sighup_handler(int sig) /* I - Signal number */
+{
+ (void)sig;
+
+ NeedReload = RELOAD_ALL;
+ ReloadTime = time(NULL);
+
+#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
+ signal(SIGHUP, sighup_handler);
+#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
+}
+
+
+/*
+ * 'sigterm_handler()' - Handle 'terminate' signals that stop the scheduler.
+ */
+
+static void
+sigterm_handler(int sig) /* I - Signal number */
+{
+ (void)sig; /* remove compiler warnings... */
+
+ /*
+ * Flag that we should stop and return...
+ */
+
+ stop_scheduler = 1;
+}
+
+
/*
* 'usage()' - Show scheduler usage.
*/
static void
usage(int status) /* O - Exit status */
{
- _cupsLangPuts(status ? stderr : stdout,
- _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n"
- "\n"
- "-c config-file Load alternate configuration file\n"
- "-f Run in the foreground\n"
- "-F Run in the foreground but detach\n"
- "-h Show this usage message\n"
- "-l Run cupsd from launchd(8)\n"));
+ FILE *fp = status ? stderr : stdout; /* Output file */
+
+
+ _cupsLangPuts(fp, _("Usage: cupsd [options]"));
+ _cupsLangPuts(fp, _("Options:"));
+ _cupsLangPuts(fp, _(" -c cupsd.conf Set cupsd.conf file to use."));
+ _cupsLangPuts(fp, _(" -f Run in the foreground."));
+ _cupsLangPuts(fp, _(" -F Run in the foreground but "
+ "detach from console."));
+ _cupsLangPuts(fp, _(" -h Show this usage message."));
+ _cupsLangPuts(fp, _(" -l Run cupsd from launchd(8)."));
+ _cupsLangPuts(fp, _(" -t Test the configuration "
+ "file."));
+
exit(status);
}
/*
- * End of "$Id: main.c 5042 2006-02-01 18:17:34Z mike $".
+ * End of "$Id$".
*/
projects / thirdparty / cups.git / blobdiff