Merged revisions 312286,312288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r312286 | tilghman | 2011-04-01 05:44:33 -0500 (Fri, 01 Apr 2011) | 2 lines Reload must react correctly against a possibly changed table, so dropping the conditional reload flag. ................ r312288 | tilghman | 2011-04-01 05:58:45 -0500 (Fri, 01 Apr 2011) | 21 lines Merged revisions 312287 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r312287 | tilghman | 2011-04-01 05:51:24 -0500 (Fri, 01 Apr 2011) | 14 lines Merged revisions 312285 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r312285 | tilghman | 2011-04-01 05:36:42 -0500 (Fri, 01 Apr 2011) | 7 lines Found some leaking file descriptors while looking at ast_FD_SETSIZE dead code. (issue #18969) Reported by: oej Patches: 20110315__issue18969__14.diff.txt uploaded by tilghman (license 14) ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@312289 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
a3cb5dbdff
commit
c855ea7dcb
|
@ -428,7 +428,7 @@ static int my_load_module(int reload)
|
||||||
int res;
|
int res;
|
||||||
struct ast_config *cfg;
|
struct ast_config *cfg;
|
||||||
struct ast_variable *var;
|
struct ast_variable *var;
|
||||||
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
|
struct ast_flags config_flags = { 0 };
|
||||||
struct column *entry;
|
struct column *entry;
|
||||||
char *temp;
|
char *temp;
|
||||||
struct ast_str *compat;
|
struct ast_str *compat;
|
||||||
|
@ -439,6 +439,9 @@ static int my_load_module(int reload)
|
||||||
my_bool my_bool_true = 1;
|
my_bool my_bool_true = 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Cannot use a conditionally different flag, because the table layout may
|
||||||
|
* have changed, which is not detectable by config file change detection,
|
||||||
|
* but should still cause the configuration to be re-parsed. */
|
||||||
cfg = ast_config_load(config, config_flags);
|
cfg = ast_config_load(config, config_flags);
|
||||||
if (!cfg) {
|
if (!cfg) {
|
||||||
ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
|
ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
|
||||||
|
|
|
@ -38,8 +38,9 @@ extern unsigned int ast_FD_SETSIZE;
|
||||||
#if !defined(HAVE_VARIABLE_FDSET) && defined(CONFIGURE_RAN_AS_ROOT)
|
#if !defined(HAVE_VARIABLE_FDSET) && defined(CONFIGURE_RAN_AS_ROOT)
|
||||||
#define ast_fdset fd_set
|
#define ast_fdset fd_set
|
||||||
#else
|
#else
|
||||||
|
#define ast_FDMAX 32768
|
||||||
typedef struct {
|
typedef struct {
|
||||||
TYPEOF_FD_SET_FDS_BITS fds_bits[4096 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
|
TYPEOF_FD_SET_FDS_BITS fds_bits[ast_FDMAX / 8 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
|
||||||
} ast_fdset;
|
} ast_fdset;
|
||||||
|
|
||||||
#undef FD_ZERO
|
#undef FD_ZERO
|
||||||
|
|
|
@ -3402,6 +3402,7 @@ int main(int argc, char *argv[])
|
||||||
fd2 = (l.rlim_cur > sizeof(readers) * 8 ? sizeof(readers) * 8 : l.rlim_cur) - 1;
|
fd2 = (l.rlim_cur > sizeof(readers) * 8 ? sizeof(readers) * 8 : l.rlim_cur) - 1;
|
||||||
if (dup2(fd, fd2) < 0) {
|
if (dup2(fd, fd2) < 0) {
|
||||||
ast_log(LOG_WARNING, "Cannot open maximum file descriptor %d at boot? %s\n", fd2, strerror(errno));
|
ast_log(LOG_WARNING, "Cannot open maximum file descriptor %d at boot? %s\n", fd2, strerror(errno));
|
||||||
|
close(fd);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3410,9 +3411,12 @@ int main(int argc, char *argv[])
|
||||||
if (ast_select(fd2 + 1, &readers, NULL, NULL, &tv) < 0) {
|
if (ast_select(fd2 + 1, &readers, NULL, NULL, &tv) < 0) {
|
||||||
ast_log(LOG_WARNING, "Maximum select()able file descriptor is %d\n", FD_SETSIZE);
|
ast_log(LOG_WARNING, "Maximum select()able file descriptor is %d\n", FD_SETSIZE);
|
||||||
}
|
}
|
||||||
|
ast_FD_SETSIZE = l.rlim_cur > ast_FDMAX ? ast_FDMAX : l.rlim_cur;
|
||||||
|
close(fd);
|
||||||
|
close(fd2);
|
||||||
} while (0);
|
} while (0);
|
||||||
#elif defined(HAVE_VARIABLE_FDSET)
|
#elif defined(HAVE_VARIABLE_FDSET)
|
||||||
ast_FD_SETSIZE = l.rlim_cur;
|
ast_FD_SETSIZE = l.rlim_cur > ast_FDMAX ? ast_FDMAX : l.rlim_cur;
|
||||||
#endif /* !defined(CONFIGURE_RAN_AS_ROOT) */
|
#endif /* !defined(CONFIGURE_RAN_AS_ROOT) */
|
||||||
|
|
||||||
if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP))
|
if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP))
|
||||||
|
|
Reference in New Issue