ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/branches/8.3.x/src/mempool.c

Comparing ircd-hybrid/branches/8.3.x/src/mempool.c (file contents):
Revision 6782 by michael, Thu Nov 12 19:37:24 2015 UTC vs.
Revision 6783 by michael, Sun Nov 15 18:50:00 2015 UTC

#	Line 508 | Line 508 | mp_pool_new(size_t item_size, size_t chu
508		pool->next = mp_allocated_pools;
509		mp_allocated_pools = pool;
510
511	<	ilog(LOG_TYPE_DEBUG, "Capacity is %lu, item size is %lu, alloc size is %lu",
511	>	ilog(LOG_TYPE_DEBUG, "Capacity is %lu, item size is %zu, alloc size is %lu",
512		(unsigned long)pool->new_chunk_capacity,
513	<	(unsigned long)pool->item_alloc_size,
513	>	pool->item_alloc_size,
514		(unsigned long)(pool->new_chunk_capacity*pool->item_alloc_size));
515
516		return pool;
#	Line 716 | Line 716 | mp_pool_log_status(mp_pool_t *pool)
716		for (chunk = pool->empty_chunks; chunk; chunk = chunk->next)
717		bytes_allocated += chunk->mem_size;
718
719	<	ilog(LOG_TYPE_DEBUG, "%llu bytes in %d empty chunks",
719	>	ilog(LOG_TYPE_DEBUG, "%ju bytes in %d empty chunks",
720		bytes_allocated, pool->n_empty_chunks);
721		for (chunk = pool->used_chunks; chunk; chunk = chunk->next)
722		{
#	Line 728 | Line 728 | mp_pool_log_status(mp_pool_t *pool)
728		chunk->n_allocated);
729		}
730
731	<	ilog(LOG_TYPE_DEBUG, "%llu/%llu bytes in %d partially full chunks",
731	>	ilog(LOG_TYPE_DEBUG, "%ju/%ju bytes in %d partially full chunks",
732		bu, ba, n_used);
733		bytes_used += bu;
734		bytes_allocated += ba;
#	Line 741 | Line 741 | mp_pool_log_status(mp_pool_t *pool)
741		ba += chunk->mem_size;
742		}
743
744	<	ilog(LOG_TYPE_DEBUG, "%llu/%llu bytes in %d full chunks",
744	>	ilog(LOG_TYPE_DEBUG, "%ju/%ju bytes in %d full chunks",
745		bu, ba, n_full);
746		bytes_used += bu;
747		bytes_allocated += ba;
748
749	<	ilog(LOG_TYPE_DEBUG, "Total: %llu/%llu bytes allocated "
749	>	ilog(LOG_TYPE_DEBUG, "Total: %ju/%ju bytes allocated "
750		"for cell pools are full.",
751		bytes_used, bytes_allocated);
752
753		#ifdef MEMPOOL_STATS
754	<	ilog(LOG_TYPE_DEBUG, "%llu cell allocations ever; "
755	<	"%llu chunk allocations ever; "
756	<	"%llu chunk frees ever.",
754	>	ilog(LOG_TYPE_DEBUG, "%ju cell allocations ever; "
755	>	"%ju chunk allocations ever; "
756	>	"%ju chunk frees ever.",
757		pool->total_items_allocated,
758		pool->total_chunks_allocated,
759		pool->total_chunks_freed);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines