[naviserver-commits] naviserver/nsd driver.c,1.30,1.31

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4469/nsd

Modified Files:
	driver.c 
Log Message:
Made all places related to spooler shutdown conditional on spoolerDisabled


Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** driver.c	14 Jan 2006 18:40:07 -0000	1.30
--- driver.c	14 Jan 2006 18:45:21 -0000	1.31
***************
*** 520,530 ****
      Ns_MutexUnlock(&drvLock);
  
!     Ns_MutexLock(&spoolerLock);
!     if (!spoolerDisabled && !spoolerStopped && !spoolerShutdown) {
!         Ns_Log(Notice, "spooler: triggering shutdown");
!         spoolerShutdown = 1;
!         SockTrigger(spoolerPipe[1]);
      }
-     Ns_MutexUnlock(&spoolerLock);
  }
  
--- 520,532 ----
      Ns_MutexUnlock(&drvLock);
  
!     if (!spoolerDisabled) {
!         Ns_MutexLock(&spoolerLock);
!         if (!spoolerStopped && !spoolerShutdown) {
!             Ns_Log(Notice, "spooler: triggering shutdown");
!             spoolerShutdown = 1;
!             SockTrigger(spoolerPipe[1]);
!         }
!         Ns_MutexUnlock(&spoolerLock);
      }
  }
  
***************
*** 573,595 ****
      }
  
!     Ns_MutexLock(&spoolerLock);
!     while (!spoolerStopped && status == NS_OK) {
!         status = Ns_CondTimedWait(&spoolerCond, &spoolerLock, toPtr);
!     }
!     Ns_MutexUnlock(&spoolerLock);
!     if (status != NS_OK) {
!         Ns_Log(Warning, "spooler: timeout waiting for shutdown");
!     } else {
!         Ns_Log(Notice, "spooler: shutdown complete");
!         spoolerThread = NULL;
!         ns_sockclose(spoolerPipe[0]);
!         ns_sockclose(spoolerPipe[1]);
!         Ns_MutexLock(&uploadLock);
!         hPtr = Tcl_FirstHashEntry(&uploadTable, &search);
!         while (hPtr != NULL) {
!             Tcl_DeleteHashEntry(hPtr);
!             hPtr = Tcl_NextHashEntry(&search);
          }
-         Ns_MutexUnlock(&uploadLock);
      }
  }
--- 575,599 ----
      }
  
!     if (!spoolerDisabled) {
!         Ns_MutexLock(&spoolerLock);
!         while (!spoolerStopped && status == NS_OK) {
!             status = Ns_CondTimedWait(&spoolerCond, &spoolerLock, toPtr);
!         }
!         Ns_MutexUnlock(&spoolerLock);
!         if (status != NS_OK) {
!             Ns_Log(Warning, "spooler: timeout waiting for shutdown");
!         } else {
!             Ns_Log(Notice, "spooler: shutdown complete");
!             spoolerThread = NULL;
!             ns_sockclose(spoolerPipe[0]);
!             ns_sockclose(spoolerPipe[1]);
!             Ns_MutexLock(&uploadLock);
!             hPtr = Tcl_FirstHashEntry(&uploadTable, &search);
!             while (hPtr != NULL) {
!                 Tcl_DeleteHashEntry(hPtr);
!                 hPtr = Tcl_NextHashEntry(&search);
!             }
!             Ns_MutexUnlock(&uploadLock);
          }
      }
  }