passenger 5.0.28 → 5.0.29

data/src/cxx_supportlib/Constants.h

@@ -1,161 +1,101 @@
 /*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ * encoding: utf-8
+ * Phusion Passenger - https://www.phusionpassenger.com/
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ * "Passenger", "Phusion Passenger" and "Union Station" are registered
+ * trademarks of Phusion Holding B.V.
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #ifndef _PASSENGER_CONSTANTS_H_
 #define _PASSENGER_CONSTANTS_H_
 
-/* Constants.h is automatically generated from Constants.h.erb by the build system.
- * Most constants are derived from src/ruby_supportlib/phusion_passenger/constants.rb.
+/*
+ * Constants.h is automatically generated from Constants.h.cxxcodebuilder by the build system.
+ * All constants are derived from src/ruby_supportlib/phusion_passenger/constants.rb.
  *
  * To force regenerating this file:
  *   rm -f src/cxx_supportlib/Constants.h
  *   rake src/cxx_supportlib/Constants.h
  */
 
-
-	#define AGENT_EXE "PassengerAgent"
-
-	#define DEB_APACHE_MODULE_PACKAGE "libapache2-mod-passenger"
-
-	#define DEB_DEV_PACKAGE "passenger-dev"
-
-	#define DEB_MAIN_PACKAGE "passenger"
-
-	#define DEB_NGINX_PACKAGE "nginx-extras"
-
-	#define DEFAULT_ANALYTICS_LOG_GROUP ""
-
-	#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
-
-	#define DEFAULT_ANALYTICS_LOG_USER "nobody"
-
-	#define DEFAULT_APP_ENV "production"
-
-	#define DEFAULT_APP_THREAD_COUNT 1
-
-	#define DEFAULT_CONCURRENCY_MODEL "process"
-
-	#define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
-
-	#define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
-
-	#define DEFAULT_INTEGRATION_MODE "standalone"
-
-	#define DEFAULT_LOG_LEVEL 3
-
-	#define DEFAULT_LVE_MIN_UID 500
-
-	#define DEFAULT_MAX_POOL_SIZE 6
-
-	#define DEFAULT_MAX_PRELOADER_IDLE_TIME 300
-
-	#define DEFAULT_MAX_REQUEST_QUEUE_SIZE 100
-
-	#define DEFAULT_MBUF_CHUNK_SIZE 512
-
-	#define DEFAULT_NODEJS "node"
-
-	#define DEFAULT_POOL_IDLE_TIME 300
-
-	#define DEFAULT_PYTHON "python"
-
-	#define DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK 134217728
-
-	#define DEFAULT_RUBY "ruby"
-
-	#define DEFAULT_SOCKET_BACKLOG 2048
-
-	#define DEFAULT_SPAWN_METHOD "smart"
-
-	#define DEFAULT_START_TIMEOUT 90000
-
-	#define DEFAULT_STAT_THROTTLE_RATE 10
-
-	#define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
-
-	#define DEFAULT_UNION_STATION_GATEWAY_ADDRESS "gateway.unionstationapp.com"
-
-	#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
-
-	#define DEFAULT_UST_ROUTER_LISTEN_ADDRESS "tcp://127.0.0.1:9344"
-
-	#define DEFAULT_WEB_APP_USER "nobody"
-
-	#define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
-
-	#define FEEDBACK_FD 3
-
-	#define FLYING_PASSENGER_NAME "Flying Passenger"
-
-	#define GLOBAL_NAMESPACE_DIRNAME "passenger"
-
-	#define MESSAGE_SERVER_MAX_PASSWORD_SIZE 100
-
-	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
-
-	#define PASSENGER_API_VERSION "0.3"
-
-	#define PASSENGER_API_VERSION_MAJOR 0
-
-	#define PASSENGER_API_VERSION_MINOR 3
-
-	#define PASSENGER_DEFAULT_USER "nobody"
-
-	#define PASSENGER_VERSION "5.0.28"
-
-	#define POOL_HELPER_THREAD_STACK_SIZE 262144
-
-	#define PROCESS_SHUTDOWN_TIMEOUT 60
-
-	#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
-
-	#define PROGRAM_NAME "Phusion Passenger"
-
-	#define RPM_APACHE_MODULE_PACKAGE "mod_passenger"
-
-	#define RPM_DEV_PACKAGE "passenger-devel"
-
-	#define RPM_MAIN_PACKAGE "passenger"
-
-	#define RPM_NGINX_PACKAGE "nginx"
-
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 3
-
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
-
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 0
-
-	#define SERVER_KIT_MAX_SERVER_ENDPOINTS 4
-
-	#define SERVER_TOKEN_NAME "Phusion_Passenger"
-
-	#define SHORT_PROGRAM_NAME "Passenger"
-
-	#define SUPPORT_URL "https://www.phusionpassenger.com/documentation_and_support"
-
-	#define USER_NAMESPACE_DIRNAME ".passenger"
-
-
-#endif /* _PASSENGER_CONSTANTS_H */
+#define AGENT_EXE "PassengerAgent"
+#define DEB_APACHE_MODULE_PACKAGE "libapache2-mod-passenger"
+#define DEB_DEV_PACKAGE "passenger-dev"
+#define DEB_MAIN_PACKAGE "passenger"
+#define DEB_NGINX_PACKAGE "nginx-extras"
+#define DEFAULT_ANALYTICS_LOG_GROUP ""
+#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
+#define DEFAULT_ANALYTICS_LOG_USER "nobody"
+#define DEFAULT_APP_ENV "production"
+#define DEFAULT_APP_THREAD_COUNT 1
+#define DEFAULT_CONCURRENCY_MODEL "process"
+#define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
+#define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
+#define DEFAULT_INTEGRATION_MODE "standalone"
+#define DEFAULT_LOG_LEVEL 3
+#define DEFAULT_LVE_MIN_UID 500
+#define DEFAULT_MAX_POOL_SIZE 6
+#define DEFAULT_MAX_PRELOADER_IDLE_TIME 300
+#define DEFAULT_MAX_REQUEST_QUEUE_SIZE 100
+#define DEFAULT_MBUF_CHUNK_SIZE 512
+#define DEFAULT_NODEJS "node"
+#define DEFAULT_POOL_IDLE_TIME 300
+#define DEFAULT_PYTHON "python"
+#define DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK 134217728
+#define DEFAULT_RUBY "ruby"
+#define DEFAULT_SOCKET_BACKLOG 2048
+#define DEFAULT_SPAWN_METHOD "smart"
+#define DEFAULT_START_TIMEOUT 90000
+#define DEFAULT_STAT_THROTTLE_RATE 10
+#define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
+#define DEFAULT_UNION_STATION_GATEWAY_ADDRESS "gateway.unionstationapp.com"
+#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
+#define DEFAULT_UST_ROUTER_LISTEN_ADDRESS "tcp://127.0.0.1:9344"
+#define DEFAULT_WEB_APP_USER "nobody"
+#define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
+#define FEEDBACK_FD 3
+#define FLYING_PASSENGER_NAME "Flying Passenger"
+#define GLOBAL_NAMESPACE_DIRNAME "passenger"
+#define MESSAGE_SERVER_MAX_PASSWORD_SIZE 100
+#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
+#define PASSENGER_API_VERSION "0.3"
+#define PASSENGER_API_VERSION_MAJOR 0
+#define PASSENGER_API_VERSION_MINOR 3
+#define PASSENGER_DEFAULT_USER "nobody"
+#define PASSENGER_VERSION "5.0.29"
+#define POOL_HELPER_THREAD_STACK_SIZE 262144
+#define PROCESS_SHUTDOWN_TIMEOUT 60
+#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
+#define PROGRAM_NAME "Phusion Passenger"
+#define RPM_APACHE_MODULE_PACKAGE "mod_passenger"
+#define RPM_DEV_PACKAGE "passenger-devel"
+#define RPM_MAIN_PACKAGE "passenger"
+#define RPM_NGINX_PACKAGE "nginx"
+#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 3
+#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
+#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 0
+#define SERVER_KIT_MAX_SERVER_ENDPOINTS 4
+#define SERVER_TOKEN_NAME "Phusion_Passenger"
+#define SHORT_PROGRAM_NAME "Passenger"
+#define SUPPORT_URL "https://www.phusionpassenger.com/documentation_and_support"
+#define USER_NAMESPACE_DIRNAME ".passenger"
+
+#endif /* _PASSENGER_CONSTANTS_H_ */

