httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-test/flood flood_net_ssl.c
Date Tue, 09 Apr 2002 08:01:23 GMT
aaron       02/04/09 01:01:23

  Modified:    flood    flood_net_ssl.c
  Log:
  Stop using the old apr_lock.h API and start just using the
  apr_thread_mutex.h interface for everything. Also get rid of the
  USE_RW_LOCK_FOR_SSL thing, since I don't see how it makes sense with
  the new lock types (maybe it's just too late and my eyes are squinting
  too much :). We didn't have an autoconf feature test for it or anything.
  
  Revision  Changes    Path
  1.18      +23 -48    httpd-test/flood/flood_net_ssl.c
  
  Index: flood_net_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/flood_net_ssl.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- flood_net_ssl.c	3 Jan 2002 15:45:57 -0000	1.17
  +++ flood_net_ssl.c	9 Apr 2002 08:01:23 -0000	1.18
  @@ -70,8 +70,6 @@
   #include <apr_strings.h>
   #include <unistd.h>
   
  -#define USE_RW_LOCK_FOR_SSL
  -
   struct ssl_socket_t {
       SSL_CTX *ssl_context;
       SSL *ssl_connection;
  @@ -81,26 +79,22 @@
   apr_pool_t *ssl_pool;
   
   #if APR_HAS_THREADS
  -apr_lock_t **ssl_locks;
  +apr_thread_mutex_t **ssl_locks;
   
   typedef struct CRYPTO_dynlock_value { 
  -    apr_lock_t *lock; 
  +    apr_thread_mutex_t *lock; 
   } CRYPTO_dynlock_value;
   
   static CRYPTO_dynlock_value *ssl_dyn_create(const char* file, int line)
   {
       CRYPTO_dynlock_value *l;
  +    apr_status_t rv;
   
       l = apr_palloc(ssl_pool, sizeof(CRYPTO_dynlock_value));
  -#ifdef USE_RW_LOCK_FOR_SSL 
  -    /* Intraprocess locks don't /need/ a filename... */
  -    apr_lock_create(&l->lock, APR_READWRITE, APR_INTRAPROCESS,
  -                    APR_LOCK_DEFAULT, NULL, ssl_pool);
  -#else
  -    /* Intraprocess locks don't /need/ a filename... */
  -    apr_lock_create(&l->lock, APR_MUTEX, APR_INTRAPROCESS,
  -                    APR_LOCK_DEFAULT, NULL, ssl_pool);
  -#endif
  +    rv = apr_thread_mutex_create(&l->lock, APR_THREAD_MUTEX_DEFAULT, ssl_pool);
  +    if (rv != APR_SUCCESS) {
  +        /* FIXME: return error here */
  +    }
       return l;
   }
   
  @@ -108,44 +102,27 @@
                            int line)
   {
       if (mode & CRYPTO_LOCK) {
  -#ifdef USE_RW_LOCK_FOR_SSL 
  -        if (mode & CRYPTO_READ) {
  -            apr_lock_acquire_rw(l->lock, APR_READER);
  -        }
  -        else if (mode & CRYPTO_WRITE) {
  -            apr_lock_acquire_rw(l->lock, APR_WRITER);
  -        }
  -#else
  -        apr_lock_acquire(l->lock);
  -#endif
  +        apr_thread_mutex_lock(l->lock);
       }
       else if (mode & CRYPTO_UNLOCK) {
  -        apr_lock_release(l->lock);
  +        apr_thread_mutex_unlock(l->lock);
       }
   }
   
   static void ssl_dyn_destroy(CRYPTO_dynlock_value *l, const char *file,
                               int line)
   {
  -    apr_lock_destroy(l->lock);
  +    apr_thread_mutex_destroy(l->lock);
   }
   
   static void ssl_lock(int mode, int n, const char *file, int line)
   {
       if (mode & CRYPTO_LOCK) {
  -#ifdef USE_RW_LOCK_FOR_SSL 
  -        if (mode & CRYPTO_READ) {
  -            apr_lock_acquire_rw(ssl_locks[n], APR_READER);
  -        }
  -        else if (mode & CRYPTO_WRITE) {
  -            apr_lock_acquire_rw(ssl_locks[n], APR_WRITER);
  -        }
  -#else
  -        apr_lock_acquire(ssl_locks[n]);
  -#endif
  +        apr_thread_mutex_lock(ssl_locks[n]);
  +    }
  +    else if (mode & CRYPTO_UNLOCK) {
  +        apr_thread_mutex_unlock(ssl_locks[n]);
       }
  -    else if (mode & CRYPTO_UNLOCK)
  -        apr_lock_release(ssl_locks[n]);
   }
   
   static unsigned long ssl_id(void)
  @@ -207,18 +184,16 @@
   
   #if APR_HAS_THREADS
       numlocks = CRYPTO_num_locks();
  -    ssl_locks = apr_palloc(pool, sizeof(apr_lock_t*)*numlocks);
  -    for (i = 0; i < numlocks; i++)
  -    {
  -#ifdef USE_RW_LOCK_FOR_SSL 
  -        /* Intraprocess locks don't /need/ a filename... */
  -        apr_lock_create(&ssl_locks[i], APR_READWRITE, APR_INTRAPROCESS,
  -                        APR_LOCK_DEFAULT, NULL, ssl_pool);
  -#else
  +    ssl_locks = apr_palloc(pool, sizeof(apr_thread_mutex_t*)*numlocks);
  +    for (i = 0; i < numlocks; i++) {
  +        apr_status_t rv;
  +
           /* Intraprocess locks don't /need/ a filename... */
  -        apr_lock_create(&ssl_locks[i], APR_MUTEX, APR_INTRAPROCESS,
  -                        APR_LOCK_DEFAULT, NULL, ssl_pool);
  -#endif
  +        rv = apr_thread_mutex_create(&ssl_locks[i], APR_THREAD_MUTEX_DEFAULT,
  +                                     ssl_pool);
  +        if (rv != APR_SUCCESS) {
  +            /* FIXME: error out here */
  +        }
       }
   
       CRYPTO_set_locking_callback(ssl_lock);
  
  
  

Mime
View raw message