Received: by mail.netbsd.org (Postfix, from userid 605) id 61B0684DA8; Fri, 27 Mar 2020 20:51:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DFECB84D8D for ; Fri, 27 Mar 2020 20:51:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 035isve_XBLK for ; Fri, 27 Mar 2020 20:51:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2F9DC84D2C for ; Fri, 27 Mar 2020 20:51:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 29E23FB27; Fri, 27 Mar 2020 20:51:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585342284137580" MIME-Version: 1.0 Date: Fri, 27 Mar 2020 20:51:24 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/www/passenger To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200327205124.29E23FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1585342284137580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Fri Mar 27 20:51:24 UTC 2020 Modified Files: pkgsrc/www/passenger: distinfo Added Files: pkgsrc/www/passenger/patches: patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp patch-src_cxx__supportlib_oxt_system__calls.cpp Log Message: Resolve conflict with std::this_thread. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/passenger/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp \ pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp \ pkgsrc/www/passenger/patches/patch-src_cxx__supportlib_oxt_system__calls.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585342284137580 Content-Disposition: inline Content-Length: 7025 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/passenger/distinfo diff -u pkgsrc/www/passenger/distinfo:1.11 pkgsrc/www/passenger/distinfo:1.12 --- pkgsrc/www/passenger/distinfo:1.11 Wed Dec 25 00:15:42 2019 +++ pkgsrc/www/passenger/distinfo Fri Mar 27 20:51:23 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2019/12/25 00:15:42 joerg Exp $ +$NetBSD: distinfo,v 1.12 2020/03/27 20:51:23 joerg Exp $ SHA1 (passenger-5.3.7.tar.gz) = 8d665aa9c662bf0e75585ad038d5474398120a8c RMD160 (passenger-5.3.7.tar.gz) = 0ec1392becd55903c88ec2a52baa41c130b8fb6b @@ -6,9 +6,12 @@ SHA512 (passenger-5.3.7.tar.gz) = bbef48 Size (passenger-5.3.7.tar.gz) = 7195477 bytes SHA1 (patch-build_common__library.rb) = fc019cb2774245400e74741d34b43b87b4b8b0c8 SHA1 (patch-build_packaging.rb) = b50c291c8e3989bbd8d128dab98c06f5e6a30e51 +SHA1 (patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp) = 8ed38113188ea92a856d3501d4e69af526bb0b6f +SHA1 (patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp) = c6d18ea068860e3f6b9529f9935da36cb26f933b SHA1 (patch-src_agent_Core_SpawningKit_Exceptions.h) = 2a11497e944f680893662a8cd4bef866dd4e71f8 SHA1 (patch-src_cxx__supportlib_LoggingKit_Context.h) = ff8dd506a6f5cd110c8e4317ecceab480a8f90c4 SHA1 (patch-src_cxx__supportlib_SystemTools_ProcessMetricsCollector.h) = 51e91937618fe89c56e9f1cdbce03a76bd59d635 +SHA1 (patch-src_cxx__supportlib_oxt_system__calls.cpp) = cf22b21ab012f5bbe2ab76364a9483a91ae7ec0e SHA1 (patch-src_cxx__supportlib_vendor-modified_boost_asio_detail_impl_kqueue__reactor.ipp) = 87bc0fc0aab123274b760d60cf2b49d3c1ecddd9 SHA1 (patch-src_ruby__supportlib_phusion__passenger.rb) = b5bf22b8ef94f9c64e0f02ed97e4c104eddf7cb6 SHA1 (patch-src_ruby__supportlib_phusion__passenger_packaging.rb) = 74134ef6c360bc65ffb4f74e7ebcc36bf7b6e9f7 Added files: Index: pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp diff -u /dev/null pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp:1.1 --- /dev/null Fri Mar 27 20:51:24 2020 +++ pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp Fri Mar 27 20:51:23 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_agent_Core_ApplicationPool_Group_ProcessListManagement.cpp,v 1.1 2020/03/27 20:51:23 joerg Exp $ + +--- src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp.orig 2020-03-27 14:52:59.290944767 +0000 ++++ src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp +@@ -305,7 +305,7 @@ Group::detachedProcessesCheckerMain(Grou + while (true) { + assert(detachedProcessesCheckerActive); + +- if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) { ++ if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) { + UPDATE_TRACE_POINT(); + P_DEBUG("Stopping detached processes checker"); + detachedProcessesCheckerActive = false; Index: pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp diff -u /dev/null pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp:1.1 --- /dev/null Fri Mar 27 20:51:24 2020 +++ pkgsrc/www/passenger/patches/patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp Fri Mar 27 20:51:23 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_agent_Core_ApplicationPool_Pool_GarbageCollection.cpp,v 1.1 2020/03/27 20:51:23 joerg Exp $ + +--- src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp.orig 2020-03-27 14:54:52.035140742 +0000 ++++ src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp +@@ -55,7 +55,7 @@ Pool::garbageCollect(PoolPtr self) { + self->garbageCollectionCond.timed_wait(lock, + posix_time::seconds(5)); + } +- while (!this_thread::interruption_requested()) { ++ while (!boost::this_thread::interruption_requested()) { + try { + UPDATE_TRACE_POINT(); + unsigned long long sleepTime = self->realGarbageCollect(); Index: pkgsrc/www/passenger/patches/patch-src_cxx__supportlib_oxt_system__calls.cpp diff -u /dev/null pkgsrc/www/passenger/patches/patch-src_cxx__supportlib_oxt_system__calls.cpp:1.1 --- /dev/null Fri Mar 27 20:51:24 2020 +++ pkgsrc/www/passenger/patches/patch-src_cxx__supportlib_oxt_system__calls.cpp Fri Mar 27 20:51:23 2020 @@ -0,0 +1,71 @@ +$NetBSD: patch-src_cxx__supportlib_oxt_system__calls.cpp,v 1.1 2020/03/27 20:51:23 joerg Exp $ + +--- src/cxx_supportlib/oxt/system_calls.cpp.orig 2020-03-27 15:09:11.254324657 +0000 ++++ src/cxx_supportlib/oxt/system_calls.cpp +@@ -132,15 +132,15 @@ shouldSimulateFailure() { + _my_errno = errno; \ + } while ((error_expression) \ + && _my_errno == EINTR \ +- && (!this_thread::syscalls_interruptable() \ +- || !(_intr_requested = this_thread::interruption_requested())) \ ++ && (!boost::this_thread::syscalls_interruptable() \ ++ || !(_intr_requested = boost::this_thread::interruption_requested())) \ + ); \ + if (OXT_LIKELY(ctx != NULL)) { \ + ctx->syscall_interruption_lock.lock(); \ + } \ + if ((error_expression) \ + && _my_errno == EINTR \ +- && this_thread::syscalls_interruptable() \ ++ && boost::this_thread::syscalls_interruptable() \ + && _intr_requested) { \ + throw thread_interrupted(); \ + } \ +@@ -284,8 +284,8 @@ syscalls::close(int fd) { + } + if (ret == -1 + && errno == EINTR +- && this_thread::syscalls_interruptable() +- && this_thread::interruption_requested()) { ++ && boost::this_thread::syscalls_interruptable() ++ && boost::this_thread::interruption_requested()) { + throw thread_interrupted(); + } else { + return ret; +@@ -662,8 +662,8 @@ syscalls::nanosleep(const struct timespe + } + } while (ret == -1 + && e == EINTR +- && (!this_thread::syscalls_interruptable() +- || !(intr_requested = this_thread::interruption_requested())) ++ && (!boost::this_thread::syscalls_interruptable() ++ || !(intr_requested = boost::this_thread::interruption_requested())) + ); + + if (OXT_UNLIKELY(ctx != NULL)) { +@@ -672,7 +672,7 @@ syscalls::nanosleep(const struct timespe + + if (ret == -1 + && e == EINTR +- && this_thread::syscalls_interruptable() ++ && boost::this_thread::syscalls_interruptable() + && intr_requested) { + throw thread_interrupted(); + } +@@ -748,14 +748,14 @@ syscalls::waitpid(pid_t pid, int *status + * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943 + * https://bugzilla.redhat.com/show_bug.cgi?id=731228 + */ +- __thread int this_thread::_syscalls_interruptable = 1; ++ __thread int boost::this_thread::_syscalls_interruptable = 1; + + bool + boost::this_thread::syscalls_interruptable() { + return _syscalls_interruptable; + } + #else +- boost::thread_specific_ptr this_thread::_syscalls_interruptable; ++ boost::thread_specific_ptr boost::this_thread::_syscalls_interruptable; + + bool + boost::this_thread::syscalls_interruptable() { --_----------=_1585342284137580--