Fossil SCM

Removed fossil_atexit_free_this() because it effectively costs more static memory than it cleans up in dynamic memory.

stephan 2019-12-21 03:45 memleak-fixes

Commit 99cb2ccd94b45dde65a91c1338296a98c9a6bd29ebb507ad32577b0646bb3af7

Parent d60dd7afb02d16b…

3 files changed -1 -35 -2

~ src/db.c ~ src/main.c ~ src/manifest.c

M src/db.c

-1

		--- src/db.c
		+++ src/db.c
		@@ -1632,11 +1632,10 @@
1632	1632	if( zRepo && !file_is_absolute_path(zRepo) ){
1633	1633	char * zFree = zRepo;
1634	1634	zRepo = mprintf("%s%s", g.zLocalRoot, zRepo);
1635	1635	fossil_free(zFree);
1636	1636	}
1637		- fossil_atexit_free_this(zRepo);
1638	1637	}
1639	1638	return zRepo;
1640	1639	}
1641	1640
1642	1641	/*
1643	1642

	--- src/db.c
	+++ src/db.c
	@@ -1632,11 +1632,10 @@
1632	if( zRepo && !file_is_absolute_path(zRepo) ){
1633	char * zFree = zRepo;
1634	zRepo = mprintf("%s%s", g.zLocalRoot, zRepo);
1635	fossil_free(zFree);
1636	}
1637	fossil_atexit_free_this(zRepo);
1638	}
1639	return zRepo;
1640	}
1641
1642	/*
1643

	--- src/db.c
	+++ src/db.c
	@@ -1632,11 +1632,10 @@
1632	if( zRepo && !file_is_absolute_path(zRepo) ){
1633	char * zFree = zRepo;
1634	zRepo = mprintf("%s%s", g.zLocalRoot, zRepo);
1635	fossil_free(zFree);
1636	}

1637	}
1638	return zRepo;
1639	}
1640
1641	/*
1642

M src/main.c

-35

		--- src/main.c
		+++ src/main.c
		@@ -323,37 +323,10 @@
323	323
324	324	#endif
325	325
326	326	Global g;
327	327
328		-/*
329		-** Infrastructure for fossil_atexit_free_this().
330		-*/
331		-static struct {
332		- void* list[20]; /* Pointers to pass to fossil_free() during
333		- ** atexit(). */
334		- int n; /* Number of items currently in this->list. */
335		-} fossilFreeAtExit = { {0}, 0 };
336		-
337		-/*
338		-** If zMem is not NULL and there is space in fossil's atexit cleanup
339		-** queue, zMem is added to that queue so that it will be passed to
340		-** fossil_free() during the atexit() phase of app shutdown. If the
341		-** queue is full or zMem is NULL, this function has no side effects.
342		-**
343		-** This is intended to be called by routines which allocate heap
344		-** memory for static-scope values which otherwise won't be freed, and
345		-** the static queue size is relatively small.
346		-*/
347		-void fossil_atexit_free_this(void * zMem){
348		- if(zMem!=0
349		- && fossilFreeAtExit.n < (sizeof(fossilFreeAtExit.list)
350		- / sizeof(fossilFreeAtExit.list[0]))){
351		- fossilFreeAtExit.list[fossilFreeAtExit.n++] = zMem;
352		- }
353		-}
354		-
355	328	/*
356	329	** atexit() handler which frees up "some" of the resources
357	330	** used by fossil.
358	331	*/
359	332	static void fossil_atexit(void) {
		@@ -393,18 +366,10 @@
393	366	db_close(0);
394	367	}
395	368	manifest_clear_cache();
396	369	content_clear_cache(1);
397	370	rebuild_clear_cache();
398		- if(fossilFreeAtExit.n>0){
399		- int i;
400		- for(i = 0; i < fossilFreeAtExit.n; ++i){
401		- fossil_free(fossilFreeAtExit.list[i]);
402		- fossilFreeAtExit.list[i] = 0;
403		- }
404		- fossilFreeAtExit.n = 0;
405		- }
406	371	/*
407	372	** FIXME: The next two lines cannot always be enabled; however, they
408	373	** are very useful for tracking down TH1 memory leaks.
409	374	*/
410	375	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
411	376

	--- src/main.c
	+++ src/main.c
	@@ -323,37 +323,10 @@
