Merge branch 'master' into master

pistacheio · Dec 17, 2024 · a96d40e · a96d40e
2 parents 818f8ad + a474d71
commit a96d40e
Show file tree

Hide file tree

Showing 39 changed files with 212 additions and 157 deletions.
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'macos-12', 'macos-13', 'macos-14', 'macos-15' ]
+        os: [ 'macos-13', 'macos-14', 'macos-15' ]
         compiler: [ 'gcc', 'clang' ]
         sanitizer: [ 'address', 'undefined', 'none' ]
         tls: [ 'true', 'false' ]

diff --git a/bldscripts/nfbmesbuild.sh b/bldscripts/nfbmesbuild.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+#
+# SPDX-FileCopyrightText: 2024 Duncan Greatwood
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Execute this script from the parent directory by invoking:
+#   bldscripts/nfbmesbuild.sh
+
+# Does the same as mesbuild.sh except with the --wrap-mode=nofallback
+# option set
+
+MY_SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source $MY_SCRIPT_DIR/helpers/messetdirvars.sh
+source $MY_SCRIPT_DIR/helpers/adjbuilddirformesbuild.sh
+
+MESON_BUILD_DIR="$MESON_BUILD_DIR.nfb"
+
+if [ -e "${MESON_BUILD_DIR}" ]
+then
+    echo "Using existing build dir ${MESON_BUILD_DIR}"
+else
+    meson setup ${MESON_BUILD_DIR} \
+    --wrap-mode=nofallback \
+    --buildtype=release \
+    -DPISTACHE_USE_SSL=true \
+    -DPISTACHE_BUILD_EXAMPLES=true \
+    -DPISTACHE_BUILD_TESTS=true \
+    -DPISTACHE_BUILD_DOCS=false \
+    -DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=true \
+    -DPISTACHE_USE_CONTENT_ENCODING_BROTLI=true \
+    -DPISTACHE_USE_CONTENT_ENCODING_ZSTD=true \
+    --prefix="${MESON_PREFIX_DIR}"
+fi
+
+meson compile -C ${MESON_BUILD_DIR}
diff --git a/include/pistache/async.h b/include/pistache/async.h
@@ -250,7 +250,7 @@ namespace Pistache::Async
 
                 if (allocated)
                 {
-                    reinterpret_cast<T*>(mem)->~T();
+                    std::destroy_at(reinterpret_cast<T*>(mem));
                     allocated = false;
                 }
 
@@ -274,7 +274,7 @@ namespace Pistache::Async
             {
                 if (allocated)
                 {
-                    reinterpret_cast<T*>(&storage)->~T();
+                    std::destroy_at(reinterpret_cast<T*>(storage));
                     allocated = false;
                 }
             }
@@ -299,8 +299,7 @@ namespace Pistache::Async
             void* memory() override { return &storage; }
 
         private:
-            typedef typename std::aligned_storage<sizeof(T), alignof(T)>::type Storage;
-            Storage storage;
+            alignas(T) std::byte storage[sizeof(T)];
         };
 
         template <>

diff --git a/include/pistache/common.h b/include/pistache/common.h
@@ -20,10 +20,10 @@
 
 #include <pistache/winornix.h>
 
-#include PIST_QUOTE(PST_STRERROR_R_HDR)
+#include PST_STRERROR_R_HDR
 
-#include PIST_QUOTE(PST_NETDB_HDR)
-#include PIST_QUOTE(PST_SOCKET_HDR)
+#include PST_NETDB_HDR
+#include PST_SOCKET_HDR
 
 #include <sys/types.h>
 

diff --git a/include/pistache/eventmeth.h b/include/pistache/eventmeth.h
@@ -209,7 +209,7 @@ namespace Pistache
 #include <map>
 #include <condition_variable>
 
-#include PIST_QUOTE(PST_FCNTL_HDR) // For FD_CLOEXEC and O_NONBLOCK
+#include PST_FCNTL_HDR // For FD_CLOEXEC and O_NONBLOCK
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/include/pistache/listener.h b/include/pistache/listener.h
@@ -24,7 +24,7 @@
 #include <pistache/ssl_wrappers.h>
 #include <pistache/tcp.h>
 
-#include PIST_QUOTE(PST_SYS_RESOURCE_HDR)
+#include PST_SYS_RESOURCE_HDR
 
 #include <memory>
 #include <thread>

diff --git a/include/pistache/mailbox.h b/include/pistache/mailbox.h
@@ -14,12 +14,12 @@
 
 #include <pistache/winornix.h>
 
-#include PIST_QUOTE(PST_STRERROR_R_HDR)
+#include PST_STRERROR_R_HDR
 
 #include <pistache/eventmeth.h>
 #include <pistache/pist_quote.h>
 
-#include PIST_QUOTE(PIST_SOCKFNS_HDR)
+#include PIST_SOCKFNS_HDR
 
 #include <pistache/common.h>
 #include <pistache/os.h>
@@ -213,8 +213,7 @@ namespace Pistache
             T& data() { return *reinterpret_cast<T*>(&storage); }
 
         private:
