diff options
author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-10-24 20:04:24 +0000 |
---|---|---|
committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-10-24 20:04:24 +0000 |
commit | a4b3dc92003178088fa31bc6df9dfbe1cd1c18d1 (patch) | |
tree | fa54599d572e7c7e82080beec02f16994fdb809e /win | |
parent | 9c67795e733c553ff6b05398501d402c46349199 (diff) |
Remove IOCP socket engine
IOCP has been experimental since its introduction, and has not worked
correctly for some time. Since we have no windows developer, remove the
dead code.
Most of the advantages of IOCP are not used by an ircd process regardless:
we do not use threads for our client processing, and we add an extra copy
operation that eliminates any gain from OS-level buffer reuse.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11970 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'win')
-rw-r--r-- | win/configure.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/win/configure.cpp b/win/configure.cpp index 275cb4fae..2cbb43da3 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -229,7 +229,6 @@ void Banner() void Run() { - bool use_iocp = false; bool use_openssl = false; bool ipv6 = true; char mod_path[MAX_PATH]; @@ -271,16 +270,6 @@ void Run() #endif printf_c("InspIRCd revision ID: \033[1;32m%s \033[0m\n\n", revision ? revision_text : "(Non-SVN build)"); - // detect windows - if(iswinxp()) - { - printf_c("You are running Windows 2000 or above, and IOCP support is most likely available.\n" - "Thisis much more efficent but is currently EXPERIMENTAL and UNSUPPORTED.\n" - "If you are unsure, answer no.\n\n"); - - use_iocp = get_bool_option("Do you want to use the IOCP implementation?", false); - } - ipv6 = get_bool_option("Do you want to enable IPv6?", false); printf_c("\033[1mAll paths are relative to the binary directory.\033[0m\n"); @@ -344,7 +333,7 @@ void Run() printf_c("\033[0mConfig path:\033[1;32m %s\n", config_file); printf_c("\033[0mModule path:\033[1;32m %s\n", mod_path); printf_c("\033[0mLibrary path:\033[1;32m %s\n", library_dir); - printf_c("\033[0mSocket Engine:\033[1;32m %s\n", use_iocp ? "iocp" : "select"); + printf_c("\033[0mSocket Engine:\033[1;32m %s\n", "select"); printf("\n"); sc(TNORMAL); if(get_bool_option("Are these settings correct?", true) == false) @@ -364,8 +353,6 @@ void Run() fprintf(f, "/* Auto generated by configure, do not modify! */\n"); fprintf(f, "#ifndef __CONFIGURATION_AUTO__\n"); fprintf(f, "#define __CONFIGURATION_AUTO__\n\n"); - if(use_iocp) - fprintf(f, "#define CONFIG_USE_IOCP 1\n\n"); if (ipv6) fprintf(f, "#define IPV6 1\n\n"); @@ -388,7 +375,7 @@ void Run() fprintf(f, "/* Auto generated by configure, do not modify or commit to svn! */\n"); fprintf(f, "#ifndef __CONFIGURATION_SOCKETENGINE__\n"); fprintf(f, "#define __CONFIGURATION_SOCKETENGINE__\n\n"); - fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", use_iocp ? "iocp" : "select"); + fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", "select"); fprintf(f, "#endif\n\n"); fclose(f); |