Merge pull request #431 from wilx/master

wilx · web-flow · commit 240a10615803 · 2019-07-28T01:12:08.000+02:00
Merge.
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
@@ -63,6 +63,7 @@ check_function_exists(getpid        LOG4CPLUS_HAVE_GETPID )
 check_function_exists(poll          LOG4CPLUS_HAVE_POLL )
 check_function_exists(pipe          LOG4CPLUS_HAVE_PIPE )
 check_function_exists(pipe2         LOG4CPLUS_HAVE_PIPE2 )
+check_function_exists(accept4       LOG4CPLUS_HAVE_ACCEPT4 )
 check_function_exists(ftime         LOG4CPLUS_HAVE_FTIME )
 check_function_exists(stat          LOG4CPLUS_HAVE_STAT )
 check_function_exists(lstat         LOG4CPLUS_HAVE_LSTAT )
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Short Description
 =================
 
-[log4cplus] is a simple to use C++11 logging API providing thread--safe,
+[log4cplus] is a simple to use C++17 logging API providing thread--safe,
 flexible, and arbitrarily granular control over log management and
 configuration.  It is modeled after the Java log4j API.
 
@@ -36,11 +36,11 @@ from log4net, log4cxx, log4cpp).
 Platform support
 ================
 
-[log4cplus] version 2.0 and beyond require C++11. [log4cplus] has been
+[log4cplus] version 3.0 and beyond require C++17. [log4cplus] has been
 ported to and tested on the following platforms:
 
-  - Linux/AMD64 with GCC version 6.2.0 20161005 (Ubuntu 6.2.0-5ubuntu12)
-  - Linux/AMD64 with Clang version 3.8.1-12ubuntu1 (tags/RELEASE_381/final)
+  - Linux/AMD64 with GCC version 8.3.0 (Ubuntu 8.3.0-6ubuntu1)
+  - Linux/AMD64 with Clang version 8.0.0-3 (tags/RELEASE_800/final)
   - Windows/AMD64 with GCC version 4.8.2 (x86_64-posix-seh-rev3, Built by
     MinGW-W64 project) using CMake build system
   - Windows/AMD64 with GCC version 4.9.2 (tdm64-1) using CMake build system
@@ -59,8 +59,8 @@ on Linux platform offered by [Travis CI][11] service.
 The oldest Windows version that is supported by 2.x releases is Windows Vista.
 
 The following platforms were supported by the 1.x series of [log4cplus]. They
-either do not have a reasonable C++11 capable compiler or have not been checked
-with [log4cplus] 2.x, yet:
+either do not have a reasonable C++17 capable compiler or have not been checked
+with [log4cplus] 3.x, yet:
 
   - Minix 3.3.0/i386 with Clang version 3.4 (branches/release_34) with
     `--disable-threads`
@@ -150,6 +150,36 @@ help with configuration by supplying additional flags to the
 Linux.  See one of the later note for details.
 
 
+`--enable-tests`
+----------------
+
+This option is enabled by default.  It enables compilation of test executables.
+
+
+`--enable-unit-tests`
+---------------------
+
+This option is disabled by default.  It enables compilation of unit tests along
+their units.  These unit tests then can be executed through `unit_tests` test
+executable that is built during compilation.
+
+
+`--enable-implicit-initialization`
+----------------------------------
+
+This option is enabled by default.  It enables implicit initialization of
+[log4cplus]. When it is turned off, [log4cplus] has to be explicitly
+initialized by calling either `log4cplus::initialize()` or by instantiating
+`log4cplus::Initializer`.
+
+
+`--enable-lto`
+--------------
+
+This option is disabled by default.  It enables LTO (Link-Time Optimization)
+builds.
+
+
 `--with-wchar_t-support`
 ------------------------
 
@@ -205,18 +235,12 @@ separate shared library (liblog4cplusqt4debugappender) that implements
 `Qt4DebugAppender`.  It requires Qt4 and pkg-config to be installed.
 
 
-`--enable-tests`
----------------------
-
-This option is enabled by default.  It enables compilation of test executables.
-
-
-`--enable-unit-tests`
----------------------
+`--with-qt5`
+------------
 
-This option is disabled by default.  It enables compilation of unit tests along
-their units.  These unit tests then can be executed through `unit_tests` test
-executable that is built during compilation.
+This option is disabled by default.  It enables compilation of a separate
+shared library (liblog4cplusqt5debugappender) that implements
+`Qt5DebugAppender`.  It requires Qt5 and pkg-config to be available.
 
 
 Notes
@@ -610,8 +634,8 @@ Unsupported compilers and platforms
 -----------------------------------
 
 [log4cplus] does not support too old or broken C++ compilers. Since [log4cplus]
-version 2.0.0, it means it does not support any platform or compiler without
-decent C++11 support.
+version 3.0.0, it means it does not support any platform or compiler without
+decent C++17 support.
 
   - Visual Studio prior to 2015
   - GCC prior to 4.8
diff --git a/configure b/configure
@@ -12332,6 +12332,19 @@ fi
 done
 
 
