apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Brian Havard" <bri...@kheldar.apana.org.au>
Subject Re: cvs commit: apr/locks/unix global_mutex.c
Date Fri, 03 May 2002 01:23:56 GMT
On 2 May 2002 00:52:01 -0000, rbb@apache.org wrote:

>rbb         02/05/01 17:52:01
>
>  Modified:    include  apr_portable.h
>               locks/unix global_mutex.c
>  Log:
>  Add apr_os_get function for global_mutexes.
>  
>  Revision  Changes    Path
>  1.78      +19 -0     apr/include/apr_portable.h
>  
>  Index: apr_portable.h
>  ===================================================================
>  RCS file: /home/cvs/apr/include/apr_portable.h,v
>  retrieving revision 1.77
>  retrieving revision 1.78
>  diff -u -r1.77 -r1.78
>  --- apr_portable.h	9 Apr 2002 06:56:55 -0000	1.77
>  +++ apr_portable.h	2 May 2002 00:52:01 -0000	1.78
>  @@ -74,6 +74,7 @@
>   #include "apr_file_io.h"
>   #include "apr_network_io.h"
>   #include "apr_errno.h"
>  +#include "apr_global_mutex.h"
>   #include "apr_proc_mutex.h"
>   #include "apr_time.h"
>   #include "apr_dso.h"
>  @@ -216,6 +217,24 @@
>   };
>   
>   typedef struct apr_os_sock_info_t apr_os_sock_info_t;
>  +
>  +#if APR_PROCESS_LOCK_IS_GLOBAL

Shouldn't that be APR_PROC_MUTEX_IS_GLOBAL? I think
APR_PROCESS_LOCK_IS_GLOBAL is a hangover from the old lock API &
apr_global_mutex.h uses APR_PROC_MUTEX_IS_GLOBAL to decide if it's going to
#define global -> proc mutexes.



>  +#define apr_os_global_mutex_t apr_os_proc_mutex_t
>  +#define apr_os_global_mutex_get apr_os_proc_mutex_get
>  +#else
>  +    struct apr_os_global_mutex_t {
>  +        apr_pool_t *pool;
>  +        apr_proc_mutex_t *proc_mutex;
>  +#if APR_HAS_THREADS
>  +        apr_thread_mutex_t *thread_mutex;
>  +#endif /* APR_HAS_THREADS */
>  +    };
>  +    typedef struct apr_os_global_mutex_t apr_os_global_mutex_t;
>  +
>  +APR_DECLARE(apr_status_t) apr_os_global_mutex_get(apr_os_global_mutex_t *ospmutex,

>  +                                                apr_global_mutex_t *pmutex);
>  +#endif
>  +

-- 
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------


Mime
View raw message