albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prevent io_masterfd leak when library_init() is called twice

This commit is contained in:
Florian Westphal 2005-07-14 14:35:38 +00:00
parent 63db3daafe
commit fca29bfa23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ngircd/io.c
View File

@ -12,7 +12,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: io.c,v 1.4 2005/07/14 09:20:39 alex Exp $"; static char UNUSED id[] = "$Id: io.c,v 1.5 2005/07/14 14:35:38 fw Exp $";
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
@ -46,6 +46,7 @@ typedef struct {
#endif #endif
#endif #endif
static bool library_initialized;
#ifdef IO_USE_EPOLL #ifdef IO_USE_EPOLL
#include <sys/epoll.h> #include <sys/epoll.h>
@ -97,12 +98,16 @@ io_event_get(int fd)
bool bool
io_library_init(unsigned int eventsize) io_library_init(unsigned int eventsize)
{ {
bool ret;
#ifdef IO_USE_EPOLL #ifdef IO_USE_EPOLL
int ecreate_hint = (int)eventsize; int ecreate_hint = (int)eventsize;
if (ecreate_hint <= 0) if (ecreate_hint <= 0)
ecreate_hint = 128; ecreate_hint = 128;
#endif #endif
if (library_initialized)
return true;
#ifdef IO_USE_SELECT #ifdef IO_USE_SELECT
#ifdef FD_SETSIZE #ifdef FD_SETSIZE
if (eventsize >= FD_SETSIZE) if (eventsize >= FD_SETSIZE)
@ -117,7 +122,10 @@ io_library_init(unsigned int eventsize)
Log(LOG_INFO, Log(LOG_INFO,
"IO subsystem: epoll (hint size %d, initial maxfd %u, masterfd %d).", "IO subsystem: epoll (hint size %d, initial maxfd %u, masterfd %d).",
ecreate_hint, eventsize, io_masterfd); ecreate_hint, eventsize, io_masterfd);
return io_masterfd >= 0; ret = io_masterfd >= 0;
if (ret) library_initialized = true;
return ret;
#endif #endif
#ifdef IO_USE_SELECT #ifdef IO_USE_SELECT
Log(LOG_INFO, "IO subsystem: select (initial maxfd %u).", Log(LOG_INFO, "IO subsystem: select (initial maxfd %u).",
@ -135,16 +143,20 @@ io_library_init(unsigned int eventsize)
#else #else
Log(LOG_WARNING, Log(LOG_WARNING,
"FD_SETSIZE undefined, don't know how many descriptors select() can handle on your platform ..."); "FD_SETSIZE undefined, don't know how many descriptors select() can handle on your platform ...");
#endif #endif /* FD_SETSIZE */
library_initialized = true;
return true; return true;
#endif #endif /* SELECT */
#ifdef IO_USE_KQUEUE #ifdef IO_USE_KQUEUE
io_masterfd = kqueue(); io_masterfd = kqueue();
Log(LOG_INFO, Log(LOG_INFO,
"IO subsystem: kqueue (initial maxfd %u, masterfd %d)", "IO subsystem: kqueue (initial maxfd %u, masterfd %d)",
eventsize, io_masterfd); eventsize, io_masterfd);
return io_masterfd >= 0; ret = io_masterfd >= 0;
if (ret) library_initialized = true;
return ret;
#endif #endif
} }
@ -162,6 +174,7 @@ io_library_shutdown(void)
#ifdef IO_USE_KQUEUE #ifdef IO_USE_KQUEUE
array_free(&io_evcache); array_free(&io_evcache);
#endif #endif
library_initialized = false;
} }