data/src/cxx_supportlib/Constants.h.cxxcodebuilder

@@ -0,0 +1,43 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+comment copyright_header_for(__FILE__)
+
+guard_macros '_PASSENGER_CONSTANTS_H_' do
+  comment %q{
+    Constants.h is automatically generated from Constants.h.cxxcodebuilder by the build system.
+    All constants are derived from src/ruby_supportlib/phusion_passenger/constants.rb.
+
+    To force regenerating this file:
+      rm -f src/cxx_supportlib/Constants.h
+      rake src/cxx_supportlib/Constants.h
+  }
+
+  separator
+
+  PhusionPassenger::SharedConstants.constants.sort.each do |constant_name|
+    define("#{constant_name} #{PhusionPassenger::SharedConstants.const_get(constant_name).inspect}")
+  end
+end

data/src/cxx_supportlib/DataStructures/LString.h

@@ -28,6 +28,7 @@
 
 #include <boost/cstdint.hpp>
 #include <oxt/backtrace.hpp>
+#include <oxt/macros.hpp>
 #include <stdexcept>
 #include <cstring>
 #include <cassert>
@@ -99,7 +100,7 @@ psg_lstr_init(LString *str) {
 inline LString *
 psg_lstr_create(psg_pool_t *pool, const char *data, unsigned int size) {
 	LString *result = (LString *) psg_palloc(pool, sizeof(LString));
-	if (result == NULL) {
+	if (OXT_UNLIKELY(result == NULL)) {
 		TRACE_POINT();
 		throw std::bad_alloc();
 	}
@@ -114,7 +115,7 @@ psg_lstr_create(psg_pool_t *pool, const StaticString &str) {
 }
 
 inline void
-psg_lstr_append_part(LString *str, LString::Part *part) {
+_psg_lstr_append_part(LString *str, LString::Part *part) {
 	if (str->size == 0) {
 		str->start = part;
 		str->end = part;
@@ -126,20 +127,6 @@ psg_lstr_append_part(LString *str, LString::Part *part) {
 	part->next = NULL;
 }
 
-inline void
-psg_lstr_append_part_from_another_lstr(LString *str, psg_pool_t *pool, const LString::Part *part) {
-	LString::Part *copy = (LString::Part *) psg_palloc(pool, sizeof(LString::Part));
-	if (copy == NULL) {
-		TRACE_POINT();
-		throw std::bad_alloc();
-	}
-	*copy = *part;
-	if (part->mbuf_block != NULL) {
-		mbuf_block_ref(part->mbuf_block);
-	}
-	psg_lstr_append_part(str, copy);
-}
-
 inline void
 psg_lstr_append(LString *str, psg_pool_t *pool, const MemoryKit::mbuf &buffer,
 	const char *data, unsigned int size)
@@ -147,16 +134,22 @@ psg_lstr_append(LString *str, psg_pool_t *pool, const MemoryKit::mbuf &buffer,
 	if (size == 0) {
 		return;
 	}
+
+	assert(data >= buffer.start);
+	assert(data + size <= buffer.end);
+
 	LString::Part *part = (LString::Part *) psg_palloc(pool, sizeof(LString::Part));
-	if (part == NULL) {
+	if (OXT_UNLIKELY(part == NULL)) {
 		TRACE_POINT();
 		throw std::bad_alloc();
 	}
+
+	// part->next is set to NULL by psg_lstr_append_part()
 	part->mbuf_block = buffer.mbuf_block;
 	part->data = data;
 	part->size = size;
 	mbuf_block_ref(buffer.mbuf_block);
-	psg_lstr_append_part(str, part);
+	_psg_lstr_append_part(str, part);
 }
 
 inline void
@@ -169,16 +162,18 @@ psg_lstr_append(LString *str, psg_pool_t *pool, const char *data, unsigned int s
 	if (size == 0) {
 		return;
 	}
+
 	LString::Part *part = (LString::Part *) psg_palloc(pool, sizeof(LString::Part));
-	if (part == NULL) {
+	if (OXT_UNLIKELY(part == NULL)) {
 		TRACE_POINT();
 		throw std::bad_alloc();
 	}
-	part->next = NULL;
+
+	// part->next is set to NULL by psg_lstr_append_part()
 	part->mbuf_block = NULL;
 	part->data = data;
 	part->size = size;
-	psg_lstr_append_part(str, part);
+	_psg_lstr_append_part(str, part);
 }
 
 inline void
@@ -186,6 +181,27 @@ psg_lstr_append(LString *str, psg_pool_t *pool, const char *data) {
 	psg_lstr_append(str, pool, data, strlen(data));
 }
 
+/**
+ * Move the parts in `from` to the end of `to`.
+ */
+inline void
+psg_lstr_move_and_append(LString *from, psg_pool_t *pool, LString *to) {
+	if (OXT_LIKELY(from != to)) {
+		if (from->size == 0) {
+			return;
+		}
+
+		if (to->size == 0) {
+			*to = *from;
+		} else {
+			to->end->next = from->start;
+			to->end = from->end;
+			to->size += from->size;
+		}
+		psg_lstr_init(from);
+	}
+}
+
 inline LString *
 psg_lstr_null_terminate(const LString *str, psg_pool_t *pool) {
 	LString *newstr;
@@ -193,7 +209,7 @@ psg_lstr_null_terminate(const LString *str, psg_pool_t *pool) {
 	char *data, *pos;
 
 	data = (char *) psg_pnalloc(pool, str->size + 1);
-	if (data == NULL) {
+	if (OXT_UNLIKELY(data == NULL)) {
 		TRACE_POINT();
 		throw std::bad_alloc();
 	}
@@ -208,10 +224,11 @@ psg_lstr_null_terminate(const LString *str, psg_pool_t *pool) {
 	*pos = '\0';
 
 	newstr = (LString *) psg_palloc(pool, sizeof(LString));
-	if (newstr == NULL) {
+	if (OXT_UNLIKELY(newstr == NULL)) {
 		TRACE_POINT();
 		throw std::bad_alloc();
 	}
+
 	psg_lstr_init(newstr);
 	psg_lstr_append(newstr, pool, data, str->size);
 	return newstr;

data/src/cxx_supportlib/MemoryKit/mbuf.cpp

@@ -25,11 +25,13 @@
 #include <ostream>
 #include <MemoryKit/mbuf.h>
 #include <Logging.h>
+#include <StaticString.h>
+#include <Utils/StrIntUtils.h>
 
 namespace Passenger {
 namespace MemoryKit {
 
-//#define MBUF_DEBUG
+//#define MBUF_DEBUG_REFCOUNTS
 
 #define ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, expr) \
 	do { \
@@ -54,6 +56,7 @@ _mbuf_block_mark_as_active(struct mbuf_pool *pool, struct mbuf_block *mbuf_block
 	#ifdef MBUF_ENABLE_BACKTRACES
 		mbuf_block->backtrace = strdup(oxt::thread::current_backtrace().c_str());
 	#endif
+	mbuf_block->refcount = 1;
 	pool->nactive_mbuf_blockq++;
 }
 
@@ -110,7 +113,6 @@ _mbuf_block_init(struct mbuf_pool *pool, char *buf, size_t block_offset)
 	mbuf_block = (struct mbuf_block *)(buf + block_offset);
 	mbuf_block->magic = MBUF_BLOCK_MAGIC;
 	mbuf_block->pool  = pool;
-	mbuf_block->refcount = 1;
 	mbuf_block->offset = 0;
 
 	_mbuf_block_mark_as_active(pool, mbuf_block);
@@ -127,10 +129,11 @@ _mbuf_block_get(struct mbuf_pool *pool)
 		assert(pool->nfree_mbuf_blockq > 0);
 
 		mbuf_block = STAILQ_FIRST(&pool->free_mbuf_blockq);
+		ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->magic == MBUF_BLOCK_MAGIC);
+		ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->refcount == 0);
+
 		pool->nfree_mbuf_blockq--;
 		STAILQ_REMOVE_HEAD(&pool->free_mbuf_blockq, next);
-
-		ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->magic == MBUF_BLOCK_MAGIC);
 		_mbuf_block_mark_as_active(pool, mbuf_block);
 		return mbuf_block;
 	}
@@ -162,7 +165,7 @@ mbuf_block_get(struct mbuf_pool *pool)
 		mbuf_block->end - mbuf_block->start == (int) pool->mbuf_block_offset);
 	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->start < mbuf_block->end);
 
-	#ifdef MBUF_DEBUG
+	#ifdef MBUF_DEBUG_REFCOUNTS
 		printf("[%p] mbuf_block get %p\n", oxt::thread_signature, mbuf_block);
 	#endif
 
@@ -192,7 +195,7 @@ mbuf_block_new_standalone(struct mbuf_pool *pool, size_t size)
 	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block,
 		mbuf_block->start < mbuf_block->end);
 
-	#ifdef MBUF_DEBUG
+	#ifdef MBUF_DEBUG_REFCOUNTS
 		printf("[%p] mbuf_block new standalone %p\n", oxt::thread_signature, mbuf_block);
 	#endif
 
@@ -204,7 +207,7 @@ mbuf_block_free(struct mbuf_block *mbuf_block)
 {
 	char *buf;
 
-	#ifdef MBUF_DEBUG
+	#ifdef MBUF_DEBUG_REFCOUNTS
 		printf("[%p] mbuf_block free %p\n", oxt::thread_signature, mbuf_block);
 	#endif
 
@@ -229,7 +232,7 @@ mbuf_block_free(struct mbuf_block *mbuf_block)
 void
 mbuf_block_put(struct mbuf_block *mbuf_block)
 {
-	#ifdef MBUF_DEBUG
+	#ifdef MBUF_DEBUG_REFCOUNTS
 		printf("[%p] mbuf_block put %p\n", oxt::thread_signature, mbuf_block);
 	#endif
 
@@ -239,7 +242,6 @@ mbuf_block_put(struct mbuf_block *mbuf_block)
 	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->pool->nactive_mbuf_blockq > 0);
 	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->offset == 0);
 
-	mbuf_block->refcount = 1;
 	mbuf_block->pool->nfree_mbuf_blockq++;
 	mbuf_block->pool->nactive_mbuf_blockq--;
 	STAILQ_INSERT_HEAD(&mbuf_block->pool->free_mbuf_blockq, mbuf_block, next);
@@ -261,6 +263,11 @@ mbuf_block_remove(struct mhdr *mhdr, struct mbuf_block *mbuf_block)
 	STAILQ_NEXT(mbuf_block, next) = NULL;
 }
 
+void
+_mbuf_block_assert_refcount_at_least_two(struct mbuf_block *mbuf_block) {
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->refcount >= 2);
+}
+
 void
 mbuf_pool_init(struct mbuf_pool *pool)
 {
@@ -311,29 +318,41 @@ mbuf_pool_compact(struct mbuf_pool *pool)
 void
 mbuf_block_ref(struct mbuf_block *mbuf_block)
 {
-	#ifdef MBUF_DEBUG
+	#ifdef MBUF_DEBUG_REFCOUNTS
 		printf("[%p] mbuf_block ref %p: %u -> %u\n",
 			oxt::thread_signature, mbuf_block,
 			mbuf_block->refcount, mbuf_block->refcount + 1);
 	#endif
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->refcount > 0);
 	#ifdef MBUF_ENABLE_BACKTRACES
 		mbuf_block->backtrace = strdup(oxt::thread::current_backtrace().c_str());
 	#endif
+
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, STAILQ_NEXT(mbuf_block, next) == NULL);
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->magic == MBUF_BLOCK_MAGIC);
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->pool->nactive_mbuf_blockq > 0);
+
 	mbuf_block->refcount++;
 }
 
 void
 mbuf_block_unref(struct mbuf_block *mbuf_block)
 {
-	#ifdef MBUF_DEBUG
+	#ifdef MBUF_DEBUG_REFCOUNTS
 		printf("[%p] mbuf_block unref %p: %u -> %u\n",
 			oxt::thread_signature, mbuf_block,
 			mbuf_block->refcount, mbuf_block->refcount - 1);
 	#endif
+
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, STAILQ_NEXT(mbuf_block, next) == NULL);
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->magic == MBUF_BLOCK_MAGIC);
 	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->refcount > 0);
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->pool->nactive_mbuf_blockq > 0);
+
 	mbuf_block->refcount--;
 	if (mbuf_block->refcount == 0) {
 		if (mbuf_block->offset > 0) {
+			ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->pool->nactive_mbuf_blockq > 0);
 			mbuf_block->pool->nactive_mbuf_blockq--;
 			mbuf_block_free(mbuf_block);
 		} else {
@@ -357,8 +376,7 @@ mbuf_get(struct mbuf_pool *pool)
 	}
 
 	ASSERT_MBUF_BLOCK_PROPERTY(block, block->refcount == 1);
-	block->refcount--;
-	return mbuf(block, 0, block->end - block->start);
+	return mbuf(block, 0, block->end - block->start, mbuf::just_created_t());
 }
 
 mbuf