323
324	#endif
325
326	Global g;
327
328	/*
329	** Infrastructure for fossil_atexit_free_this().
330	*/
331	static struct {
332	void* list[20]; /* Pointers to pass to fossil_free() during
333	** atexit(). */
334	int n; /* Number of items currently in this->list. */
335	} fossilFreeAtExit = { {0}, 0 };
336
337	/*
338	** If zMem is not NULL and there is space in fossil's atexit cleanup
339	** queue, zMem is added to that queue so that it will be passed to
340	** fossil_free() during the atexit() phase of app shutdown. If the
341	** queue is full or zMem is NULL, this function has no side effects.
342	**
343	** This is intended to be called by routines which allocate heap
344	** memory for static-scope values which otherwise won't be freed, and
345	** the static queue size is relatively small.
346	*/
347	void fossil_atexit_free_this(void * zMem){
348	if(zMem!=0
349	&& fossilFreeAtExit.n < (sizeof(fossilFreeAtExit.list)
350	/ sizeof(fossilFreeAtExit.list[0]))){
351	fossilFreeAtExit.list[fossilFreeAtExit.n++] = zMem;
352	}
353	}
354
355	/*
356	** atexit() handler which frees up "some" of the resources
357	** used by fossil.
358	*/
359	static void fossil_atexit(void) {
	@@ -393,18 +366,10 @@
393	db_close(0);
394	}
395	manifest_clear_cache();
396	content_clear_cache(1);
397	rebuild_clear_cache();
398	if(fossilFreeAtExit.n>0){
399	int i;
400	for(i = 0; i < fossilFreeAtExit.n; ++i){
401	fossil_free(fossilFreeAtExit.list[i]);
402	fossilFreeAtExit.list[i] = 0;
403	}
404	fossilFreeAtExit.n = 0;
405	}
406	/*
407	** FIXME: The next two lines cannot always be enabled; however, they
408	** are very useful for tracking down TH1 memory leaks.
409	*/
410	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
411

	--- src/main.c
	+++ src/main.c
	@@ -323,37 +323,10 @@
323
324	#endif
325
326	Global g;
327



























328	/*
329	** atexit() handler which frees up "some" of the resources
330	** used by fossil.
331	*/
332	static void fossil_atexit(void) {
	@@ -393,18 +366,10 @@
366	db_close(0);
367	}
368	manifest_clear_cache();
369	content_clear_cache(1);
370	rebuild_clear_cache();








371	/*
372	** FIXME: The next two lines cannot always be enabled; however, they
373	** are very useful for tracking down TH1 memory leaks.
374	*/
375	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
376

M src/manifest.c

-2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1950,12 +1950,10 @@
1950	1950	blob_zero(&brief);
1951	1951	if( once ){
1952	1952	once = 0;
1953	1953	zTitleExpr = db_get("ticket-title-expr", "title");
1954	1954	zStatusColumn = db_get("ticket-status-column", "status");
1955		- fossil_atexit_free_this(zTitleExpr);
1956		- fossil_atexit_free_this(zStatusColumn);
1957	1955	}
1958	1956	zTitle = db_text("unknown",
1959	1957	"SELECT \"%w\" FROM ticket WHERE tkt_uuid=%Q",
1960	1958	zTitleExpr, pManifest->zTicketUuid
1961	1959	);
1962	1960

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1950,12 +1950,10 @@
1950	blob_zero(&brief);
1951	if( once ){
1952	once = 0;
1953	zTitleExpr = db_get("ticket-title-expr", "title");
1954	zStatusColumn = db_get("ticket-status-column", "status");
1955	fossil_atexit_free_this(zTitleExpr);
1956	fossil_atexit_free_this(zStatusColumn);
1957	}
1958	zTitle = db_text("unknown",
1959	"SELECT \"%w\" FROM ticket WHERE tkt_uuid=%Q",
1960	zTitleExpr, pManifest->zTicketUuid
1961	);
1962

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1950,12 +1950,10 @@
1950	blob_zero(&brief);
1951	if( once ){
1952	once = 0;
1953	zTitleExpr = db_get("ticket-title-expr", "title");
1954	zStatusColumn = db_get("ticket-status-column", "status");


1955	}
1956	zTitle = db_text("unknown",
1957	"SELECT \"%w\" FROM ticket WHERE tkt_uuid=%Q",
1958	zTitleExpr, pManifest->zTicketUuid
1959	);
1960

Fossil SCM

Keyboard Shortcuts