count alloc pressure better and display it with (vm-stats)

Sigrid Solveig Haflínudóttir committed 10 months ago

Commit c9dfea01 parent 8ba2cfd3 files · +9 −3Browse files

Showing the changes to src (3 of 3 files). Show all

Unified · Split

3 files

 		void *data = MEM_ALLOC(sz);
 		if(sl_unlikely(data == nil))
 			cthrow(lerrorf(sl_errmem, "no memory for a cv"), type);
+		slvm.malloc_pressure += sz;
 		pcv = alloc_words(CVALUE_NWORDS);
 		pcv->type = type;
 		pcv->data = data;
 		cv_autorelease(pcv);
-		slvm.malloc_pressure += sz;
 	}
 	if(str){
 		((char*)pcv->data)[--sz] = '\0';
 	void *data = MEM_ALLOC(sz);
 	if(sl_unlikely(data == nil))
 		cthrow(lerrorf(sl_errmem, "no memory to pin a cv"), cv);
+	slvm.malloc_pressure += sz;
 	memcpy(data, cv_data(cv), sz);
 	cv->data = data;
 	cv_autorelease(cv);
 	usize len = cv_len(cv) + (cv_isstr(cv) ? 1 : 0);
 	bool inlined = isinlined(cv);
 	void *data = nil;
-	if(!inlined && sl_unlikely((data = MEM_ALLOC(len)) == nil))
+	if(!inlined){
-		cthrow(lerrorf(sl_errmem, "no memory for a cv copy"), v);
+		if(sl_unlikely((data = MEM_ALLOC(len)) == nil))
+			cthrow(lerrorf(sl_errmem, "no memory for a cv copy"), v);
+		slvm.malloc_pressure += len;
+	}
 	PUSH(v);
 	sl_cv *ncv = alloc_words(nw);

@@ -18,6 +18,7 @@ htable_new(sl_htable *h, usize size) · 17 unmodified lines
18	size *= 2; // aim for 50% occupancy	18	size *= 2; // aim for 50% occupancy
19	if((h->table = MEM_ALLOC(size * sizeof(*h->table))) == nil)	19	if((h->table = MEM_ALLOC(size * sizeof(*h->table))) == nil)
20	return nil;	20	return nil;
		21	slvm.malloc_pressure += size * sizeof(*h->table);
21	}	22	}
22	h->size = size;	23	h->size = size;
23	h->i = 0;	24	h->i = 0;

@@ -1364,6 +1364,7 @@ BUILTIN("vm-stats", vm_stats) · 1363 unmodified lines
1364	ios_printf(io, "heap total %10"PRIuPTR" bytes\n", slvm.heapsize);	1364	ios_printf(io, "heap total %10"PRIuPTR" bytes\n", slvm.heapsize);
1365	ios_printf(io, "heap free %10"PRIuPTR" bytes\n", (uintptr)(slvm.lim-slvm.curheap));	1365	ios_printf(io, "heap free %10"PRIuPTR" bytes\n", (uintptr)(slvm.lim-slvm.curheap));
1366	ios_printf(io, "heap used %10"PRIuPTR" bytes\n", (uintptr)(slvm.curheap-slvm.fromspace));	1366	ios_printf(io, "heap used %10"PRIuPTR" bytes\n", (uintptr)(slvm.curheap-slvm.fromspace));
		1367	ios_printf(io, "alloc pressure %10"PRIuPTR" bytes\n", (uintptr)slvm.malloc_pressure);
1367	ios_printf(io, "stack %10"PRIu64" bytes\n", (u64int)sl.nstack*sizeof(sl_v));	1368	ios_printf(io, "stack %10"PRIu64" bytes\n", (u64int)sl.nstack*sizeof(sl_v));
1368	ios_printf(io, "finalizers %10"PRIu32"\n", (u32int)slvm.nfinalizers);	1369	ios_printf(io, "finalizers %10"PRIu32"\n", (u32int)slvm.nfinalizers);
1369	ios_printf(io, "max finalizers %10"PRIu32"\n", (u32int)slvm.maxfinalizers);	1370	ios_printf(io, "max finalizers %10"PRIu32"\n", (u32int)slvm.maxfinalizers);

Keyboard shortcuts