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

Merge "res_timing: Don't close FD 0 when out of open files." into 11

Browse Source
This commit is contained in:
Joshua Colp
2015-07-02 07:53:28 -05:00
committed by Gerrit Code Review
parent 077bfe7455 b090a8d40b
commit 89b0aaa652
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_timing_kqueue.c
View File

@@ -93,7 +93,9 @@ static int kqueue_timer_cmp(void *obj, void *args, int flags)
static void timer_destroy(void *obj) static void timer_destroy(void *obj)
{ {
struct kqueue_timer *timer = obj; struct kqueue_timer *timer = obj;
close(timer->handle); if (timer->handle > -1) {
close(timer->handle);
}
} }
#define lookup_timer(a) _lookup_timer(a, __FILE__, __LINE__, __PRETTY_FUNCTION__) #define lookup_timer(a) _lookup_timer(a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
@@ -121,13 +123,12 @@ static int kqueue_timer_open(void)
ast_log(LOG_ERROR, "Could not allocate memory for kqueue_timer structure\n"); ast_log(LOG_ERROR, "Could not allocate memory for kqueue_timer structure\n");
return -1; return -1;
} }
if ((handle = kqueue()) < 0) { if ((timer->handle = handle = kqueue()) < 0) {
ast_log(LOG_ERROR, "Failed to create kqueue timer: %s\n", strerror(errno)); ast_log(LOG_ERROR, "Failed to create kqueue timer: %s\n", strerror(errno));
ao2_ref(timer, -1); ao2_ref(timer, -1);
return -1; return -1;
} }
timer->handle = handle;
ao2_link(kqueue_timers, timer); ao2_link(kqueue_timers, timer);
/* Get rid of the reference from the allocation */ /* Get rid of the reference from the allocation */
ao2_ref(timer, -1); ao2_ref(timer, -1);

7
res/res_timing_timerfd.c
View File

@@ -90,7 +90,9 @@ static int timerfd_timer_cmp(void *obj, void *args, int flags)
static void timer_destroy(void *obj) static void timer_destroy(void *obj)
{ {
struct timerfd_timer *timer = obj; struct timerfd_timer *timer = obj;
close(timer->handle); if (timer->handle > -1) {
close(timer->handle);
}
timer->handle = -1; timer->handle = -1;
} }
@@ -103,13 +105,12 @@ static int timerfd_timer_open(void)
ast_log(LOG_ERROR, "Could not allocate memory for timerfd_timer structure\n"); ast_log(LOG_ERROR, "Could not allocate memory for timerfd_timer structure\n");
return -1; return -1;
} }
if ((handle = timerfd_create(CLOCK_MONOTONIC, 0)) < 0) { if ((timer->handle = handle = timerfd_create(CLOCK_MONOTONIC, 0)) < 0) {
ast_log(LOG_ERROR, "Failed to create timerfd timer: %s\n", strerror(errno)); ast_log(LOG_ERROR, "Failed to create timerfd timer: %s\n", strerror(errno));
ao2_ref(timer, -1); ao2_ref(timer, -1);
return -1; return -1;
} }
timer->handle = handle;
ao2_link(timerfd_timers, timer); ao2_link(timerfd_timers, timer);
/* Get rid of the reference from the allocation */ /* Get rid of the reference from the allocation */
ao2_ref(timer, -1); ao2_ref(timer, -1);