diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_support.h | 2 | ||||
| -rw-r--r-- | include/arch/netware/apr_arch_file_io.h | 4 | ||||
| -rw-r--r-- | include/arch/os2/apr_arch_file_io.h | 4 | ||||
| -rw-r--r-- | include/arch/os2/apr_arch_networkio.h | 5 | ||||
| -rw-r--r-- | include/arch/unix/apr_arch_file_io.h | 4 | ||||
| -rw-r--r-- | include/arch/unix/apr_arch_networkio.h | 4 | ||||
| -rw-r--r-- | include/arch/win32/apr_arch_file_io.h | 4 | ||||
| -rw-r--r-- | include/arch/win32/apr_arch_networkio.h | 4 |
8 files changed, 31 insertions, 0 deletions
diff --git a/include/apr_support.h b/include/apr_support.h index 50a4789e6..8b3f257f5 100644 --- a/include/apr_support.h +++ b/include/apr_support.h @@ -76,6 +76,8 @@ extern "C" { /** * Wait for IO to occur or timeout. + * + * Uses POOL for temporary allocations. */ apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s, int for_read); diff --git a/include/arch/netware/apr_arch_file_io.h b/include/arch/netware/apr_arch_file_io.h index e17a7004e..54dabe29b 100644 --- a/include/arch/netware/apr_arch_file_io.h +++ b/include/arch/netware/apr_arch_file_io.h @@ -63,6 +63,7 @@ #include "apr_file_info.h" #include "apr_errno.h" #include "apr_lib.h" +#include "apr_poll.h" /* System headers the file I/O library needs */ #if APR_HAVE_FCNTL_H @@ -120,6 +121,9 @@ struct apr_file_t { enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking; int ungetchar; /* Last char provided by an unget op. (-1 = no char)*/ + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; + /* Stuff for buffered mode */ char *buffer; int bufpos; /* Read/Write position in buffer */ diff --git a/include/arch/os2/apr_arch_file_io.h b/include/arch/os2/apr_arch_file_io.h index 3fb44bdd6..624b7445d 100644 --- a/include/arch/os2/apr_arch_file_io.h +++ b/include/arch/os2/apr_arch_file_io.h @@ -61,6 +61,7 @@ #include "apr_file_io.h" #include "apr_file_info.h" #include "apr_errno.h" +#include "apr_poll.h" /* We have an implementation of mkstemp but it's not very multi-threading * friendly & is part of the POSIX emulation rather than native so don't @@ -83,6 +84,9 @@ struct apr_file_t { HEV pipeSem; enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking; + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; + /* Stuff for buffered mode */ char *buffer; int bufpos; // Read/Write position in buffer diff --git a/include/arch/os2/apr_arch_networkio.h b/include/arch/os2/apr_arch_networkio.h index fbb9cb989..dd93fa24c 100644 --- a/include/arch/os2/apr_arch_networkio.h +++ b/include/arch/os2/apr_arch_networkio.h @@ -59,6 +59,8 @@ #include "apr_network_io.h" #include "apr_general.h" #include "apr_arch_os2calls.h" +#include "apr_poll.h" + #if APR_HAVE_NETDB_H #include <netdb.h> #endif @@ -85,6 +87,9 @@ struct apr_socket_t { apr_int32_t options; apr_int32_t inherit; sock_userdata_t *userdata; + + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; }; /* Error codes returned from sock_errno() */ diff --git a/include/arch/unix/apr_arch_file_io.h b/include/arch/unix/apr_arch_file_io.h index f04b41517..aea12e791 100644 --- a/include/arch/unix/apr_arch_file_io.h +++ b/include/arch/unix/apr_arch_file_io.h @@ -64,6 +64,7 @@ #include "apr_errno.h" #include "apr_lib.h" #include "apr_thread_mutex.h" +#include "apr_poll.h" /* System headers the file I/O library needs */ #if APR_HAVE_FCNTL_H @@ -131,6 +132,9 @@ struct apr_file_t { enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking; int ungetchar; /* Last char provided by an unget op. (-1 = no char)*/ + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; + /* Stuff for buffered mode */ char *buffer; int bufpos; /* Read/Write position in buffer */ diff --git a/include/arch/unix/apr_arch_networkio.h b/include/arch/unix/apr_arch_networkio.h index 0af3c482d..4938cf6bc 100644 --- a/include/arch/unix/apr_arch_networkio.h +++ b/include/arch/unix/apr_arch_networkio.h @@ -61,6 +61,7 @@ #include "apr_errno.h" #include "apr_general.h" #include "apr_lib.h" +#include "apr_poll.h" /* System headers the network I/O library needs */ #if APR_HAVE_SYS_TYPES_H @@ -152,6 +153,9 @@ struct apr_socket_t { apr_int32_t options; apr_int32_t inherit; sock_userdata_t *userdata; + + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; }; const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size); diff --git a/include/arch/win32/apr_arch_file_io.h b/include/arch/win32/apr_arch_file_io.h index 30e863a83..c5dd2103f 100644 --- a/include/arch/win32/apr_arch_file_io.h +++ b/include/arch/win32/apr_arch_file_io.h @@ -65,6 +65,7 @@ #include "apr_file_info.h" #include "apr_errno.h" #include "apr_arch_misc.h" +#include "apr_poll.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -215,6 +216,9 @@ struct apr_file_t { apr_off_t filePtr; // position in file of handle apr_thread_mutex_t *mutex; // mutex semaphore, must be owned to access the above fields + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; + /* Pipe specific info */ }; diff --git a/include/arch/win32/apr_arch_networkio.h b/include/arch/win32/apr_arch_networkio.h index 2897e0d17..4aab1dc13 100644 --- a/include/arch/win32/apr_arch_networkio.h +++ b/include/arch/win32/apr_arch_networkio.h @@ -57,6 +57,7 @@ #include "apr_network_io.h" #include "apr_general.h" +#include "apr_poll.h" typedef struct sock_userdata_t sock_userdata_t; struct sock_userdata_t { @@ -81,6 +82,9 @@ struct apr_socket_t { apr_int32_t options; apr_int32_t inherit; sock_userdata_t *userdata; + + /* if there is a timeout set, then this pollset is used */ + apr_pollset_t *pollset; }; #ifdef _WIN32_WCE |