[exim-cvs] Revert "preallocate store for config", which app…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] Revert "preallocate store for config", which appears to have been a mis-merge. Bug 2464
Gitweb: https://git.exim.org/exim.git/commitdiff/47b118b298f8d89fe356792daed1eb807fce7952
Commit:     47b118b298f8d89fe356792daed1eb807fce7952
Parent:     13e70f5530fc3fd376e1397c76e073a339e738aa
Author:     Jeremy Harris <jgh@???>
AuthorDate: Sat Nov 9 16:38:42 2019 +0000
Committer:  Jeremy Harris <jgh@???>
CommitDate: Sat Nov 9 16:38:42 2019 +0000


    Revert "preallocate store for config", which appears to have been a mis-merge.  Bug 2464


    This reverts commit 00f1386065b4ab2aed12facd883ebd324c8c66d5.
---
 src/src/readconf.c | 13 -------------
 1 file changed, 13 deletions(-)


diff --git a/src/src/readconf.c b/src/src/readconf.c
index 2f78cd7..0233019 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3344,19 +3344,6 @@ if (f.trusted_config && Ustrcmp(filename, US"/dev/null"))
     }
   }


-/* Do a dummy store-allocation of a size related to the (toplevel) file size.
-This assumes we will need this much storage to handle all the allocations
-during startup; it won't help when .include is being used. When it does, it
-will cut down on the number of store blocks (and malloc calls, and sbrk
-syscalls). It also assume we're on the relevant pool. */
-
-if (statbuf.st_size > 8192)
- {
- rmark r = store_mark();
- void * dummy = store_get((int)statbuf.st_size, FALSE);
- store_reset(r);
- }
-
/* Process the main configuration settings. They all begin with a lower case
letter. If we see something starting with an upper case letter, it is taken as
a macro definition. */