kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new timer interface for timing iax2

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-03-20 14:07:17 +00:00
parent e856df69d0
commit 176799c7f6
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
channels/chan_iax2.c
View File

@@ -3456,27 +3456,38 @@ static int timing_read(int *id, int fd, short events, void *cbdata)
struct iax2_peer *peer; struct iax2_peer *peer;
int processed = 0; int processed = 0;
int totalcalls = 0; int totalcalls = 0;
int x = -1;
if (iaxtrunkdebug) if (iaxtrunkdebug)
ast_verbose("Beginning trunk processing\n"); ast_verbose("Beginning trunk processing\n");
/* Read and ignore from the pseudo channel for timing */ if (events & AST_IO_PRI) {
res = read(fd, buf, sizeof(buf)); /* Great, this is a timing interface, just call the ioctl */
if (res > 0) { if (ioctl(fd, ZT_TIMERACK, x))
/* For each peer that supports trunking... */ ast_log(LOG_WARNING, "Unable to acknowledge zap timer\n");
ast_pthread_mutex_lock(&peerl.lock); res = 0;
peer = peerl.peers; } else {
while(peer) { /* Read and ignore from the pseudo channel for timing */
if (peer->trunk) { res = read(fd, buf, sizeof(buf));
processed++; if (res < 1) {
res = send_trunk(peer); ast_log(LOG_WARNING, "Unable to read from timing fd\n");
if (iaxtrunkdebug) ast_pthread_mutex_unlock(&peerl.lock);
ast_verbose("Processed trunk peer '%s' with %d call(s)\n", peer->name, res); return 1;
totalcalls += res;
res = 0;
}
peer = peer->next;
} }
ast_pthread_mutex_unlock(&peerl.lock);
} }
/* For each peer that supports trunking... */
ast_pthread_mutex_lock(&peerl.lock);
peer = peerl.peers;
while(peer) {
if (peer->trunk) {
processed++;
res = send_trunk(peer);
if (iaxtrunkdebug)
ast_verbose("Processed trunk peer '%s' with %d call(s)\n", peer->name, res);
totalcalls += res;
res = 0;
}
peer = peer->next;
}
ast_pthread_mutex_unlock(&peerl.lock);
if (iaxtrunkdebug) if (iaxtrunkdebug)
ast_verbose("Ending trunk processing with %d peers and %d calls processed\n", processed, totalcalls); ast_verbose("Ending trunk processing with %d peers and %d calls processed\n", processed, totalcalls);
iaxtrunkdebug =0; iaxtrunkdebug =0;
@@ -4522,7 +4533,7 @@ static void *network_thread(void *ignore)
/* Establish I/O callback for socket read */ /* Establish I/O callback for socket read */
ast_io_add(io, netsocket, socket_read, AST_IO_IN, NULL); ast_io_add(io, netsocket, socket_read, AST_IO_IN, NULL);
if (timingfd > -1) if (timingfd > -1)
ast_io_add(io, timingfd, timing_read, AST_IO_IN, NULL); ast_io_add(io, timingfd, timing_read, AST_IO_IN | AST_IO_PRI, NULL);
for(;;) { for(;;) {
/* Go through the queue, sending messages which have not yet been /* Go through the queue, sending messages which have not yet been
sent, and scheduling retransmissions if appropriate */ sent, and scheduling retransmissions if appropriate */
@@ -4880,7 +4891,8 @@ static void set_timing(void)
#ifdef IAX_TRUNKING #ifdef IAX_TRUNKING
int bs = trunkfreq * 8; int bs = trunkfreq * 8;
if (timingfd > -1) { if (timingfd > -1) {
if (ioctl(timingfd, ZT_SET_BLOCKSIZE, &bs)) if (ioctl(timingfd, ZT_TIMERCONFIG, &bs) &&
ioctl(timingfd, ZT_SET_BLOCKSIZE, &bs))
ast_log(LOG_WARNING, "Unable to set blocksize on timing source\n"); ast_log(LOG_WARNING, "Unable to set blocksize on timing source\n");
} }
#endif #endif
@@ -5416,7 +5428,9 @@ int load_module(void)
sin.sin_addr.s_addr = INADDR_ANY; sin.sin_addr.s_addr = INADDR_ANY;
#ifdef IAX_TRUNKING #ifdef IAX_TRUNKING
timingfd = open("/dev/zap/pseudo", O_RDWR); timingfd = open("/dev/zap/timer", O_RDWR);
if (timingfd < 0)
timingfd = open("/dev/zap/pseudo", O_RDWR);
if (timingfd < 0) if (timingfd < 0)
ast_log(LOG_WARNING, "Unable to open IAX timing interface: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Unable to open IAX timing interface: %s\n", strerror(errno));
#endif #endif