diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-05-30 01:34:15 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-05-30 01:34:15 +0000 |
commit | add416e064b0ba02f5efd6a1a6dcfdc8a353bdb8 (patch) | |
tree | 2799385c34891c856cf784066dca018dc7b47bfa /io.c | |
parent | 07a752d5ddd1fb00dbf35610c37339ebddc1e532 (diff) |
Version 0.1.12 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@453 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'io.c')
-rwxr-xr-x | io.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -196,7 +196,7 @@ static int io_shrink(struct io_context *ioc, int which) int ast_io_remove(struct io_context *ioc, int *id) { if (ioc->current_ioc == *id) { - ast_log(LOG_NOTICE, "Callback for %d tried to remove itself\n", *id); + ast_log(LOG_NOTICE, "Callback for %d tried to remove itself (%p)\n", *id, id); } else if (*id < ioc->fdcnt) { @@ -225,6 +225,7 @@ int ast_io_wait(struct io_context *ioc, int howlong) for(x=0;x<ioc->fdcnt;x++) { if (ioc->fds[x].revents) { /* There's an event waiting */ + ioc->current_ioc = *ioc->ior[x].id; if (!ioc->ior[x].callback(ioc->ior[x].id, ioc->fds[x].fd, ioc->fds[x].revents, ioc->ior[x].data)) { /* Time to delete them since they returned a 0 */ |