@@ -375,8 +393,7 @@ mbuf_get_with_size(struct mbuf_pool *pool, size_t size)
 	}
 
 	ASSERT_MBUF_BLOCK_PROPERTY(block, block->refcount == 1);
-	block->refcount--;
-	return mbuf(block, 0, size);
+	return mbuf(block, 0, size, mbuf::just_created_t());
 }
 
 static void
@@ -387,6 +404,8 @@ mbuf_block_print(struct mbuf_block *mbuf_block, std::ostream &stream)
 		"mbuf_block.next: " << (void *) STAILQ_NEXT(mbuf_block, next) << "\n"
 		"mbuf_block.start: " << (void *) mbuf_block->start << "\n"
 		"mbuf_block.end: " << (void *) mbuf_block->end << "\n"
+		"mbuf_block.contents: \"" << cEscapeString(StaticString(mbuf_block->start,
+			mbuf_block->end - mbuf_block->start)) << "\"\n"
 		"mbuf_block.refcount: " << mbuf_block->refcount << "\n"
 		"mbuf_block.offset: " << mbuf_block->offset << "\n"
 		"mbuf_block.pool: " << (void *) mbuf_block->pool << "\n"
@@ -418,18 +437,34 @@ mbuf::initialize_with_block(unsigned int start, unsigned int len) {
 }
 
 void
