Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B82AB1177A for ; Sat, 20 Sep 2014 12:34:21 +0000 (UTC) Received: (qmail 10583 invoked by uid 500); 20 Sep 2014 12:34:21 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 10523 invoked by uid 500); 20 Sep 2014 12:34:21 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 10509 invoked by uid 99); 20 Sep 2014 12:34:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Sep 2014 12:34:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Sep 2014 12:34:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0B4952388C27; Sat, 20 Sep 2014 12:33:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1626428 [10/21] - /apr/site/trunk/docs/docs/apr/1.5/ Date: Sat, 20 Sep 2014 12:33:12 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140920123321.0B4952388C27@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h_source.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h_source.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h_source.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h_source.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_portable.h Source File @@ -30,7 +30,7 @@ - + @@ -116,17 +116,17 @@ var searchBox = new SearchBox("searchBox
25  * @brief APR Portability Routines
26  */
27 
-
28 #include "apr.h"
-
29 #include "apr_pools.h"
-
30 #include "apr_thread_proc.h"
-
31 #include "apr_file_io.h"
-
32 #include "apr_network_io.h"
-
33 #include "apr_errno.h"
-
34 #include "apr_global_mutex.h"
-
35 #include "apr_proc_mutex.h"
-
36 #include "apr_time.h"
-
37 #include "apr_dso.h"
-
38 #include "apr_shm.h"
+
28 #include "apr.h"
+
29 #include "apr_pools.h"
+
30 #include "apr_thread_proc.h"
+
31 #include "apr_file_io.h"
+
32 #include "apr_network_io.h"
+
33 #include "apr_errno.h"
+
34 #include "apr_global_mutex.h"
+
35 #include "apr_proc_mutex.h"
+
36 #include "apr_time.h"
+
37 #include "apr_dso.h"
+
38 #include "apr_shm.h"
39 
40 #if APR_HAVE_DIRENT_H
41 #include <dirent.h>
@@ -215,38 +215,38 @@ var searchBox = new SearchBox("searchBox
124  */
125 
126 /** Basic OS process mutex structure. */
-
127 struct apr_os_proc_mutex_t {
+
127 struct apr_os_proc_mutex_t {
128 #if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
129  /** Value used for SYS V Semaphore, FCNTL and FLOCK serialization */
- +
131 #endif
132 #if APR_HAS_PROC_PTHREAD_SERIALIZE
133  /** Value used for PTHREAD serialization */
-
134  pthread_mutex_t *pthread_interproc;
+
134  pthread_mutex_t *pthread_interproc;
135 #endif
136 #if APR_HAS_THREADS
137  /* If no threads, no need for thread locks */
138 #if APR_USE_PTHREAD_SERIALIZE
139  /** This value is currently unused within APR and Apache */
-
140  pthread_mutex_t *intraproc;
+
140  pthread_mutex_t *intraproc;
141 #endif
142 #endif
143 };
144 
-
145 typedef int apr_os_file_t; /**< native file */
-
146 typedef DIR apr_os_dir_t; /**< native dir */
-
147 typedef int apr_os_sock_t; /**< native dir */
-
148 typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; /**< native process
+
145 typedef int apr_os_file_t; /**< native file */
+
146 typedef DIR apr_os_dir_t; /**< native dir */
+
147 typedef int apr_os_sock_t; /**< native dir */
+
148 typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; /**< native process
149  * mutex
150  */
151 #if APR_HAS_THREADS && APR_HAVE_PTHREAD_H
-
152 typedef pthread_t apr_os_thread_t; /**< native thread */
-
153 typedef pthread_key_t apr_os_threadkey_t; /**< native thread address
+
152 typedef pthread_t apr_os_thread_t; /**< native thread */
+
153 typedef pthread_key_t apr_os_threadkey_t; /**< native thread address
154  * space */
155 #endif
-
156 typedef pid_t apr_os_proc_t; /**< native pid */
-
157 typedef struct timeval apr_os_imp_time_t; /**< native timeval */
-
158 typedef struct tm apr_os_exp_time_t; /**< native tm */
+
156 typedef pid_t apr_os_proc_t; /**< native pid */
+
157 typedef struct timeval apr_os_imp_time_t; /**< native timeval */
+
158 typedef struct tm apr_os_exp_time_t; /**< native tm */
159 /** @var apr_os_dso_handle_t
160  * native dso types
161  */
@@ -257,9 +257,9 @@ var searchBox = new SearchBox("searchBox
166 #include <mach-o/dyld.h>
167 typedef NSModule apr_os_dso_handle_t;
168 #else
-
169 typedef void * apr_os_dso_handle_t;
+
169 typedef void * apr_os_dso_handle_t;
170 #endif
-
171 typedef void* apr_os_shm_t; /**< native SHM */
+
171 typedef void* apr_os_shm_t; /**< native SHM */
172 
173 #endif
174 
@@ -271,22 +271,22 @@ var searchBox = new SearchBox("searchBox
180  * everything APR needs to know about an active socket to construct
181  * an APR socket from it; currently, this is platform-independent
182  */
- -
184  apr_os_sock_t *os_sock; /**< always required */
-
185  struct sockaddr *local; /**< NULL if not yet bound */
-
186  struct sockaddr *remote; /**< NULL if not connected */
-
187  int family; /**< always required (APR_INET, APR_INET6, etc.) */
-
188  int type; /**< always required (SOCK_STREAM, SOCK_DGRAM, etc.) */
-
189  int protocol; /**< 0 or actual protocol (APR_PROTO_SCTP, APR_PROTO_TCP, etc.) */
+ +
184  apr_os_sock_t *os_sock; /**< always required */
+
185  struct sockaddr *local; /**< NULL if not yet bound */
+
186  struct sockaddr *remote; /**< NULL if not connected */
+
187  int family; /**< always required (APR_INET, APR_INET6, etc.) */
+
188  int type; /**< always required (SOCK_STREAM, SOCK_DGRAM, etc.) */
+
189  int protocol; /**< 0 or actual protocol (APR_PROTO_SCTP, APR_PROTO_TCP, etc.) */
190 };
191 
- +
193 
194 #if APR_PROC_MUTEX_IS_GLOBAL || defined(DOXYGEN)
195 /** Opaque global mutex type */
-
196 #define apr_os_global_mutex_t apr_os_proc_mutex_t
+
196 #define apr_os_global_mutex_t apr_os_proc_mutex_t
197 /** @return apr_os_global_mutex */
-
198 #define apr_os_global_mutex_get apr_os_proc_mutex_get
+
198 #define apr_os_global_mutex_get apr_os_proc_mutex_get
199 #else
200  /** Thread and process mutex for those platforms where process mutexes
201  * are not held in threads.
@@ -597,12 +597,88 @@ var searchBox = new SearchBox("searchBox
506 #endif
507 
508 #endif /* ! APR_PORTABLE_H */
+
struct apr_socket_t apr_socket_t
Definition: apr_network_io.h:218
+
apr_status_t apr_os_pipe_put(apr_file_t **file, apr_os_file_t *thefile, apr_pool_t *cont)
+
int type
Definition: apr_portable.h:188
+
struct apr_thread_t apr_thread_t
Definition: apr_thread_proc.h:187
+
APR Network library.
+
Definition: apr_time.h:98
+
int apr_os_thread_equal(apr_os_thread_t tid1, apr_os_thread_t tid2)
+
struct apr_thread_mutex_t apr_thread_mutex_t
Definition: apr_thread_mutex.h:41
+
pid_t apr_os_proc_t
Definition: apr_portable.h:156
+
int protocol
Definition: apr_portable.h:189
+
#define apr_os_global_mutex_t
Definition: apr_portable.h:196
+
pthread_t apr_os_thread_t
Definition: apr_portable.h:152
+
pthread_key_t apr_os_threadkey_t
Definition: apr_portable.h:153
+
APR Dynamic Object Handling Routines.
+
pthread_mutex_t * pthread_interproc
Definition: apr_portable.h:134
+
#define apr_os_global_mutex_get
Definition: apr_portable.h:198
+
apr_status_t apr_os_thread_get(apr_os_thread_t **thethd, apr_thread_t *thd)
+
struct apr_global_mutex_t apr_global_mutex_t
Definition: apr_global_mutex.h:46
+
struct apr_dso_handle_t apr_dso_handle_t
Definition: apr_dso.h:44
+
int apr_os_file_t
Definition: apr_portable.h:145
+
apr_os_sock_t * os_sock
Definition: apr_portable.h:184
+
apr_status_t apr_os_threadkey_put(apr_threadkey_t **key, apr_os_threadkey_t *thekey, apr_pool_t *cont)
+
apr_status_t apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, apr_proc_mutex_t *pmutex)
+
pthread_mutex_t * intraproc
Definition: apr_portable.h:140
+
APR File I/O Handling.
+
struct tm apr_os_exp_time_t
Definition: apr_portable.h:158
+
#define APR_DECLARE(type)
Definition: apr.h:479
+
struct apr_proc_mutex_t apr_proc_mutex_t
Definition: apr_proc_mutex.h:54
+
struct apr_os_proc_mutex_t apr_os_proc_mutex_t
Definition: apr_portable.h:148
+
apr_status_t apr_os_shm_put(apr_shm_t **shm, apr_os_shm_t *osshm, apr_pool_t *cont)
+
struct apr_file_t apr_file_t
Definition: apr_file_io.h:209
+
apr_int64_t apr_time_t
Definition: apr_time.h:46
+
int apr_os_sock_t
Definition: apr_portable.h:147
+
APR memory allocation.
+
APR Global Locking Routines.
+
struct timeval apr_os_imp_time_t
Definition: apr_portable.h:157
+
apr_status_t apr_os_sock_get(apr_os_sock_t *thesock, apr_socket_t *sock)
+
struct apr_shm_t apr_shm_t
Definition: apr_shm.h:43
+
apr_os_thread_t apr_os_thread_current(void)
+
apr_status_t apr_os_sock_make(apr_socket_t **apr_sock, apr_os_sock_info_t *os_sock_info, apr_pool_t *cont)
+
APR Error Codes.
+
APR Shared Memory Routines.
+
APR Platform Definitions.
+
apr_status_t apr_os_shm_get(apr_os_shm_t *osshm, apr_shm_t *shm)
+
Definition: apr_portable.h:183
+
void * apr_os_shm_t
Definition: apr_portable.h:171
+
apr_status_t apr_os_file_get(apr_os_file_t *thefile, apr_file_t *file)
+
DIR apr_os_dir_t
Definition: apr_portable.h:146
+
int family
Definition: apr_portable.h:187
+
apr_status_t apr_os_threadkey_get(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
+
APR Process Locking Routines.
+
apr_status_t apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, apr_os_proc_mutex_t *ospmutex, apr_pool_t *cont)
+
APR Thread and Process Library.
+
apr_status_t apr_os_exp_time_get(apr_os_exp_time_t **ostime, apr_time_exp_t *aprtime)
+
const char * apr_os_locale_encoding(apr_pool_t *pool)
+
struct sockaddr * local
Definition: apr_portable.h:185
+
apr_status_t apr_os_sock_put(apr_socket_t **sock, apr_os_sock_t *thesock, apr_pool_t *cont)
+
apr_status_t apr_os_thread_put(apr_thread_t **thd, apr_os_thread_t *thethd, apr_pool_t *cont)
+
apr_status_t apr_os_dir_put(apr_dir_t **dir, apr_os_dir_t *thedir, apr_pool_t *cont)
+
void * apr_os_dso_handle_t
Definition: apr_portable.h:169
+
apr_status_t apr_os_dso_handle_put(apr_dso_handle_t **dso, apr_os_dso_handle_t thedso, apr_pool_t *pool)
+
apr_status_t apr_os_pipe_put_ex(apr_file_t **file, apr_os_file_t *thefile, int register_cleanup, apr_pool_t *cont)
+
int crossproc
Definition: apr_portable.h:130
+
apr_status_t apr_os_imp_time_get(apr_os_imp_time_t **ostime, apr_time_t *aprtime)
+
apr_status_t apr_os_exp_time_put(apr_time_exp_t *aprtime, apr_os_exp_time_t **ostime, apr_pool_t *cont)
+
struct apr_pool_t apr_pool_t
Definition: apr_pools.h:60
+
struct sockaddr * remote
Definition: apr_portable.h:186
+
int apr_status_t
Definition: apr_errno.h:44
+
struct apr_threadkey_t apr_threadkey_t
Definition: apr_thread_proc.h:199
+
APR Time Library.
+
struct apr_dir_t apr_dir_t
Definition: apr_file_info.h:121
+
apr_status_t apr_os_dso_handle_get(apr_os_dso_handle_t *dso, apr_dso_handle_t *aprdso)
+
apr_status_t apr_os_imp_time_put(apr_time_t *aprtime, apr_os_imp_time_t **ostime, apr_pool_t *cont)
+
apr_status_t apr_os_dir_get(apr_os_dir_t **thedir, apr_dir_t *dir)
+
apr_status_t apr_os_file_put(apr_file_t **file, apr_os_file_t *thefile, apr_int32_t flags, apr_pool_t *cont)
+
const char * apr_os_default_encoding(apr_pool_t *pool)
Modified: apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_proc_mutex.h File Reference @@ -30,7 +30,7 @@ - + @@ -151,9 +151,9 @@ Functions Modified: apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h_source.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h_source.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h_source.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__proc__mutex_8h_source.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_proc_mutex.h Source File @@ -30,7 +30,7 @@ - + @@ -113,9 +113,9 @@ var searchBox = new SearchBox("searchBox
22  * @brief APR Process Locking Routines
23  */
24 
-
25 #include "apr.h"
-
26 #include "apr_pools.h"
-
27 #include "apr_errno.h"
+
25 #include "apr.h"
+
26 #include "apr_pools.h"
+
27 #include "apr_errno.h"
28 
29 #ifdef __cplusplus
30 extern "C" {
@@ -132,17 +132,17 @@ var searchBox = new SearchBox("searchBox
41  * @warning Check APR_HAS_foo_SERIALIZE defines to see if the platform supports
42  * APR_LOCK_foo. Only APR_LOCK_DEFAULT is portable.
43  */
-
44 typedef enum {
-
45  APR_LOCK_FCNTL, /**< fcntl() */
-
46  APR_LOCK_FLOCK, /**< flock() */
-
47  APR_LOCK_SYSVSEM, /**< System V Semaphores */
-
48  APR_LOCK_PROC_PTHREAD, /**< POSIX pthread process-based locking */
-
49  APR_LOCK_POSIXSEM, /**< POSIX semaphore process-based locking */
-
50  APR_LOCK_DEFAULT /**< Use the default process lock */
+
44 typedef enum {
+
45  APR_LOCK_FCNTL, /**< fcntl() */
+
46  APR_LOCK_FLOCK, /**< flock() */
+
47  APR_LOCK_SYSVSEM, /**< System V Semaphores */
+
48  APR_LOCK_PROC_PTHREAD, /**< POSIX pthread process-based locking */
+
49  APR_LOCK_POSIXSEM, /**< POSIX semaphore process-based locking */
+
50  APR_LOCK_DEFAULT /**< Use the default process lock */
52 
53 /** Opaque structure representing a process mutex. */
- +
55 
56 /* Function definitions */
57 
@@ -255,12 +255,37 @@ var searchBox = new SearchBox("searchBox
164 #endif
165 
166 #endif /* ! APR_PROC_MUTEX_H */
+
Definition: apr_proc_mutex.h:47
+
const char * apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
+
Definition: apr_proc_mutex.h:49
+
Definition: apr_proc_mutex.h:48
+
Definition: apr_proc_mutex.h:45
+
Definition: apr_proc_mutex.h:50
+
const char * apr_proc_mutex_defname(void)
+
#define APR_DECLARE(type)
Definition: apr.h:479
+
apr_status_t apr_proc_mutex_child_init(apr_proc_mutex_t **mutex, const char *fname, apr_pool_t *pool)
+
Definition: apr_proc_mutex.h:46
+
struct apr_proc_mutex_t apr_proc_mutex_t
Definition: apr_proc_mutex.h:54
+
APR memory allocation.
+
apr_status_t apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
+
apr_status_t apr_proc_mutex_create(apr_proc_mutex_t **mutex, const char *fname, apr_lockmech_e mech, apr_pool_t *pool)
+
APR Error Codes.
+
apr_lockmech_e
Definition: apr_proc_mutex.h:44
+
APR Platform Definitions.
+
const char * apr_proc_mutex_name(apr_proc_mutex_t *mutex)
+
apr_status_t apr_proc_mutex_unlock(apr_proc_mutex_t *mutex)
+
struct apr_pool_t apr_pool_t
Definition: apr_pools.h:60
+
apr_status_t apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
+
int apr_status_t
Definition: apr_errno.h:44
+
apr_status_t apr_proc_mutex_cleanup(void *mutex)
+
apr_status_t apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
+
#define APR_POOL_DECLARE_ACCESSOR(type)
Definition: apr_pools.h:81
Modified: apr/site/trunk/docs/docs/apr/1.5/apr__random_8h.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__random_8h.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__random_8h.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__random_8h.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_random.h File Reference @@ -30,7 +30,7 @@ - + @@ -151,9 +151,9 @@ Functions