proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-13 18:25:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #645 from qlyoung/nonblocking-fixup

Browse Source 
poll() fixup
This commit is contained in:
David Lamparter 2017-05-31 20:47:30 +02:00 committed by GitHub
commit a1e61a923f
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -312,8 +312,6 @@ AC_ARG_ENABLE(fpm,
AS_HELP_STRING([--enable-fpm], [enable Forwarding Plane Manager support])) AS_HELP_STRING([--enable-fpm], [enable Forwarding Plane Manager support]))
AC_ARG_ENABLE(systemd, AC_ARG_ENABLE(systemd,
AS_HELP_STRING([--enable-systemd], [enable Systemd support])) AS_HELP_STRING([--enable-systemd], [enable Systemd support]))
AC_ARG_ENABLE(poll,
AS_HELP_STRING([--enable-poll], [enable usage of Poll instead of select]))
AC_ARG_ENABLE(werror, AC_ARG_ENABLE(werror,
AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)])) AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)]))
AC_ARG_ENABLE(cumulus, AC_ARG_ENABLE(cumulus,
@ -364,10 +362,6 @@ if test "${enable_rr_semantics}" != "no" ; then
AC_DEFINE(HAVE_V6_RR_SEMANTICS,, Compile in v6 Route Replacement Semantics) AC_DEFINE(HAVE_V6_RR_SEMANTICS,, Compile in v6 Route Replacement Semantics)
fi fi
if test "${enable_poll}" = "yes" ; then
AC_DEFINE(HAVE_POLL_CALL,,Compile systemd support in)
fi
dnl ---------- dnl ----------
dnl MPLS check dnl MPLS check
dnl ---------- dnl ----------

1
lib/thread.c
View File

@ -387,6 +387,7 @@ thread_master_create (void)
rv->owner = pthread_self(); rv->owner = pthread_self();
pipe (rv->io_pipe); pipe (rv->io_pipe);
set_nonblocking (rv->io_pipe[0]); set_nonblocking (rv->io_pipe[0]);
set_nonblocking (rv->io_pipe[1]);
rv->handler.pfdsize = rv->fd_limit; rv->handler.pfdsize = rv->fd_limit;
rv->handler.pfdcount = 0; rv->handler.pfdcount = 0;