From e3c0b6e6eecdcd94b37d8bb126668ec0db52d487 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Aug 2018 20:39:18 +0200 Subject: Revert rtl_alloc_preInit back to boolean argument This effectively reverts 271a663d2f098f3f665cab6da2e13b265a7eab93 "rtl: support start/stop threads around pre-init" again, now that df6ba650469a6f2fda06ef1c2e107ccdd3570505 "Remove 'officially dead now' rtl_cache slab allocator mechanism" removed the wsupdate thread. (rtl_alloc_preInit is an internal-use-only C function, so changing its arguments doesn't affect URE compatibility.) Change-Id: Ie9bce86377f9520e2600e4111ac525dddace10f8 Reviewed-on: https://gerrit.libreoffice.org/58443 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- include/rtl/alloc.h | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'include') diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h index cc3cec6ef292..74d4ea5c4339 100644 --- a/include/rtl/alloc.h +++ b/include/rtl/alloc.h @@ -288,30 +288,6 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cache_free ( #ifdef LIBO_INTERNAL_ONLY -/** @cond INTERNAL */ -/** rtl_alloc_preInit_phase_t - * - * This is used to control the pre-init logic - * in rtl_alloc_preInit. The reason for this is - * to first initialize all caching and other memory - * logic from WSD (the Online daemon) at startup. - * All these pages will then be forked over when - * spawning per-document instances. This is done - * by calling rtl_alloc_preInit with rtlAllocPreInitStart. - * - * @since LibreOffice 6.1 - */ -typedef enum -{ - // Start phase I of pre-init. - rtlAllocPreInitStart, - // Finish phase I of pre-init (before forking). - rtlAllocPreInitEnd, - // Post pre-init and after forking; no longer used. - rtlAllocPostInit - -} rtl_alloc_preInit_phase_t; - /** @cond INTERNAL */ /** rtl_alloc_preInit * @@ -319,8 +295,8 @@ typedef enum * at the end of LibreOfficeKit pre-initialization to enable * various optimizations. * - * Its function is to annotate a section @phase = rtlAllocPreInitStart - * to end (@phase = rtlAllocPreInitEnd) via. two calls. Inside this + * Its function is to annotate a section @start = true + * to end (@start = false) via. two calls. Inside this * section string allocators are replaced with ones which cause the * strings to be staticized at the end of the section. * @@ -341,7 +317,7 @@ typedef enum * @since LibreOffice 6.1 */ SAL_DLLPUBLIC void SAL_CALL rtl_alloc_preInit ( - rtl_alloc_preInit_phase_t phase + sal_Bool start ) SAL_THROW_EXTERN_C(); /** @endcond */ -- cgit