httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 ApacheOS.dsp ApacheOS.mak
Date Fri, 24 Mar 2000 04:45:28 GMT
stoddard    00/03/23 20:45:28

  Modified:    src      ApacheCore.dsp ApacheCore.mak Makefile.win
               src/modules/mpm/winnt winnt.c
  Removed:     src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Eliminate os.c and ApacheOS.dsp, ApacheOS.mak, et. al. Update the winnt
  MPM to use native thread control calls rather than the deprecated stuff
  in os.c. Even though I don't use APR in the MPM yet, this is forward
  progress.
  
  Revision  Changes    Path
  1.12      +2 -2      apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheCore.dsp	2000/03/21 01:32:40	1.11
  +++ ApacheCore.dsp	2000/03/24 04:45:26	1.12
  @@ -55,7 +55,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows
/dll /machine:I386
  -# ADD LINK32 lib\apr\Release\aprlib.lib os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib
ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /machine:I386
  +# ADD LINK32 lib\apr\Release\aprlib.lib  regex\release\regex.lib ap\Release\ap.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib
/nologo /subsystem:windows /dll /machine:I386
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  @@ -82,7 +82,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows
/dll /debug /machine:I386
  -# ADD LINK32 lib\apr\debug\aprlib.lib regex\debug\regex.lib os\win32\ApacheOSD\ApacheOS.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386
  +# ADD LINK32 lib\apr\debug\aprlib.lib regex\debug\regex.lib  ap\Debug\ap.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib
/nologo /subsystem:windows /dll /debug /machine:I386
   # SUBTRACT LINK32 /map
   
   !ENDIF 
  
  
  
  1.14      +11 -11    apache-2.0/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheCore.mak	2000/03/21 01:32:40	1.13
  +++ ApacheCore.mak	2000/03/24 04:45:27	1.14
  @@ -111,11 +111,11 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=lib\apr\Release\aprlib.lib os\win32\ApacheOSR\ApacheOS.lib\
  - regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib mswsock.lib\
  - /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb"\
  - /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
  +LINK32_FLAGS=lib\apr\Release\aprlib.lib  regex\release\regex.lib\
  + ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  + advapi32.lib shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
  + /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\
  + /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
    /implib:"$(OUTDIR)\ApacheCore.lib" 
   DEF_FILE= \
   	".\ApacheCore.def"
  @@ -337,12 +337,12 @@
   <<
   
   LINK32=link.exe
  -LINK32_FLAGS=lib\apr\debug\aprlib.lib regex\debug\regex.lib\
  - os\win32\ApacheOSD\ApacheOS.lib ap\Debug\ap.lib kernel32.lib user32.lib\
  - gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib\
  - mswsock.lib /nologo /subsystem:windows /dll /incremental:yes\
  - /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386 /def:".\ApacheCore.def"\
  - /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib" 
  +LINK32_FLAGS=lib\apr\debug\aprlib.lib regex\debug\regex.lib  ap\Debug\ap.lib\
  + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\
  + shell32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll\
  + /incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386\
  + /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
  + /implib:"$(OUTDIR)\ApacheCore.lib" 
   DEF_FILE= \
   	".\ApacheCore.def"
   LINK32_OBJS= \
  
  
  
  1.4       +0 -6      apache-2.0/src/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.win,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.win	2000/03/22 21:48:42	1.3
  +++ Makefile.win	2000/03/24 04:45:27	1.4
  @@ -53,9 +53,6 @@
   	cd lib\apr
   	 nmake /nologo CFG="aprlib - Win32 $(LONG)" -f aprlib.mak
   	cd ..\..
  -	cd os\win32
  -	 nmake /nologo CFG="ApacheOS - Win32 $(LONG)" -f ApacheOS.mak
  -	cd ..\..
   	cd regex
   	 nmake /nologo CFG="regex - Win32 $(LONG)" -f regex.mak
   	cd ..
  @@ -118,9 +115,6 @@
   _clean:
   	cd lib\apr
   	 nmake /nologo CFG="aprlib - Win32 $(LONG)" -f aprlib.mak clean
  -	cd ..\..
  -	cd os\win32
  -	 nmake /nologo CFG="ApacheOS - Win32 $(LONG)" -f ApacheOS.mak clean
   	cd ..\..
   	cd regex
   	 nmake /nologo CFG="regex - Win32 $(LONG)" -f regex.mak clean
  
  
  
  1.43      +8 -6      apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- winnt.c	2000/03/10 00:07:07	1.42
  +++ winnt.c	2000/03/24 04:45:27	1.43
  @@ -1097,7 +1097,7 @@
   {
       int i;
   
  -    free_thread(handles[thread_to_clean]);
  +    CloseHandle(handles[thread_to_clean]);
       for (i = thread_to_clean; i < ((*thread_cnt) - 1); i++)
   	handles[i] = handles[i + 1];
       (*thread_cnt)--;
  @@ -1116,7 +1116,7 @@
   static void child_main()
   {
       int nthreads = ap_threads_per_child;
  -
  +    int thread_id;
       thread **child_handles;
       int rv;
       ap_status_t status;
  @@ -1173,12 +1173,14 @@
       ap_log_error(APLOG_MARK,APLOG_INFO, APR_SUCCESS, server_conf, "Child %d: Creating %d
worker threads",my_pid, nthreads);
       child_handles = (thread *) alloca(nthreads * sizeof(int));
       for (i = 0; i < nthreads; i++) {
  -        child_handles[i] = create_thread((void (*)(void *)) worker_main, (void *) i);
  +        child_handles[i] = (thread *) _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE)
worker_main,
  +                                                     NULL, 0, &thread_id);
       }
   
       if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
           /* Win95/98: Create the accept thread */
  -        create_thread((void (*)(void *)) accept_and_queue_connections, (void *) NULL);
  +        _beginthreadex(NULL, 0, (LPTHREAD_START_ROUTINE) accept_and_queue_connections,
  +                       (void *) i, 0, &thread_id);
       }
   
       /* Wait for the exit event to be signaled by the parent process */
  @@ -1224,8 +1226,8 @@
           break;
       }
       for (i = 0; i < nthreads; i++) {
  -	kill_thread(child_handles[i]);
  -	free_thread(child_handles[i]);
  +        TerminateThread(child_handles[i], 1);
  +        CloseHandle(child_handles[i]);
       }
       ap_log_error(APLOG_MARK,APLOG_INFO, APR_SUCCESS, server_conf, 
                    "Child %d: All worker threads have ended.", my_pid);
  
  
  

Mime
View raw message