mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-07 02:18:15 +00:00
baab6e74b9
https://origsvn.digium.com/svn/asterisk/trunk ................ r182847 | russell | 2009-03-17 21:28:55 -0500 (Tue, 17 Mar 2009) | 52 lines Merged revisions 182810 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r182810 | russell | 2009-03-17 21:09:13 -0500 (Tue, 17 Mar 2009) | 44 lines Fix cases where the internal poll() was not being used when it needed to be. We have seen a number of problems caused by poll() not working properly on Mac OSX. If you search around, you'll find a number of references to using select() instead of poll() to work around these issues. In Asterisk, we've had poll.c which implements poll() using select() internally. However, we were still getting reports of problems. vadim investigated a bit and realized that at least on his system, even though we were compiling in poll.o, the system poll() was still being used. So, the primary purpose of this patch is to ensure that we're using the internal poll() when we want it to be used. The changes are: 1) Remove logic for when internal poll should be used from the Makefile. Instead, put it in the configure script. The logic in the configure script is the same as it was in the Makefile. Ideally, we would have a functionality test for the problem, but that's not actually possible, since we would have to be able to run an application on the _target_ system to test poll() behavior. 2) Always include poll.o in the build, but it will be empty if AST_POLL_COMPAT is not defined. 3) Change uses of poll() throughout the source tree to ast_poll(). I feel that it is good practice to give the API call a new name when we are changing its behavior and not using the system version directly in all cases. So, normally, ast_poll() is just redefined to poll(). On systems where AST_POLL_COMPAT is defined, ast_poll() is redefined to ast_internal_poll(). 4) Change poll() in main/poll.c to be ast_internal_poll(). It's worth noting that any code that still uses poll() directly will work fine (if they worked fine before). So, for example, out of tree modules that are using poll() will not stop working or anything. However, for modules to work properly on Mac OSX, ast_poll() needs to be used. (closes issue #13404) Reported by: agalbraith Tested by: russell, vadim http://reviewboard.digium.com/r/198/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@182946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
118 lines
3.3 KiB
C
118 lines
3.3 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*/
|
|
|
|
/*---------------------------------------------------------------------------*\
|
|
$Id$
|
|
|
|
NAME
|
|
|
|
poll - select(2)-based poll() emulation function for BSD systems.
|
|
|
|
SYNOPSIS
|
|
#include "poll.h"
|
|
|
|
struct pollfd
|
|
{
|
|
int fd;
|
|
short events;
|
|
short revents;
|
|
}
|
|
|
|
int poll (struct pollfd *pArray, unsigned long n_fds, int timeout)
|
|
|
|
DESCRIPTION
|
|
|
|
This file, and the accompanying "poll.c", implement the System V
|
|
poll(2) system call for BSD systems (which typically do not provide
|
|
poll()). Poll() provides a method for multiplexing input and output
|
|
on multiple open file descriptors; in traditional BSD systems, that
|
|
capability is provided by select(). While the semantics of select()
|
|
differ from those of poll(), poll() can be readily emulated in terms
|
|
of select() -- which is how this function is implemented.
|
|
|
|
REFERENCES
|
|
Stevens, W. Richard. Unix Network Programming. Prentice-Hall, 1990.
|
|
|
|
NOTES
|
|
1. This software requires an ANSI C compiler.
|
|
|
|
LICENSE
|
|
|
|
This software is released under the following license:
|
|
|
|
Copyright (c) 1995-2002 Brian M. Clapper
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms are
|
|
permitted provided that: (1) source distributions retain
|
|
this entire copyright notice and comment; (2) modifications
|
|
made to the software are prominently mentioned, and a copy
|
|
of the original software (or a pointer to its location) are
|
|
included; and (3) distributions including binaries display
|
|
the following acknowledgement: "This product includes
|
|
software developed by Brian M. Clapper <bmc@clapper.org>"
|
|
in the documentation or other materials provided with the
|
|
distribution. The name of the author may not be used to
|
|
endorse or promote products derived from this software
|
|
without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS
|
|
OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE
|
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
|
PARTICULAR PURPOSE.
|
|
|
|
Effectively, this means you can do what you want with the software
|
|
except remove this notice or take advantage of the author's name.
|
|
If you modify the software and redistribute your modified version,
|
|
you must indicate that your version is a modification of the
|
|
original, and you must provide either a pointer to or a copy of the
|
|
original.
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#ifndef __AST_POLL_COMPAT_H
|
|
#define __AST_POLL_COMPAT_H
|
|
|
|
#ifndef AST_POLL_COMPAT
|
|
|
|
#include <sys/poll.h>
|
|
|
|
#define ast_poll(a, b, c) poll(a, b, c)
|
|
|
|
#else /* AST_POLL_COMPAT */
|
|
|
|
#define POLLIN 0x01
|
|
#define POLLPRI 0x02
|
|
#define POLLOUT 0x04
|
|
#define POLLERR 0x08
|
|
#define POLLHUP 0x10
|
|
#define POLLNVAL 0x20
|
|
|
|
struct pollfd {
|
|
int fd;
|
|
short events;
|
|
short revents;
|
|
};
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#define ast_poll(a, b, c) ast_internal_poll(a, b, c)
|
|
|
|
int ast_internal_poll(struct pollfd *pArray, unsigned long n_fds, int timeout);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* AST_POLL_COMPAT */
|
|
|
|
#endif /* __AST_POLL_COMPAT_H */
|