Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/167302
Change subject: Add https://github.com/facebook/hhvm/pull/4000 ...................................................................... Add https://github.com/facebook/hhvm/pull/4000 Change-Id: I304e9d9261fd4a6af6b456a7938b95528cca7b22 Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M debian/changelog A debian/patches/Only-initialze-sweepables-on-new-threads.patch M debian/patches/series 3 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/02/167302/1 diff --git a/debian/changelog b/debian/changelog index 83e7e40..07d02fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hhvm (3.3.0-20140925+wmf3) trusty-wikimedia; urgency=medium + + * Added https://github.com/facebook/hhvm/pull/4000 + + -- Giuseppe Lavagetto <[email protected]> Fri, 17 Oct 2014 21:59:36 +0200 + hhvm (3.3.0-20140925+wmf2) trusty-wikimedia; urgency=medium * Fix config files path. diff --git a/debian/patches/Only-initialze-sweepables-on-new-threads.patch b/debian/patches/Only-initialze-sweepables-on-new-threads.patch new file mode 100644 index 0000000..e26de41 --- /dev/null +++ b/debian/patches/Only-initialze-sweepables-on-new-threads.patch @@ -0,0 +1,44 @@ +From 199f07e5c0c744bd28c7038b403f9972c7ebfa9b Mon Sep 17 00:00:00 2001 +From: Nik Everett <[email protected]> +Date: Thu, 16 Oct 2014 08:11:10 -0700 +Subject: [PATCH] Only initialze sweepables on new threads + +Closes #3999 +--- + +diff --git a/hphp/runtime/base/sweepable.cpp b/hphp/runtime/base/sweepable.cpp +index a886abf..ca60b57 100644 +--- a/hphp/runtime/base/sweepable.cpp ++++ b/hphp/runtime/base/sweepable.cpp +@@ -39,6 +39,7 @@ void Sweepable::Node::delist() { + p->next = n; + } + ++// Called once per thread initialization from ThreadInfo::init + void Sweepable::InitSweepableList() { + t_sweep.init(); + } +diff --git a/hphp/runtime/base/thread-info.cpp b/hphp/runtime/base/thread-info.cpp +index 215bb96..0889648 100644 +--- a/hphp/runtime/base/thread-info.cpp ++++ b/hphp/runtime/base/thread-info.cpp +@@ -65,6 +65,7 @@ ThreadInfo::ThreadInfo() + + Lock lock(s_thread_info_mutex); + s_thread_infos.insert(this); ++ Sweepable::InitSweepableList(); + } + + ThreadInfo::~ThreadInfo() { +diff --git a/hphp/runtime/base/thread-init-fini.cpp b/hphp/runtime/base/thread-init-fini.cpp +index d685ab5..f533bf5 100644 +--- a/hphp/runtime/base/thread-init-fini.cpp ++++ b/hphp/runtime/base/thread-init-fini.cpp +@@ -50,7 +50,6 @@ InitFiniNode::InitFiniNode(void(*f)(), When init) { + } + + void init_thread_locals(void *arg /* = NULL */) { +- Sweepable::InitSweepableList(); + ServerStats::GetLogger(); + zend_get_bigint_data(); + zend_get_rand_data(); diff --git a/debian/patches/series b/debian/patches/series index 1592731..102a8f7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ ezc-clear-exception.patch support-custom-stream-wrappers-in-xmlreader.patch fix-memcached-increment-decrement.patch +Only-initialze-sweepables-on-new-threads.patch -- To view, visit https://gerrit.wikimedia.org/r/167302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I304e9d9261fd4a6af6b456a7938b95528cca7b22 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
