diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-11-07 01:20:23 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-11-07 01:20:23 +0000 |
| commit | 581dae2da052286aae0e5e558d31454894853f56 (patch) | |
| tree | 37114b6fd3af23039d0d57f0338cd11bd1012e0a /backend/socket.c | |
| parent | a86604301626ef9b5b537e349d639d988994f59c (diff) | |
| download | cups-581dae2da052286aae0e5e558d31454894853f56.tar.gz | |
Dropped "dark wake" support on OS X, which was preventing portables from going
to sleep when there was a stuck job. We now use a variation of the CUPS 1.4
sleep support to do a cleaner sleep (<rdar://problem/14323704>)
Aside from removing all of the power assertions, we now track a new
"cups-waiting-for-completed" state keyword that tells cupsd it can SIGKILL a
backend without side-effects - then if we are just waiting for the job to
complete we can go to sleep immediately.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11403 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/socket.c')
| -rw-r--r-- | backend/socket.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/backend/socket.c b/backend/socket.c index ebed1361b..bf70b40a6 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,23 +1,18 @@ /* * "$Id$" * - * AppSocket backend for CUPS. + * AppSocket backend for CUPS. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * These coded instructions, statements, and computer programs are the - * 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, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * 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, see the license at "http://www.cups.org/". * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Send a file to the printer or server. - * wait_bc() - Wait for back-channel data... + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -434,6 +429,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ _cupsLangPrintFilter(stderr, "INFO", _("Print file sent.")); } + fputs("STATE: +cups-waiting-for-completed\n", stderr); + if (waiteof) { /* |