[core] rename lib apr symbols to fspr

This commit is contained in:
Chris Rienzo authored and Andrey Volk committed 2022-08-29 20:17:08 +03:00
1 parent 3c7e8ff989
commit 5c2726f413
354 files changed
+11614 -11614

No files matched your search

+42 -42
View File
@@ -14,13 +14,13 @@
* limitations under the License.
*/
#include "apr_arch_poll_private.h"
#include "fspr_arch_poll_private.h"
#ifdef POLLSET_USES_KQUEUE
static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags)
static fspr_int16_t get_kqueue_revent(fspr_int16_t event, fspr_int16_t flags)
{
apr_int16_t rv = 0;
fspr_int16_t rv = 0;
if (event == EVFILT_READ)
rv |= APR_POLLIN;
@@ -34,19 +34,19 @@ static apr_int16_t get_kqueue_revent(apr_int16_t event, apr_int16_t flags)
return rv;
}
struct apr_pollset_t
struct fspr_pollset_t
{
apr_pool_t *pool;
apr_uint32_t nelts;
apr_uint32_t nalloc;
fspr_pool_t *pool;
fspr_uint32_t nelts;
fspr_uint32_t nalloc;
int kqueue_fd;
struct kevent kevent;
struct kevent *ke_set;
apr_pollfd_t *result_set;
apr_uint32_t flags;
fspr_pollfd_t *result_set;
fspr_uint32_t flags;
#if APR_HAS_THREADS
/* A thread mutex to protect operations on the rings */
apr_thread_mutex_t *ring_lock;
fspr_thread_mutex_t *ring_lock;
#endif
/* A ring containing all of the pollfd_t that are active */
APR_RING_HEAD(pfd_query_ring_t, pfd_elem_t) query_ring;
@@ -57,23 +57,23 @@ struct apr_pollset_t
APR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring;
};
static apr_status_t backend_cleanup(void *p_)
static fspr_status_t backend_cleanup(void *p_)
{
apr_pollset_t *pollset = (apr_pollset_t *) p_;
fspr_pollset_t *pollset = (fspr_pollset_t *) p_;
close(pollset->kqueue_fd);
return APR_SUCCESS;
}
APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
apr_uint32_t size,
apr_pool_t *p,
apr_uint32_t flags)
APR_DECLARE(fspr_status_t) fspr_pollset_create(fspr_pollset_t **pollset,
fspr_uint32_t size,
fspr_pool_t *p,
fspr_uint32_t flags)
{
apr_status_t rv = APR_SUCCESS;
*pollset = apr_palloc(p, sizeof(**pollset));
fspr_status_t rv = APR_SUCCESS;
*pollset = fspr_palloc(p, sizeof(**pollset));
#if APR_HAS_THREADS
if (flags & APR_POLLSET_THREADSAFE &&
((rv = apr_thread_mutex_create(&(*pollset)->ring_lock,
((rv = fspr_thread_mutex_create(&(*pollset)->ring_lock,
APR_THREAD_MUTEX_DEFAULT,
p) != APR_SUCCESS))) {
*pollset = NULL;
@@ -91,7 +91,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
(*pollset)->pool = p;
(*pollset)->ke_set =
(struct kevent *) apr_palloc(p, size * sizeof(struct kevent));
(struct kevent *) fspr_palloc(p, size * sizeof(struct kevent));
memset((*pollset)->ke_set, 0, size * sizeof(struct kevent));
@@ -101,10 +101,10 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
return APR_ENOMEM;
}
apr_pool_cleanup_register(p, (void *) (*pollset), backend_cleanup,
apr_pool_cleanup_null);
fspr_pool_cleanup_register(p, (void *) (*pollset), backend_cleanup,
fspr_pool_cleanup_null);
(*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
(*pollset)->result_set = fspr_palloc(p, size * sizeof(fspr_pollfd_t));
APR_RING_INIT(&(*pollset)->query_ring, pfd_elem_t, link);
APR_RING_INIT(&(*pollset)->free_ring, pfd_elem_t, link);
@@ -113,17 +113,17 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
return rv;
}
APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t * pollset)
APR_DECLARE(fspr_status_t) fspr_pollset_destroy(fspr_pollset_t * pollset)
{
return apr_pool_cleanup_run(pollset->pool, pollset, backend_cleanup);
return fspr_pool_cleanup_run(pollset->pool, pollset, backend_cleanup);
}
APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
const apr_pollfd_t *descriptor)
APR_DECLARE(fspr_status_t) fspr_pollset_add(fspr_pollset_t *pollset,
const fspr_pollfd_t *descriptor)
{
apr_os_sock_t fd;
fspr_os_sock_t fd;
pfd_elem_t *elem;
apr_status_t rv = APR_SUCCESS;
fspr_status_t rv = APR_SUCCESS;
pollset_lock_rings();
@@ -132,7 +132,7 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
APR_RING_REMOVE(elem, link);
}
else {
elem = (pfd_elem_t *) apr_palloc(pollset->pool, sizeof(pfd_elem_t));
elem = (pfd_elem_t *) fspr_palloc(pollset->pool, sizeof(pfd_elem_t));
APR_RING_ELEM_INIT(elem, link);
}
elem->pfd = *descriptor;
@@ -175,12 +175,12 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
return rv;
}
APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
const apr_pollfd_t *descriptor)
APR_DECLARE(fspr_status_t) fspr_pollset_remove(fspr_pollset_t *pollset,
const fspr_pollfd_t *descriptor)
{
pfd_elem_t *ep;
apr_status_t rv = APR_SUCCESS;
apr_os_sock_t fd;
fspr_status_t rv = APR_SUCCESS;
fspr_os_sock_t fd;
pollset_lock_rings();
@@ -229,21 +229,21 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
return rv;
}
APR_DECLARE(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_DECLARE(fspr_status_t) fspr_pollset_poll(fspr_pollset_t *pollset,
fspr_interval_time_t timeout,
fspr_int32_t *num,
const fspr_pollfd_t **descriptors)
{
int ret, i;
struct timespec tv, *tvptr;
apr_status_t rv = APR_SUCCESS;
fspr_status_t rv = APR_SUCCESS;
if (timeout < 0) {
tvptr = NULL;
}
else {
tv.tv_sec = (long) apr_time_sec(timeout);
tv.tv_nsec = (long) apr_time_msec(timeout);
tv.tv_sec = (long) fspr_time_sec(timeout);
tv.tv_nsec = (long) fspr_time_msec(timeout);
tvptr = &tv;
}
@@ -251,7 +251,7 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
tvptr);
(*num) = ret;
if (ret < 0) {
rv = apr_get_netos_error();
rv = fspr_get_netos_error();
}
else if (ret == 0) {
rv = APR_TIMEUP;