Merged revisions 326484 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Wed, 6 Jul 2011 15:30:28 +0000 (15:30 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 6 Jul 2011 15:30:28 +0000 (15:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r326484 | dvossel | 2011-07-06 10:26:49 -0500 (Wed, 06 Jul 2011) | 10 lines

  Reverts fix for timerfd locking issue.

  jrose discovered a performance issue with this
  fix that prevents his analog phones from working
  when using timerfd as a timing source.  Until
  it is understood what is causing this performance
  problem, this patch is being reverted.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@326485 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_timing_timerfd.c

index 3e686f8..ae5d2b4 100644 (file)
@@ -162,35 +162,7 @@ static void timerfd_timer_ack(int handle, unsigned int quantity)
        uint64_t expirations;
        int read_result = 0;
 
-       struct timerfd_timer *our_timer, find_helper = {
-               .handle = handle,
-       };
-
-       if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
-               ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
-               return;
-       }
-
-       if (our_timer->saved_timer.it_value.tv_nsec == 0L) {
-               ast_log(LOG_DEBUG, "Reading attempt on idle timerfd.\n");
-               return;
-       }
-
        do {
-               struct itimerspec timer_status;
-
-               if (timerfd_gettime(handle, &timer_status)) {
-                       ast_log(LOG_ERROR, "Call to timerfd_gettime() error: %s\n", strerror(errno));
-                       expirations = 0;
-                       break;
-               }
-
-               if ((timer_status.it_value.tv_sec == 0) && (timer_status.it_value.tv_nsec == 0)) {
-                       ast_log(LOG_DEBUG, "Call to timerfd_timer_ack() with disarmed timer - break now.\n");
-                       expirations = 0;
-                       break;
-               }
-
                read_result = read(handle, &expirations, sizeof(expirations));
                if (read_result == -1) {
                        if (errno == EINTR || errno == EAGAIN) {