+   for ac_func in accept4
+do :
+  ac_fn_cxx_check_func "$LINENO" "accept4" "ac_cv_func_accept4"
+if test "x$ac_cv_func_accept4" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ACCEPT4 1
+_ACEOF
+ $as_echo "#define LOG4CPLUS_HAVE_ACCEPT4 1" >>confdefs.h
+
+fi
+done
+
+
    for ac_func in ftime
 do :
   ac_fn_cxx_check_func "$LINENO" "ftime" "ac_cv_func_ftime"
diff --git a/configure.ac b/configure.ac
@@ -548,6 +548,7 @@ LOG4CPLUS_CHECK_FUNCS([getpid], [LOG4CPLUS_HAVE_GETPID])
 LOG4CPLUS_CHECK_FUNCS([poll], [LOG4CPLUS_HAVE_POLL])
 LOG4CPLUS_CHECK_FUNCS([pipe], [LOG4CPLUS_HAVE_PIPE])
 LOG4CPLUS_CHECK_FUNCS([pipe2], [LOG4CPLUS_HAVE_PIPE2])
+LOG4CPLUS_CHECK_FUNCS([accept4], [LOG4CPLUS_HAVE_ACCEPT4])
 LOG4CPLUS_CHECK_FUNCS([ftime], [LOG4CPLUS_HAVE_FTIME])
 LOG4CPLUS_CHECK_FUNCS([stat], [LOG4CPLUS_HAVE_STAT])
 LOG4CPLUS_CHECK_FUNCS([lstat], [LOG4CPLUS_HAVE_LSTAT])
diff --git a/docs/latex-header.tex b/docs/latex-header.tex
@@ -2,7 +2,6 @@
 %% latex-header.tex begin
 %%
 
-\usepackage{fix-cm}
 \usepackage{graphicx}
 \usepackage{epstopdf}
 \usepackage{anyfontsize}
@@ -16,15 +15,15 @@
 \usepackage{upquote}
 \usepackage{etoolbox}
 
-\setmainfont[Ligatures={TeX, Common}]{TeX Gyre Pagella}
-\setmonofont[Scale=MatchLowercase,Ligatures={NoCommon}]{DejaVu Sans Mono}
+%\setmainfont[Ligatures={TeX, Common}]{TeX Gyre Pagella}
+%\setmonofont[Scale=MatchLowercase,Ligatures={NoCommon}]{DejaVu Sans Mono}
 %\setromanfont{Georgia}
 %\setsansfont{DejaVu Sans}
 
-\newfontfamily{\cjkfont}{WenQuanYi Zen Hei}[]
-\newfontfamily{\devanagarifont}{Lohit Devanagari}[]
-\newfontfamily{\tamilfont}{Lohit Tamil}[]
-\newfontfamily{\cyrilicfont}{CMU Serif}
+\newfontfamily\cjkfont{WenQuanYi Zen Hei}[]
+\newfontfamily\devanagarifont{Noto Serif Devanagari}[]
+\newfontfamily\tamilfont{Noto Serif Tamil}[]
+\newfontfamily\cyrilicfont{PTSerif}[]
 
 %% These unfortunately break too many things. PDF will have to be without
 %% contributors' native names.
diff --git a/docs/release.txt b/docs/release.txt
@@ -15,20 +15,19 @@ revision, yet._
 
  #. Send announcement to <log4cplus-devel@lists.sourceforge.net>.
 
- #. Tag revision on branch.
+ #. Tag revision on branch. _Do not forget to push the tag._
 
  #. Write [news entry][2] to SourceForge.
 
