]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7066 FS-7253 FS-7231 #comment this should do it #resolve
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 18 Feb 2015 19:35:28 +0000 (13:35 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 19 Feb 2015 01:35:39 +0000 (19:35 -0600)
src/switch_time.c

index 0a4a94d08c1462603ce03c05c812ff565eb9d482..8d51292e4b4f44eefb9de56227f5d26aa75ae545 100644 (file)
@@ -415,10 +415,10 @@ static switch_status_t timerfd_start_interval(interval_timer_t *it, int interval
 
        val.it_interval.tv_sec = interval / 1000;
        val.it_interval.tv_nsec = (interval % 1000) * 1000000;
-       val.it_value.tv_sec = 0;
+       val.it_value.tv_sec = val.it_interval.tv_sec;
        val.it_value.tv_nsec = val.it_interval.tv_nsec;
 
-       if (timerfd_settime(fd, TFD_TIMER_ABSTIME, &val, NULL) < 0) {
+       if (timerfd_settime(fd, 0, &val, NULL) < 0) {
                close(fd);
                return SWITCH_STATUS_GENERR;
        }
@@ -1041,7 +1041,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
                        spec.it_value.tv_sec = spec.it_interval.tv_sec;
                        spec.it_value.tv_nsec = spec.it_interval.tv_nsec;
                
-                       if (timerfd_settime(tfd, TFD_TIMER_ABSTIME, &spec, NULL)) {
+                       if (timerfd_settime(tfd, 0, &spec, NULL)) {
                                close(tfd);
                                tfd = -1;
                        }
@@ -1109,7 +1109,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
 #ifdef HAVE_TIMERFD_CREATE
                if (last_MICROSECONDS_PER_TICK != runtime.microseconds_per_tick) {
                        spec.it_interval.tv_nsec = runtime.microseconds_per_tick * 1000;
-                       timerfd_settime(tfd, TFD_TIMER_ABSTIME, &spec, NULL);
+                       timerfd_settime(tfd, 0, &spec, NULL);
                }
                
                last_MICROSECONDS_PER_TICK = runtime.microseconds_per_tick;