Loading...
--- libmalloc/libmalloc-374.120.1/src/magazine_tiny.c
+++ libmalloc/libmalloc-317.140.5/src/magazine_tiny.c
@@ -81,11 +81,7 @@
 		if (BITARRAY_BIT(prev_header, prev_index)) {
 			return 1;
 		}
-		msize_t *prev_msize_ptr = &TINY_PREVIOUS_MSIZE(ptr);
-		// This is a speculative read of potentially in-use app memory, we need
-		// to use _malloc_read_uint16_via_rsp to avoid triggering warnings in
-		// memory diagnostic tools.
-		return _malloc_read_uint16_via_rsp(prev_msize_ptr);
+		return TINY_PREVIOUS_MSIZE(ptr);
 	}
 	// don't read possibly unmapped memory before the beginning of the region
 	return 0;
@@ -877,11 +873,6 @@
 				continue;
 			}
 
-			if (REGION_TRAILER_FOR_TINY_REGION(tiny)->pinned_to_depot > 0) {
-				SZONE_MAGAZINE_PTR_UNLOCK(mag_ptr);
-				continue;
-			}
-
 			if (tiny == mag_ptr->mag_last_region && (mag_ptr->mag_bytes_free_at_end || mag_ptr->mag_bytes_free_at_start)) {
 				tiny_finalize_region(rack, mag_ptr);
 			}
@@ -896,7 +887,7 @@
 
 			SZONE_MAGAZINE_PTR_LOCK(tiny_depot_ptr);
 			MAGAZINE_INDEX_FOR_TINY_REGION(tiny) = DEPOT_MAGAZINE_INDEX;
-			MALLOC_ASSERT(REGION_TRAILER_FOR_TINY_REGION(tiny)->pinned_to_depot == 0);
+			REGION_TRAILER_FOR_TINY_REGION(tiny)->pinned_to_depot = 0;
 
 			size_t bytes_inplay = tiny_free_reattach_region(rack, tiny_depot_ptr, tiny);
 
@@ -985,6 +976,11 @@
 {
 	magazine_t *depot_ptr = &(rack->magazines[DEPOT_MAGAZINE_INDEX]);
 
+	/* FIXME: Would Uniprocessor benefit from recirc and MADV_FREE? */
+	if (rack->num_magazines == 1) { // Uniprocessor, single magazine, so no recirculation necessary
+		return 0;
+	}
+
 #if DEBUG_MALLOC
 	if (DEPOT_MAGAZINE_INDEX == mag_index) {
 		malloc_zone_error(rack->debug_flags, true, "tiny_get_region_from_depot called for magazine index -1\n");
@@ -997,32 +993,22 @@
 	// Appropriate a Depot'd region that can satisfy requested msize.
 	region_trailer_t *node;
 	region_t sparse_region;
-	msize_t try_msize = msize;
 
 	while (1) {
-		sparse_region = tiny_find_msize_region(rack, depot_ptr, DEPOT_MAGAZINE_INDEX, try_msize);
+		sparse_region = tiny_find_msize_region(rack, depot_ptr, DEPOT_MAGAZINE_INDEX, msize);
 		if (NULL == sparse_region) { // Depot empty?
 			SZONE_MAGAZINE_PTR_UNLOCK(depot_ptr);
 			return 0;
 		}
 
 		node = REGION_TRAILER_FOR_TINY_REGION(sparse_region);
-		if (0 == node->pinned_to_depot) {
-			// Found one!
+		if (0 >= node->pinned_to_depot) {
 			break;
 		}
 
-		// Try the next msize up - maybe the head of its free list will be in
-		// a region we can use. Once we get the region we'll still allocate the
-		// original msize.
-		try_msize++;
-
-		if (try_msize > NUM_TINY_SLOTS) {
-			// Tried all the msizes but couldn't get a usable region. Let's
-			// give up for now and we'll allocate a new region from the kernel.
-			SZONE_MAGAZINE_PTR_UNLOCK(depot_ptr);
-			return 0;
-		}
+		SZONE_MAGAZINE_PTR_UNLOCK(depot_ptr);
+		yield();
+		SZONE_MAGAZINE_PTR_LOCK(depot_ptr);
 	}
 
 	// disconnect node from Depot
@@ -1033,7 +1019,7 @@
 
 	// Transfer ownership of the region
 	MAGAZINE_INDEX_FOR_TINY_REGION(sparse_region) = mag_index;
-	MALLOC_ASSERT(node->pinned_to_depot == 0);
+	node->pinned_to_depot = 0;
 
 	// Iterate the region putting its free entries on its new (locked) magazine's free list
 	size_t bytes_inplay = tiny_free_reattach_region(rack, tiny_mag_ptr, sparse_region);
@@ -1191,7 +1177,11 @@
 	region_trailer_t *node = REGION_TRAILER_FOR_TINY_REGION(region);
 	size_t bytes_used = node->bytes_used;
 
-	if (DEPOT_MAGAZINE_INDEX != mag_index) {
+	/* FIXME: Would Uniprocessor benefit from recirc and MADV_FREE? */
+	if (rack->num_magazines == 1) { // Uniprocessor, single magazine, so no recirculation necessary
+		/* NOTHING */
+		return TRUE; // Caller must do SZONE_MAGAZINE_PTR_UNLOCK(tiny_mag_ptr)
+	} else if (DEPOT_MAGAZINE_INDEX != mag_index) {
 		// Emptiness discriminant
 		if (tiny_region_below_recirc_threshold(region)) {
 			/* Region has crossed threshold from density to sparsity. Mark it "suitable" on the