- #. Use Pandoc with parameters `--standalone -f markdown+smart -t
-markdown_strict+hard_line_breaks+fenced_code_blocks+fenced_code_attributes-intraword_underscores`
-to generate a version of README file with Markdown compatible with
-SourceForge's wiki. Upload resulting file to project's SourceForge wiki page
-using the `scripts/upload_to_wiki.pl` script.
+ #. Use Pandoc with parameters
 
- #. Post release information to [G+ log4cplus page][1] and share it with the
-[log4cplus community][3].
+    ```
+    --standalone -f markdown+smart -t markdown_strict+hard_line_breaks+fenced_code_blocks+fenced_code_attributes-intraword_underscores
+    ```
+
+    to generate a version of README file with Markdown compatible with
+    SourceForge's wiki. Upload resulting file to project's SourceForge wiki
+    page using the `scripts/upload_to_wiki.pl` script.
 
-[1]: https://plus.google.com/u/0/b/111599007078013023156/
 [2]: https://sourceforge.net/p/log4cplus/news/new
-[3]: https://plus.google.com/u/0/b/111599007078013023156/communities/117815353450765593933
 [4]: https://sourceforge.net/projects/log4cplus/files/
diff --git a/include/log4cplus/config/defines.hxx.in b/include/log4cplus/config/defines.hxx.in
@@ -118,6 +118,9 @@
 /* */
 #undef LOG4CPLUS_HAVE_PIPE2
 
+/* */
+#undef LOG4CPLUS_HAVE_ACCEPT4
+
 /* */
 #undef LOG4CPLUS_HAVE_POLL
 
diff --git a/scripts/build-pdf.pl b/scripts/build-pdf.pl
@@ -22,28 +22,30 @@
       , 'LICENSE' );
 
 my @PANDOC_1ST_STEP_SWITCHES =
-    ( '--smart'
-      , '--self-contained'
-      , '--normalize'
+    (   '--self-contained'
       , '--atx-headers'
-      , '-f', 'markdown'
+      , '-f', 'markdown+smart'
       , '-t', 'markdown' );
 
 my @PANDOC_2ND_STEP_SWITCHES =
-    ( '--smart'
-      , '--self-contained'
+    ( '--self-contained'
       , '--toc'
       , '--number-sections'
       # Qt4 / Win32 / MSVC has example that breaks listings on some versions of
       # TeXLive
       , '--listings'
-      , '-f', 'markdown'
+      , '-f', 'markdown+smart'
       , '-t', 'latex',
-      , '--latex-engine=lualatex',
+      , '--pdf-engine=lualatex',
       , '--include-in-header=docs/latex-header.tex'
       , '--include-before-body=docs/latex-body.tex'
-      , '-V', 'lang=en-US',
-      , '-V', 'geometry:a4paper');
+      , '-V', 'lang:en-US',
+      , '-V', 'geometry:a4paper'
+      , '-V', 'mainfont:TeX Gyre Pagella'
+      , '-V', 'mainfontoptions:Ligatures={TeX, Common}'
+      , '-V', 'monofont:DejaVu Sans Mono'
+      , '-V', 'monofontoptions:Ligatures={}'
+    );
 
 # pre-compute  various source information strings
 
@@ -125,10 +127,10 @@
 my $devanagariCodePoint = qr/[\p{Devanagari}]/u;
 my $tamilCodePoint = qr/[\p{Tamil}]/u;
 my $cyrilicCodePoint = qr/[\p{InCyrillic}\p{InCyrillicSupplementary}]/u;
-$contents =~ s/(${cjkCodePoint}+)/{\\cjkfont{}$1}/g;
-$contents =~ s/(${devanagariCodePoint}+)/{\\devanagarifont{}$1}/g;
-$contents =~ s/(${tamilCodePoint}+)/{\\tamilfont{}$1}/g;
-$contents =~ s/(${cyrilicCodePoint}+)/{\\cyrilicfont{}$1}/g;
+$contents =~ s/(${cjkCodePoint}+(?:[\s\h\p{Zs}\p{Po}]+${cjkCodePoint}+)?)/{\\cjkfont{}$1}/gu;
+$contents =~ s/(${devanagariCodePoint}+(?:[\s\h\p{Zs}\p{Po}]+${devanagariCodePoint}+)?)/{\\devanagarifont{}$1}/gu;
+$contents =~ s/(${tamilCodePoint}+(?:[\s\h\p{Zs}\p{Po}]+${tamilCodePoint}+)?)/{\\tamilfont{}$1}/gu;
+$contents =~ s/(${cyrilicCodePoint}+(?:[\s\h\p{Zs}\p{Po}]+${cyrilicCodePoint}+)?)/{\\cyrilicfont{}$1}/gu;
 use constant README_MD_TEX => 'README.md.tex';
 write_file(README_MD_TEX, {binmode => ':utf8'}, $contents);
 
diff --git a/src/socket-unix.cxx b/src/socket-unix.cxx
@@ -287,6 +287,32 @@ accept_wrap (
     return result;
 }
 
+// Overload for `accept4()`.
+template <typename accept_sockaddr_ptr_type, typename accept_socklen_type>
+static
+SOCKET_TYPE
+accept_wrap (
+    int (* accept_func) (int, accept_sockaddr_ptr_type, accept_socklen_type *,
+        int),
+    SOCKET_TYPE sock, struct sockaddr * sa, socklen_t * len)
+{
+    typedef typename socklen_var<accept_socklen_type, socklen_t>::type
+        socklen_var_type;
+    socklen_var_type l = static_cast<socklen_var_type>(*len);
+    SOCKET_TYPE result
+        = static_cast<SOCKET_TYPE>(
+            accept_func (sock, sa,
+                reinterpret_cast<accept_socklen_type *>(&l),
+#if defined (SOCK_CLOEXEC)
+                SOCK_CLOEXEC
+#else
+                0
+#endif
+                ));
+    *len = static_cast<socklen_t>(l);
+    return result;
+}
+
 
 } // namespace
 
@@ -299,7 +325,13 @@ acceptSocket(SOCKET_TYPE sock, SocketState& state)
     int clientSock;
 
     while(
-        (clientSock = accept_wrap (accept, to_os_socket (sock),
+        (clientSock = accept_wrap (
+#if defined (LOG4CPLUS_HAVE_ACCEPT4)
+            accept4
+#else
+            accept
+#endif
+            , to_os_socket (sock),
             reinterpret_cast<struct sockaddr*>(&net_client), &len))
         == -1
         && (errno == EINTR))
