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 F309411780 for ; Sat, 20 Sep 2014 12:34:44 +0000 (UTC) Received: (qmail 11405 invoked by uid 500); 20 Sep 2014 12:34:44 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 11343 invoked by uid 500); 20 Sep 2014 12:34:44 -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 11334 invoked by uid 99); 20 Sep 2014 12:34:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Sep 2014 12:34:44 +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:33:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E43D22388C06; Sat, 20 Sep 2014 12:33:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1626428 [9/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: <20140920123320.E43D22388C06@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_poll.h File Reference @@ -30,7 +30,7 @@ - + @@ -208,9 +208,9 @@ Functions Modified: apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h_source.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h_source.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h_source.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__poll_8h_source.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_poll.h Source File @@ -30,7 +30,7 @@ - + @@ -111,12 +111,12 @@ var searchBox = new SearchBox("searchBox
20  * @file apr_poll.h
21  * @brief APR Poll interface
22  */
-
23 #include "apr.h"
-
24 #include "apr_pools.h"
-
25 #include "apr_errno.h"
-
26 #include "apr_inherit.h"
-
27 #include "apr_file_io.h"
-
28 #include "apr_network_io.h"
+
23 #include "apr.h"
+
24 #include "apr_pools.h"
+
25 #include "apr_errno.h"
+
26 #include "apr_inherit.h"
+
27 #include "apr_file_io.h"
+
28 #include "apr_network_io.h"
29 
30 #if APR_HAVE_NETINET_IN_H
31 #include <netinet/in.h>
@@ -137,12 +137,12 @@ var searchBox = new SearchBox("searchBox
46  * @ingroup apr_poll
47  * @{
48  */
-
49 #define APR_POLLIN 0x001 /**< Can read without blocking */
-
50 #define APR_POLLPRI 0x002 /**< Priority data available */
-
51 #define APR_POLLOUT 0x004 /**< Can write without blocking */
-
52 #define APR_POLLERR 0x010 /**< Pending error */
-
53 #define APR_POLLHUP 0x020 /**< Hangup occurred */
-
54 #define APR_POLLNVAL 0x040 /**< Descriptor invalid */
+
49 #define APR_POLLIN 0x001 /**< Can read without blocking */
+
50 #define APR_POLLPRI 0x002 /**< Priority data available */
+
51 #define APR_POLLOUT 0x004 /**< Can write without blocking */
+
52 #define APR_POLLERR 0x010 /**< Pending error */
+
53 #define APR_POLLHUP 0x020 /**< Hangup occurred */
+
54 #define APR_POLLNVAL 0x040 /**< Descriptor invalid */
55 /** @} */
56 
57 /**
@@ -150,22 +150,22 @@ var searchBox = new SearchBox("searchBox
59  * @ingroup apr_poll
60  * @{
61  */
-
62 #define APR_POLLSET_THREADSAFE 0x001 /**< Adding or removing a descriptor is
+
62 #define APR_POLLSET_THREADSAFE 0x001 /**< Adding or removing a descriptor is
63  * thread-safe
64  */
65 #define APR_POLLSET_NOCOPY 0x002 /**< Descriptors passed to apr_pollset_add()
66  * are not copied
-
67  */
+
67  */
68 #define APR_POLLSET_WAKEABLE 0x004 /**< Poll operations are interruptable by
69  * apr_pollset_wakeup()
70  */
71 #define APR_POLLSET_NODEFAULT 0x010 /**< Do not try to use the default method if
-
72  * the specified non-default method cannot be
+
72  * the specified non-default method cannot be
73  * used
74  */
75 /** @} */
76 
-
77 /**
+
77 /**
78  * Pollset Methods
79  */
80 typedef enum {
@@ -177,41 +177,41 @@ var searchBox = new SearchBox("searchBox
86  APR_POLLSET_POLL, /**< Poll uses poll method */
87  APR_POLLSET_AIO_MSGQ /**< Poll uses z/OS asio method */
-
89 
-
90 /** Used in apr_pollfd_t to determine what the apr_descriptor is */
-
91 typedef enum {
-
92  APR_NO_DESC, /**< nothing here */
-
93  APR_POLL_SOCKET, /**< descriptor refers to a socket */
-
94  APR_POLL_FILE, /**< descriptor refers to a file */
-
95  APR_POLL_LASTDESC /**< @deprecated descriptor is the last one in the list */
- +
89 
+
90 /** Used in apr_pollfd_t to determine what the apr_descriptor is */
+
91 typedef enum {
+
92  APR_NO_DESC, /**< nothing here */
+
93  APR_POLL_SOCKET, /**< descriptor refers to a socket */
+
94  APR_POLL_FILE, /**< descriptor refers to a file */
+
95  APR_POLL_LASTDESC /**< @deprecated descriptor is the last one in the list */
+
97 
98 /** Union of either an APR file or socket. */
99 typedef union {
-
100  apr_file_t *f; /**< file */
-
101  apr_socket_t *s; /**< socket */
- - -
104 /** @see apr_pollfd_t */
+
100  apr_file_t *f; /**< file */
+
101  apr_socket_t *s; /**< socket */
+ + +
104 /** @see apr_pollfd_t */
105 typedef struct apr_pollfd_t apr_pollfd_t;
106 
107 /** Poll descriptor set. */
-
108 struct apr_pollfd_t {
-
109  apr_pool_t *p; /**< associated pool */
-
110  apr_datatype_e desc_type; /**< descriptor type */
+
108 struct apr_pollfd_t {
+
109  apr_pool_t *p; /**< associated pool */
+
110  apr_datatype_e desc_type; /**< descriptor type */
111  apr_int16_t reqevents; /**< requested events */
112  apr_int16_t rtnevents; /**< returned events */
113  apr_descriptor desc; /**< @see apr_descriptor */
-
114  void *client_data; /**< allows app to associate context */
+
114  void *client_data; /**< allows app to associate context */
115 };
116 
- -
118 /* General-purpose poll API for arbitrarily large numbers of
-
119  * file descriptors
-
120  */
- -
122 /** Opaque structure used for pollset API */
- + +
118 /* General-purpose poll API for arbitrarily large numbers of
+
119  * file descriptors
+
120  */
+ +
122 /** Opaque structure used for pollset API */
+
124 
125 /**
126  * Set up a pollset object
@@ -220,7 +220,7 @@ var searchBox = new SearchBox("searchBox
129  * @param p The pool from which to allocate the pollset
130  * @param flags Optional flags to modify the operation of the pollset.
131  *
-
132  * @remark If flags contains APR_POLLSET_THREADSAFE, then a pollset is
+
132  * @remark If flags contains APR_POLLSET_THREADSAFE, then a pollset is
133  * created on which it is safe to make concurrent calls to
134  * apr_pollset_add(), apr_pollset_remove() and apr_pollset_poll()
135  * from separate threads. This feature is only supported on some
@@ -414,7 +414,7 @@ var searchBox = new SearchBox("searchBox
323  * @param p The pool from which to allocate the pollcb
324  * @param flags Optional flags to modify the operation of the pollcb.
325  *
-
326  * @remark Pollcb is only supported on some platforms; the apr_pollcb_create()
+
326  * @remark Pollcb is only supported on some platforms; the apr_pollcb_create()
327  * call will fail with APR_ENOTIMPL on platforms where it is not supported.
328  */
329 APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
@@ -486,7 +486,7 @@ var searchBox = new SearchBox("searchBox
395  * maximum, not a minimum. If a descriptor is signalled, the
396  * function will return before this time. If timeout is
397  * negative, the function will block until a descriptor is
-
398  * signalled.
+
398  * signalled.
399  * @param func Callback function to call for each active descriptor.
400  * @param baton Opaque baton passed to the callback function.
401  * @remark Multiple signalled conditions for the same descriptor may be reported
@@ -506,12 +506,63 @@ var searchBox = new SearchBox("searchBox
415 
416 #endif /* ! APR_POLL_H */
417 
+
Definition: apr_poll.h:108
+
struct apr_socket_t apr_socket_t
Definition: apr_network_io.h:218
+
apr_status_t apr_pollcb_create_ex(apr_pollcb_t **pollcb, apr_uint32_t size, apr_pool_t *p, apr_uint32_t flags, apr_pollset_method_e method)
+
Definition: apr_poll.h:101
+
APR Network library.
+
Definition: apr_poll.h:92
+
apr_datatype_e desc_type
Definition: apr_poll.h:119
+
Definition: apr_poll.h:103
+
apr_status_t apr_pollset_remove(apr_pollset_t *pollset, const apr_pollfd_t *descriptor)
+
apr_pollset_method_e
Definition: apr_poll.h:89
+
Definition: apr_poll.h:91
+
APR File Handle Inheritance Helpers.
+
apr_status_t apr_pollset_create_ex(apr_pollset_t **pollset, apr_uint32_t size, apr_pool_t *p, apr_uint32_t flags, apr_pollset_method_e method)
+
apr_status_t apr_pollcb_create(apr_pollcb_t **pollcb, apr_uint32_t size, apr_pool_t *p, apr_uint32_t flags)
+
apr_datatype_e
Definition: apr_poll.h:100
+
APR File I/O Handling.
+
apr_int64_t apr_interval_time_t
Definition: apr_time.h:56
+
apr_status_t apr_pollcb_add(apr_pollcb_t *pollcb, apr_pollfd_t *descriptor)
+
apr_int16_t reqevents
Definition: apr_poll.h:120
+
#define APR_DECLARE(type)
Definition: apr.h:479
+
apr_status_t(* apr_pollcb_cb_t)(void *baton, apr_pollfd_t *descriptor)
Definition: apr_poll.h:398
+
Definition: apr_poll.h:95
+
struct apr_file_t apr_file_t
Definition: apr_file_io.h:209
+
APR memory allocation.
+
apr_pool_t * p
Definition: apr_poll.h:118
+
apr_status_t apr_pollset_wakeup(apr_pollset_t *pollset)
+
apr_descriptor desc
Definition: apr_poll.h:122
+
Definition: apr_poll.h:117
+
struct apr_pollset_t apr_pollset_t
Definition: apr_poll.h:132
+
APR Error Codes.
+
APR Platform Definitions.
+
const char * apr_poll_method_defname(void)
+
Definition: apr_poll.h:94
+
const char * apr_pollset_method_name(apr_pollset_t *pollset)
+
apr_int16_t rtnevents
Definition: apr_poll.h:121
+
apr_status_t apr_pollset_destroy(apr_pollset_t *pollset)
+
apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t numsock, apr_int32_t *nsds, apr_interval_time_t timeout)
+
Definition: apr_poll.h:102
+
void * client_data
Definition: apr_poll.h:123
+
Definition: apr_poll.h:93
+
apr_status_t apr_pollset_create(apr_pollset_t **pollset, apr_uint32_t size, apr_pool_t *p, apr_uint32_t flags)
+
struct apr_pollcb_t apr_pollcb_t
Definition: apr_poll.h:326
+
Definition: apr_poll.h:90
+
struct apr_pool_t apr_pool_t
Definition: apr_pools.h:60
+
apr_status_t apr_pollcb_remove(apr_pollcb_t *pollcb, apr_pollfd_t *descriptor)
+
int apr_status_t
Definition: apr_errno.h:44
+
apr_status_t apr_pollset_add(apr_pollset_t *pollset, const apr_pollfd_t *descriptor)
+
Definition: apr_poll.h:104
+
apr_status_t apr_pollset_poll(apr_pollset_t *pollset, apr_interval_time_t timeout, apr_int32_t *num, const apr_pollfd_t **descriptors)
+
apr_status_t apr_pollcb_poll(apr_pollcb_t *pollcb, apr_interval_time_t timeout, apr_pollcb_cb_t func, void *baton)
+
Definition: apr_poll.h:96
Modified: apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_pools.h File Reference @@ -30,7 +30,7 @@ - + @@ -227,9 +227,9 @@ Functions Modified: apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h_source.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h_source.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h_source.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__pools_8h_source.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_pools.h Source File @@ -30,7 +30,7 @@ - + @@ -131,11 +131,11 @@ var searchBox = new SearchBox("searchBox
40  * accesses the parent pool.
41  */
42 
-
43 #include "apr.h"
-
44 #include "apr_errno.h"
-
45 #include "apr_general.h" /* for APR_STRINGIFY */
-
46 #define APR_WANT_MEMFUNC /**< for no good reason? */
-
47 #include "apr_want.h"
+
43 #include "apr.h"
+
44 #include "apr_errno.h"
+
45 #include "apr_general.h" /* for APR_STRINGIFY */
+
46 #define APR_WANT_MEMFUNC /**< for no good reason? */
+
47 #include "apr_want.h"
48 
49 #ifdef __cplusplus
50 extern "C" {
@@ -148,7 +148,7 @@ var searchBox = new SearchBox("searchBox
57  */
58 
59 /** The fundamental pool type */
-
60 typedef struct apr_pool_t apr_pool_t;
+
60 typedef struct apr_pool_t apr_pool_t;
61 
62 
63 /**
@@ -169,7 +169,7 @@ var searchBox = new SearchBox("searchBox
78  * @remark the linkage is specified for APR. It would be possible to expand
79  * the macros to support other linkages.
80  */
-
81 #define APR_POOL_DECLARE_ACCESSOR(type) \
+
81 #define APR_POOL_DECLARE_ACCESSOR(type) \
82  APR_DECLARE(apr_pool_t *) apr_##type##_pool_get \
83  (const apr_##type##_t *the##type)
84 
@@ -179,7 +179,7 @@ var searchBox = new SearchBox("searchBox
88  * In the implementation, the APR_POOL_IMPLEMENT_ACCESSOR() is used to
89  * actually define the function. It assumes the field is named "pool".
90  */
-
91 #define APR_POOL_IMPLEMENT_ACCESSOR(type) \
+
91 #define APR_POOL_IMPLEMENT_ACCESSOR(type) \
92  APR_DECLARE(apr_pool_t *) apr_##type##_pool_get \
93  (const apr_##type##_t *the##type) \
94  { return the##type->pool; }
@@ -231,12 +231,12 @@ var searchBox = new SearchBox("searchBox
140 #endif
141 
142 /** the place in the code where the particular function was called */
-
143 #define APR_POOL__FILE_LINE__ __FILE__ ":" APR_STRINGIFY(__LINE__)
+
143 #define APR_POOL__FILE_LINE__ __FILE__ ":" APR_STRINGIFY(__LINE__)
144 
145 
146 
147 /** A function that is called when allocation fails. */
-
148 typedef int (*apr_abortfunc_t)(int retcode);
+
148 typedef int (*apr_abortfunc_t)(int retcode);
149 
150 /*
151  * APR memory structure manipulators (pools, tables, and arrays).
@@ -904,12 +904,60 @@ var searchBox = new SearchBox("searchBox
813 #endif
814 
815 #endif /* !APR_POOLS_H */
+
void * apr_pcalloc_debug(apr_pool_t *p, apr_size_t size, const char *file_line)
+
apr_status_t apr_pool_create_core_ex(apr_pool_t **newpool, apr_abortfunc_t abort_fn, apr_allocator_t *allocator)
+
void apr_pool_destroy(apr_pool_t *p)
+
apr_pool_t * apr_pool_parent_get(apr_pool_t *pool)
+
void apr_pool_cleanup_for_exec(void)
+
void apr_pool_tag(apr_pool_t *pool, const char *tag)
+
apr_status_t apr_pool_userdata_set(const void *data, const char *key, apr_status_t(*cleanup)(void *), apr_pool_t *pool)
+
#define APR_DECLARE_NONSTD(type)
Definition: apr.h:492
+
void apr_pool_terminate(void)
+
apr_status_t apr_pool_create_core_ex_debug(apr_pool_t **newpool, apr_abortfunc_t abort_fn, apr_allocator_t *allocator, const char *file_line)
+
apr_status_t apr_pool_create_ex_debug(apr_pool_t **newpool, apr_pool_t *parent, apr_abortfunc_t abort_fn, apr_allocator_t *allocator, const char *file_line)
+
void apr_pool_lock(apr_pool_t *pool, int flag)
+
void * apr_pcalloc(apr_pool_t *p, apr_size_t size)
+
struct apr_allocator_t apr_allocator_t
Definition: apr_allocator.h:41
+
APR Standard Headers Support.
+
apr_size_t apr_pool_num_bytes(apr_pool_t *p, int recurse)
+
APR Miscellaneous library routines.
+
#define APR_DECLARE(type)
Definition: apr.h:479
+
apr_status_t apr_pool_cleanup_run(apr_pool_t *p, void *data, apr_status_t(*cleanup)(void *))
+
void apr_pool_cleanup_kill(apr_pool_t *p, const void *data, apr_status_t(*cleanup)(void *))
+
void apr_pool_pre_cleanup_register(apr_pool_t *p, const void *data, apr_status_t(*plain_cleanup)(void *))
+
void * apr_palloc(apr_pool_t *p, apr_size_t size)
+
apr_status_t apr_pool_create_ex(apr_pool_t **newpool, apr_pool_t *parent, apr_abortfunc_t abort_fn, apr_allocator_t *allocator)
+
apr_status_t apr_pool_create_core(apr_pool_t **newpool)
+
APR Error Codes.
+
APR Platform Definitions.
+
void apr_pool_clear(apr_pool_t *p)
+
apr_status_t apr_pool_userdata_setn(const void *data, const char *key, apr_status_t(*cleanup)(void *), apr_pool_t *pool)
+
void apr_pool_destroy_debug(apr_pool_t *p, const char *file_line)
+
void apr_pool_abort_set(apr_abortfunc_t abortfunc, apr_pool_t *pool)
+
void apr_pool_clear_debug(apr_pool_t *p, const char *file_line)
+
apr_status_t apr_pool_create_unmanaged_ex(apr_pool_t **newpool, apr_abortfunc_t abort_fn, apr_allocator_t *allocator)
+
void apr_pool_child_cleanup_set(apr_pool_t *p, const void *data, apr_status_t(*plain_cleanup)(void *), apr_status_t(*child_cleanup)(void *))
+
apr_pool_t * apr_pool_find(const void *mem)
+
apr_allocator_t * apr_pool_allocator_get(apr_pool_t *pool)
+
apr_status_t apr_pool_cleanup_null(void *data)
+
int(* apr_abortfunc_t)(int retcode)
Definition: apr_pools.h:148
+
struct apr_pool_t apr_pool_t
Definition: apr_pools.h:60
+
void apr_pool_cleanup_register(apr_pool_t *p, const void *data, apr_status_t(*plain_cleanup)(void *), apr_status_t(*child_cleanup)(void *))
+
int apr_status_t
Definition: apr_errno.h:44
+
apr_status_t apr_pool_userdata_get(void **data, const char *key, apr_pool_t *pool)
+
apr_status_t apr_pool_initialize(void)
+
void apr_pool_join(apr_pool_t *p, apr_pool_t *sub)
+
apr_abortfunc_t apr_pool_abort_get(apr_pool_t *pool)
+
int apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
+
void * apr_palloc_debug(apr_pool_t *p, apr_size_t size, const char *file_line)
+
apr_status_t apr_pool_create(apr_pool_t **newpool, apr_pool_t *parent)
+
apr_status_t apr_pool_create_unmanaged_ex_debug(apr_pool_t **newpool, apr_abortfunc_t abort_fn, apr_allocator_t *allocator, const char *file_line)
Modified: apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h.html URL: http://svn.apache.org/viewvc/apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h.html?rev=1626428&r1=1626427&r2=1626428&view=diff ============================================================================== --- apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h.html (original) +++ apr/site/trunk/docs/docs/apr/1.5/apr__portable_8h.html Sat Sep 20 12:33:08 2014 @@ -3,7 +3,7 @@ - + Apache Portable Runtime: apr_portable.h File Reference @@ -30,7 +30,7 @@ - + @@ -219,9 +219,9 @@ Functions