[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36738 - in libmicrohttpd: src/include src/microhttpd w32/c
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36738 - in libmicrohttpd: src/include src/microhttpd w32/common |
Date: |
Tue, 8 Dec 2015 11:59:55 +0100 |
Author: Karlson2k
Date: 2015-12-08 11:59:54 +0100 (Tue, 08 Dec 2015)
New Revision: 36738
Modified:
libmicrohttpd/src/include/platform.h
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/microhttpd/daemon.c
libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj
libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj
Log:
Use real system default value of FD_SETSIZE instead of guessing
Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h 2015-12-07 20:51:11 UTC (rev
36737)
+++ libmicrohttpd/src/include/platform.h 2015-12-08 10:59:54 UTC (rev
36738)
@@ -63,24 +63,14 @@
/* Some platforms (FreeBSD, Solaris, W32) allow to override
default FD_SETSIZE by defining it before including
headers. */
-#if defined(_WIN32) && !defined(__CYGWIN__)
-/* Default FD_SETSIZE value for WinSock */
-#define MHD_SYS_DEFAULT_FD_SETSIZE 64
-#elif defined(__sun) && defined(_LP64)
-/* Default FD_SETSIZE value for 64bit Solaris since version 7
- and SunOS since version 2.7 */
-#define MHD_SYS_DEFAULT_FD_SETSIZE 65536
-#else /* all other platforms */
-/* Default FD_SETSIZE value for most platforms */
-#define MHD_SYS_DEFAULT_FD_SETSIZE 1024
-#endif /* all other platforms */
+#define _MHD_SYS_DEFAULT_FD_SETSIZE get_system_fdsetsize_value()
#elif defined(_WIN32) && !defined(__CYGWIN__)
/* Platform with WinSock and without overridden FD_SETSIZE */
#define FD_SETSIZE 2048 /* Override default small value */
-#define MHD_SYS_DEFAULT_FD_SETSIZE 64
-#else
-/* Use system default value */
-#define MHD_SYS_DEFAULT_FD_SETSIZE FD_SETSIZE
+#define _MHD_SYS_DEFAULT_FD_SETSIZE get_system_fdsetsize_value()
+#else /* !FD_SETSIZE && !WinSock*/
+#define _MHD_SYS_DEFAULT_FD_SETSIZE FD_SETSIZE
+#define _MHD_FD_SETSIZE_IS_DEFAULT 1
#endif /* FD_SETSIZE */
#define _XOPEN_SOURCE_EXTENDED 1
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2015-12-07 20:51:11 UTC (rev
36737)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2015-12-08 10:59:54 UTC (rev
36738)
@@ -64,6 +64,7 @@
memorypool.c memorypool.h \
mhd_mono_clock.c mhd_mono_clock.h \
mhd_limits.h mhd_byteorder.h \
+ sysfdsetsize.c sysfdsetsize.h \
response.c response.h
libmicrohttpd_la_CPPFLAGS = \
$(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2015-12-07 20:51:11 UTC (rev
36737)
+++ libmicrohttpd/src/microhttpd/daemon.c 2015-12-08 10:59:54 UTC (rev
36738)
@@ -52,6 +52,10 @@
#include <sys/sendfile.h>
#endif
+#ifndef _MHD_FD_SETSIZE_IS_DEFAULT
+#include "sysfdsetsize.h"
+#endif /* !_MHD_FD_SETSIZE_IS_DEFAULT */
+
#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
@@ -677,7 +681,7 @@
{
return MHD_get_fdset2(daemon, read_fd_set,
write_fd_set, except_fd_set,
- max_fd, MHD_SYS_DEFAULT_FD_SETSIZE);
+ max_fd, _MHD_SYS_DEFAULT_FD_SETSIZE);
}
/**
Modified: libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj
===================================================================
--- libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj 2015-12-07
20:51:11 UTC (rev 36737)
+++ libmicrohttpd/w32/common/libmicrohttpd-files.vcxproj 2015-12-08
10:59:54 UTC (rev 36738)
@@ -14,6 +14,7 @@
<ClCompile Include="$(MhdSrc)microhttpd\reason_phrase.c" />
<ClCompile Include="$(MhdSrc)microhttpd\response.c" />
<ClCompile Include="$(MhdSrc)microhttpd\tsearch.c" />
+ <ClCompile Include="$(MhdSrc)microhttpd\sysfdsetsize.c" />
<ClCompile Include="$(MhdSrc)platform\w32functions.c" />
</ItemGroup>
<ItemGroup>
@@ -32,6 +33,7 @@
<ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h" />
<ClInclude Include="$(MhdSrc)microhttpd\response.h" />
<ClInclude Include="$(MhdSrc)microhttpd\tsearch.h" />
+ <ClInclude Include="$(MhdSrc)microhttpd\sysfdsetsize.h" />
<ClInclude Include="$(MhdW32Common)MHD_config.h" />
</ItemGroup>
<ItemGroup>
Modified: libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj
===================================================================
--- libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj 2015-12-07
20:51:11 UTC (rev 36737)
+++ libmicrohttpd/w32/common/libmicrohttpd-filters.vcxproj 2015-12-08
10:59:54 UTC (rev 36738)
@@ -23,6 +23,29 @@
</Filter>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="$(MhdSrc)include\microhttpd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="$(MhdSrc)include\platform.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="$(MhdSrc)include\platform_interface.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="$(MhdSrc)include\w32functions.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="$(MhdW32Common)MHD_config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClCompile Include="$(MhdSrc)platform\w32functions.c">
+ <Filter>Source Files\platform_interface</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
<ClCompile Include="$(MhdSrc)microhttpd\base64.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -56,9 +79,6 @@
<ClCompile Include="$(MhdSrc)microhttpd\response.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="$(MhdSrc)platform\w32functions.c">
- <Filter>Source Files\platform_interface</Filter>
- </ClCompile>
<ClCompile Include="$(MhdSrc)microhttpd\tsearch.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -65,8 +85,6 @@
<ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c">
<Filter>Source Files</Filter>
</ClCompile>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="$(MhdSrc)microhttpd\base64.h">
<Filter>Source Files</Filter>
</ClInclude>
@@ -85,27 +103,9 @@
<ClInclude Include="$(MhdSrc)microhttpd\response.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="$(MhdSrc)include\microhttpd.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="$(MhdSrc)include\platform.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="$(MhdSrc)include\platform_interface.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="$(MhdSrc)include\w32functions.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="$(MhdW32Common)MHD_config.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="$(MhdSrc)microhttpd\tsearch.h">
<Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h">
<Filter>Source Files</Filter>
</ClInclude>
@@ -115,6 +115,12 @@
<ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h">
<Filter>Source Files</Filter>
</ClInclude>
+ <ClInclude Include="$(MhdSrc)microhttpd\sysfdsetsize.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClCompile Include="$(MhdSrc)microhttpd\sysfdsetsize.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="$(MhdW32Common)microhttpd_dll_res_vc.rc">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36738 - in libmicrohttpd: src/include src/microhttpd w32/common,
gnunet <=