From 9e03fb60dca0ebafa8bf8095d6e21659bdf453ee Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 16 Oct 2018 19:06:48 +0200 Subject: [PATCH] talloc: deprecate talloc_set_memlimit() The memlimit functionality was never utilized by Samba. It adds unneeded complexity, so flag it as deprecated. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison --- lib/talloc/talloc.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h index 7372df16fe8..ba3dee8de97 100644 --- a/lib/talloc/talloc.h +++ b/lib/talloc/talloc.h @@ -1893,6 +1893,13 @@ void talloc_set_log_fn(void (*log_fn)(const char *message)); */ void talloc_set_log_stderr(void); +#ifndef _DEPRECATED_ +#ifdef HAVE___ATTRIBUTE__ +#define _DEPRECATED_ __attribute__ ((deprecated)) +#else +#define _DEPRECATED_ +#endif +#endif /** * @brief Set a max memory limit for the current context hierarchy * This affects all children of this context and constrain any @@ -1907,10 +1914,13 @@ void talloc_set_log_stderr(void); * move causes the new parent to exceed its limits. However * any further allocation on that hierarchy will then fail. * + * @warning talloc memlimit functionality is deprecated. Please + * consider using cgroup memory limits instead. + * * @param[in] ctx The talloc context to set the limit on * @param[in] max_size The (new) max_size */ -int talloc_set_memlimit(const void *ctx, size_t max_size); +int talloc_set_memlimit(const void *ctx, size_t max_size) _DEPRECATED_; /* @} ******************************************************************/