pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-29 23:56:38 +02:00
Code Activity

+- Reverted Demigurus's select() speedup patch, did speedup, but it

Browse Source 
+  also caused a good bit of CPU.
This commit is contained in:
stskeeps
2001-03-25 17:17:55 +00:00
parent b7858491fe
commit 0312737c61
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+2
View File
@@ -354,3 +354,5 @@
- Made MyMalloc be MyMallocEx in codemastr's log {} code. Fixes junk pointer
problem - discovered by sts/Morbid
- Removed the old /rehash flags, reported by Morbid
- Reverted Demigurus's select() speedup patch, did speedup, but it
also caused a good bit of CPU.
src/s_bsd.c
+3 -9
View File
@@ -1626,7 +1626,6 @@ static int read_packet(aClient *cptr)
* write it out.
*/
#define HighscoreFD(x,y) if (x > y) y = x
#ifndef USE_POLL
#ifdef NO_FDLIST
int read_message(delay)
@@ -1690,12 +1689,10 @@ int read_message(delay, listp)
if (IsLog(cptr))
continue;
HighscoreFD(i, rhighest_fd);
#ifdef SOCKSPORT
if (DoingSocks(cptr))
{
socks++;
HighscoreFD(cptr->socksfd, rhighest_fd);
FD_SET(cptr->socksfd, &read_set);
#ifdef _WIN32
FD_SET(cptr->socksfd, &excpt_set);
@@ -1708,7 +1705,6 @@ int read_message(delay, listp)
if (DoingAuth(cptr))
{
auth++;
HighscoreFD(cptr->authfd, rhighest_fd);
Debug((DEBUG_NOTICE, "auth on %x %d", cptr, i));
FD_SET(cptr->authfd, &read_set);
#ifdef _WIN32
@@ -1745,14 +1741,12 @@ int read_message(delay, listp)
if (me.socksfd >= 0)
{
FD_SET(me.socksfd, &read_set);
HighscoreFD(me.socksfd, rhighest_fd);
}
#endif
#ifndef _WIN32
if (resfd >= 0)
{
HighscoreFD(resfd, rhighest_fd);
FD_SET(resfd, &read_set);
}
@@ -1761,14 +1755,14 @@ int read_message(delay, listp)
wait.tv_sec = MIN(delay2, delay);
wait.tv_usec = usec;
#ifdef HPUX
nfds = select(rhighest_fd + 1, (int *)&read_set, (int *)&write_set,
nfds = select(FD_SETSIZE, (int *)&read_set, (int *)&write_set,
0, &wait);
#else
# ifndef _WIN32
nfds = select(rhighest_fd + 1, &read_set, &write_set, 0, &wait);
nfds = select(FD_SETSIZE, &read_set, &write_set, 0, &wait);
# else
nfds =
select(rhighest_fd + 1, &read_set, &write_set, &excpt_set,
select(FD_SETSIZE, &read_set, &write_set, &excpt_set,
&wait);
# endif
#endif