Changeset 228 for branches/samba-3.2.x/source/printing/printing.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/printing/printing.c (modified) (5 diffs)

branches/samba-3.2.x/source/printing/printing.c

@@ -1395 +1395 @@
 void start_background_queue(void)
 {
+        /* Use local variables for this as we don't
+         * need to save the parent side of this, just
+         * ensure it closes when the process exits.
+         */
+        int pause_pipe[2];
+
         DEBUG(3,("start_background_queue: Starting background LPQ thread\n"));
+
+        if (pipe(pause_pipe) == -1) {
+                DEBUG(5,("start_background_queue: cannot create pipe. %s\n", strerror(errno) ));
+                exit(1);
+        }
+
         background_lpq_updater_pid = sys_fork();
 
@@ -1407 +1419 @@
                 DEBUG(5,("start_background_queue: background LPQ thread started\n"));
 
+                close(pause_pipe[0]);
+                pause_pipe[0] = -1;
+
                 if (!reinit_after_fork(smbd_messaging_context(), true)) {
                         DEBUG(0,("reinit_after_fork() failed\n"));
@@ -1421 +1436 @@
                 messaging_register(smbd_messaging_context(), NULL,
                                    MSG_PRINTER_UPDATE, print_queue_receive);
-                
+
                 DEBUG(5,("start_background_queue: background LPQ thread waiting for messages\n"));
                 while (1) {
-                        pause();
-                        
+                        fd_set pause_fds;
+                        int pause_select;
+
+                        FD_ZERO(&pause_fds);
+                        FD_SET(pause_pipe[1], &pause_fds);
+                        pause_select = sys_select(pause_pipe[1]+1, &pause_fds, NULL, NULL, NULL);
+                        /* If pause_pipe[0] is closed it means the parent smbd
+                         * and children exited or aborted. */
+                        if (pause_select == 1) {
+                                exit_server_cleanly(NULL);
+                        }
+
                         /* check for some essential signals first */
-                        
+
                         if (got_sig_term) {
                                 exit_server_cleanly(NULL);
@@ -1438 +1463 @@
                                 reload_after_sighup = 0;
                         }
-                        
+
                         /* now check for messages */
-                        
+
                         DEBUG(10,("start_background_queue: background LPQ thread got a message\n"));
                         message_dispatch(smbd_messaging_context());
@@ -1450 +1475 @@
                 }
         }
+
+        close(pause_pipe[1]);
 }