apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: apr CHANGES libapr.dsp apr.dsp
Date Tue, 19 Feb 2002 20:51:35 GMT
stoddard    02/02/19 12:51:35

  Modified:    locks/win32 global_mutex.c
               .        CHANGES libapr.dsp apr.dsp
  Log:
  Implement apr_global_mutex_foo() on Windows.  This is basically identical
  to apr_proc_lock as a Windows MUTEX locks threads as well as processes.
  
  Revision  Changes    Path
  1.3       +14 -7     apr/locks/win32/global_mutex.c
  
  Index: global_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/win32/global_mutex.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- global_mutex.c	18 Feb 2002 13:06:43 -0000	1.2
  +++ global_mutex.c	19 Feb 2002 20:51:34 -0000	1.3
  @@ -53,14 +53,17 @@
    */
   
   #include "apr.h"
  +#include "apr_lock.h"
   #include "apr_strings.h"
  +#include "apr_global_mutex.h"
  +#include "proc_mutex.h"
   
   APR_DECLARE(apr_status_t) apr_global_mutex_create(apr_global_mutex_t **mutex,
                                                     const char *fname,
                                                     apr_lockmech_e mech,
                                                     apr_pool_t *pool)
   {
  -    return APR_ENOTIMPL;
  +    return apr_proc_mutex_create((apr_proc_mutex_t **) mutex, fname, mech, pool);
   }
   
   APR_DECLARE(apr_status_t) apr_global_mutex_child_init(
  @@ -68,28 +71,32 @@
                                 const char *fname,
                                 apr_pool_t *pool)
   {
  -    return APR_ENOTIMPL;
  +    return apr_proc_mutex_child_init((apr_proc_mutex_t**) mutex, fname, pool);
   }
   
   APR_DECLARE(apr_status_t) apr_global_mutex_lock(apr_global_mutex_t *mutex)
   {
  -    return APR_ENOTIMPL;
  +    return apr_proc_mutex_lock((apr_proc_mutex_t*) mutex);
   }
   
   APR_DECLARE(apr_status_t) apr_global_mutex_trylock(apr_global_mutex_t *mutex)
   {
  -    return APR_ENOTIMPL;
  +    return apr_proc_mutex_trylock((apr_proc_mutex_t* )mutex);
   }
   
   APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex)
   {
  -    return APR_ENOTIMPL;
  +    return apr_proc_mutex_unlock((apr_proc_mutex_t*) mutex);
   }
   
   APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex)
   {
  -    return APR_ENOTIMPL;
  +    return apr_proc_mutex_destroy((apr_proc_mutex_t*) mutex);
  +}
  +
  +APR_DECLARE(apr_pool_t*) apr_global_mutex_pool_get(const apr_global_mutex_t *mutex)
  +{
  +    return apr_proc_mutex_pool_get((apr_proc_mutex_t*) mutex);
   }
   
  -APR_POOL_IMPLEMENT_ACCESSOR(global_mutex)
   
  
  
  
  1.226     +2 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.225
  retrieving revision 1.226
  diff -u -r1.225 -r1.226
  --- CHANGES	18 Feb 2002 06:08:53 -0000	1.225
  +++ CHANGES	19 Feb 2002 20:51:34 -0000	1.226
  @@ -1,4 +1,6 @@
   Changes with APR b1
  +  *) Implement apr_global_lock_foo() on Win32
  +     [Bill Stoddard]
   
     *) Fix select() argument call when waiting for IO.  PR 9674.
        [David MacKenzie <djm@pix.net>]
  
  
  
  1.57      +8 -0      apr/libapr.dsp
  
  Index: libapr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/libapr.dsp,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- libapr.dsp	18 Feb 2002 05:44:23 -0000	1.56
  +++ libapr.dsp	19 Feb 2002 20:51:34 -0000	1.57
  @@ -176,6 +176,10 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  +SOURCE=.\locks\win32\global_mutex.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\locks\win32\locks.c
   # End Source File
   # Begin Source File
  @@ -521,6 +525,10 @@
   # Begin Source File
   
   SOURCE=.\include\apr_getopt.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_global_mutex.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.96      +8 -0      apr/apr.dsp
  
  Index: apr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/apr.dsp,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- apr.dsp	18 Feb 2002 05:44:23 -0000	1.95
  +++ apr.dsp	19 Feb 2002 20:51:34 -0000	1.96
  @@ -170,6 +170,10 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  +SOURCE=.\locks\win32\global_mutex.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\locks\win32\locks.c
   # End Source File
   # Begin Source File
  @@ -515,6 +519,10 @@
   # Begin Source File
   
   SOURCE=.\include\apr_getopt.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\apr_global_mutex.h
   # End Source File
   # Begin Source File
   
  
  
  

Mime
View raw message