ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpoll/startup: log on INFO level at startup, which mechanism is used

This commit is contained in:
Heikki Hannikainen 2012-10-11 01:57:36 +03:00
parent 6fdc122a51
commit 39f8f43b64
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/aprsc.c
View File

@ -854,7 +854,8 @@ int main(int argc, char **argv)
if (have_low_ports)
hlog(LOG_INFO, "POSIX capabilities available: can bind low ports");
hlog(LOG_INFO, "After configuration FileLimit is %d, MaxClients is %d", fileno_limit, maxclients);
hlog(LOG_INFO, "After configuration FileLimit is %d, MaxClients is %d, xpoll using %s",
fileno_limit, maxclients, xpoll_implementation);
/* validate maxclients vs fileno_limit, now when it's determined */
if (fileno_limit < maxclients + 50) {

11
src/xpoll.c
View File

@ -28,6 +28,13 @@
#include "hlog.h"
#include "cellmalloc.h"
#ifdef XP_USE_EPOLL
const char xpoll_implementation[] = "epoll";
#endif
#ifdef XP_USE_POLL
const char xpoll_implementation[] = "poll";
#endif
#ifndef _FOR_VALGRIND_
cellarena_t *xpoll_fd_pool;
#endif
@ -50,7 +57,7 @@ struct xpoll_t *xpoll_initialize(struct xpoll_t *xp, void *tp, int (*handler) (s
xp->handler = handler;
#ifdef XP_USE_EPOLL
hlog(LOG_DEBUG, "xpoll: initializing %p using epoll()", (void *)xp);
//hlog(LOG_DEBUG, "xpoll: initializing %p using epoll()", (void *)xp);
xp->epollfd = epoll_create(1000);
if (xp->epollfd < 0) {
hlog(LOG_CRIT, "xpoll: epoll_create failed: %s", strerror(errno));
@ -59,7 +66,7 @@ struct xpoll_t *xpoll_initialize(struct xpoll_t *xp, void *tp, int (*handler) (s
fcntl(xp->epollfd, F_SETFL, FD_CLOEXEC);
#else
#ifdef XP_USE_POLL
hlog(LOG_DEBUG, "xpoll: initializing %p using poll()", (void *)xp);
//hlog(LOG_DEBUG, "xpoll: initializing %p using poll()", (void *)xp);
xp->pollfd_len = XP_INCREMENT;
xp->pollfd = hmalloc(sizeof(struct pollfd) * xp->pollfd_len);
#endif

2
src/xpoll.h
View File

@ -78,4 +78,6 @@ extern void xpoll_outgoing(struct xpoll_t *xp, struct xpoll_fd_t *xfd, int have_
extern int xpoll(struct xpoll_t *xp, int timeout);
extern void xpoll_init(void);
extern const char xpoll_implementation[];
#endif