Commit 03d01bed authored by Jeff Trawick's avatar Jeff Trawick
Browse files

axe some deprecated MULTITHREAD code 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84825 13f79535-47bb-0310-9956-ffa450edef68
parent 44e8ebe4

os/win32/os.h

+0 −1
Changes for os/win32/os.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ 
#define USE_LONGJMP

#define HAVE_MMAP

#define USE_MMAP_SCOREBOARD

#define MULTITHREAD

#define HAVE_CANONICAL_FILENAME

#define HAVE_DRIVE_LETTERS

#define HAVE_SENDFILE

server/mpm/mpmt_pthread/scoreboard.c

+0 −34
Changes for server/mpm/mpmt_pthread/scoreboard.c: 0 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -22,38 +22,6 @@ API_VAR_IMPORT char *ap_scoreboard_fname; 
 * We begin with routines which deal with the file itself... 

 */



#ifdef MULTITHREAD

/*

 * In the multithreaded mode, have multiple threads - not multiple

 * processes that need to talk to each other. Just use a simple

 * malloc. But let the routines that follow, think that you have

 * shared memory (so they use memcpy etc.)

 */



void reinit_scoreboard(ap_context_t *p)

{

    ap_assert(!ap_scoreboard_image);

    ap_scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);

    if (ap_scoreboard_image == NULL) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

                     "Ouch! Out of memory reiniting scoreboard!");

    }

    memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE);

}



void cleanup_scoreboard(void)

{

    ap_assert(ap_scoreboard_image);

    free(ap_scoreboard_image);

    ap_scoreboard_image = NULL;

}



API_EXPORT(void) ap_sync_scoreboard_image(void)

{

}





#else /* MULTITHREAD */

#if APR_HAS_SHARED_MEMORY

#include "apr_shmem.h"
@@ -123,8 +91,6 @@ ap_inline void ap_sync_scoreboard_image(void) 
{

}



#endif /* MULTITHREAD */



API_EXPORT(int) ap_exists_scoreboard_image(void)

{

    return (ap_scoreboard_image ? 1 : 0);