-            typedef typename std::aligned_storage<sizeof(T), alignof(T)>::type Storage;
-            Storage storage;
+            alignas(T) std::byte storage[sizeof(T)];
             std::atomic<Entry*> next;
         };
 
@@ -233,7 +232,7 @@ namespace Pistache
             while (!empty())
             {
                 Entry* e = pop();
-                e->data().~T();
+                std::destroy_at(&e->data());
                 delete e;
             }
             delete tail;
@@ -258,7 +257,7 @@ namespace Pistache
                 // Since it's Single-Consumer, the store does not need to be atomic
                 tail = next;
                 new (&res->storage) T(std::move(next->data()));
-                next->data().~T();
+                std::destroy_at(&next->data());
                 return res;
             }
             return nullptr;
@@ -275,7 +274,7 @@ namespace Pistache
             if (entry)
             {
                 object.reset(new T(std::move(entry->data())));
-                entry->data().~T();
+                std::destroy_at(&entry->data());
             }
 
             return object;

diff --git a/include/pistache/net.h b/include/pistache/net.h
@@ -19,16 +19,16 @@
 
 #include <pistache/winornix.h>
 
-#include PIST_QUOTE(PST_NETDB_HDR)
+#include PST_NETDB_HDR
 
 // netinet/in.h defines in_port_t, in_addr_t, in_addr, sockaddr_in,
 // sockaddr_in6, IPPROTO_IP, INADDR_ANY, etc.
-#include PIST_QUOTE(PST_NETINET_IN_HDR)
+#include PST_NETINET_IN_HDR
 
-#include PIST_QUOTE(PST_SOCKET_HDR)
-#include PIST_QUOTE(PST_SYS_UN_HDR)
+#include PST_SOCKET_HDR
+#include PST_SYS_UN_HDR
 
-#include PIST_QUOTE(PIST_SOCKFNS_HDR)
+#include PIST_SOCKFNS_HDR
 
 #ifndef _KERNEL_FASTOPEN
 #define _KERNEL_FASTOPEN

diff --git a/include/pistache/pist_check.h b/include/pistache/pist_check.h
@@ -15,7 +15,7 @@
 #define INCLUDED_PSCHECK_H
 
 #include <mutex>
-
+#include <pistache/pist_quote.h>
 #include "pist_syslog.h"
 
 // If DEBUG is enabled, PS_LOGDBG_STACK_TRACE logs a stack trace

diff --git a/include/pistache/pist_timelog.h b/include/pistache/pist_timelog.h
@@ -19,7 +19,7 @@
 #include <pistache/winornix.h>
 #include <pistache/emosandlibevdefs.h> // For _IS_BSD
 
-#include PIST_QUOTE(PST_CLOCK_GETTIME_HDR) // for clock_gettime and asctime
+#include PST_CLOCK_GETTIME_HDR // for clock_gettime and asctime
 #include <stdio.h> // snprintf
 #include <stdarg.h> // for vsnprintf
 

diff --git a/include/pistache/ps_basename.h b/include/pistache/ps_basename.h
@@ -13,7 +13,7 @@
 
 #include <pistache/winornix.h>
 
-#include PIST_QUOTE(PST_MAXPATH_HDR) // for PST_MAXPATHLEN
+#include PST_MAXPATH_HDR // for PST_MAXPATHLEN
 /* ------------------------------------------------------------------------- */
 
 #ifdef __APPLE__

diff --git a/include/pistache/pst_errno.h b/include/pistache/pst_errno.h
@@ -8,7 +8,7 @@
 //
 // Note that we use this intermediate include, rather than just relying solely
 // on defining PST_ERRNO_HDR to be 'errno.h' for Windows, because of mingw
-// gcc's treatment of errno as a macro - 'include PIST_QUOTE(PST_ERRNO_HDR)',
+// gcc's treatment of errno as a macro - 'include PST_ERRNO_HDR',
 // with PST_ERRNO_HDR defined as 'errno.h', can translate to "(*_errno()).h",
 // which is not what we want.
 //

diff --git a/include/pistache/timer_pool.h b/include/pistache/timer_pool.h
@@ -25,7 +25,7 @@
 #include <vector>
 
 #include <cassert>
-#include PIST_QUOTE(PST_MISC_IO_HDR) // e.g. unistd.h
+#include PST_MISC_IO_HDR // e.g. unistd.h
 
 namespace Pistache
 {

diff --git a/include/pistache/transport.h b/include/pistache/transport.h
@@ -14,10 +14,8 @@
 
 #include <pistache/winornix.h>
 
-#include PIST_QUOTE(PST_SYS_RESOURCE_HDR) // for PST_RUSAGE + PST_GETRUSAGE
+#include PST_SYS_RESOURCE_HDR // for PST_RUSAGE + PST_GETRUSAGE
 
-#include <pistache/pist_timelog.h>
-#include <pistache/pist_quote.h>
 #include <pistache/async.h>
 #include <pistache/mailbox.h>
 #include <pistache/pist_quote.h>