-mbuf::initialize_with_mbuf(const mbuf &mbuf, unsigned int start, unsigned int len) {
-	mbuf_block = mbuf.mbuf_block;
+mbuf::initialize_with_block_just_created(unsigned int start, unsigned int len) {
+	this->start = clamp<char *>(
+		mbuf_block->start + start,
+		mbuf_block->start,
+		mbuf_block->end);
+	this->end = clamp<char *>(
+		mbuf_block->start + start + len,
+		mbuf_block->start,
+		mbuf_block->end);
+	ASSERT_MBUF_BLOCK_PROPERTY(mbuf_block, mbuf_block->refcount == 1);
+	#ifdef MBUF_ENABLE_BACKTRACES
+		mbuf_block->backtrace = strdup(oxt::thread::current_backtrace().c_str());
+	#endif
+}
+
+void
+mbuf::initialize_with_mbuf(const mbuf &other, unsigned int start, unsigned int len) {
+	mbuf_block = other.mbuf_block;
 	this->start = clamp<char *>(
-		mbuf.start + start,
-		mbuf.start,
-		mbuf.end);
+		other.start + start,
+		other.start,
+		other.end);
 	this->end = clamp<char *>(
-		mbuf.start + start + len,
-		mbuf.start,
-		mbuf.end);
-	if (mbuf.mbuf_block != NULL) {
-		mbuf_block_ref(mbuf.mbuf_block);
+		other.start + start + len,
+		other.start,
+		other.end);
+	if (other.mbuf_block != NULL) {
+		mbuf_block_ref(other.mbuf_block);
 	}
 }