lp_string() bug properly.
we still need to add lp_talloc_free() calls in all the main event
loops, I've only put it in smbd and nmbd thus far.
lib/util_array.o lib/util_str.o lib/util_sid.o \
lib/util_unistr.o lib/util_file.o \
lib/util.o lib/util_sock.o lib/util_sec.o smbd/ssl.o lib/fnmatch.o \
- tdb/tdb.o
+ tdb/tdb.o lib/talloc.o
UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \
ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o ubiqx/debugparse.o
#include "ubi_dLinkList.h"
#include "dlinklist.h"
#include "../tdb/tdb.h"
+#include "talloc.h"
#include "interfaces.h"
#ifdef HAVE_FNMATCH
int wsys_chown(const smb_ucs2_t *wfname, uid_t uid, gid_t gid);
int wsys_chroot(const smb_ucs2_t *wfname);
+/*The following definitions come from lib/talloc.c */
+
+TALLOC_CTX *talloc_init(void);
+void *talloc(TALLOC_CTX *t, size_t size);
+void talloc_destroy(TALLOC_CTX *t);
+
/*The following definitions come from lib/time.c */
void GetTimeOfDay(struct timeval *tval);
/*The following definitions come from param/loadparm.c */
+void lp_talloc_free(void);
char *lp_logfile(void);
char *lp_smbrun(void);
char *lp_configfile(void);
--- /dev/null
+/*
+ Unix SMB/Netbios implementation.
+ Version 3.0
+ Samba temporary memory allocation functions
+ Copyright (C) Andrew Tridgell 2000
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+struct talloc_chunk {
+ struct talloc_chunk *next;
+ void *ptr;
+ size_t alloc_size;
+ size_t total_size;
+};
+
+typedef struct {
+ struct talloc_chunk *list;
+} TALLOC_CTX;
+
--- /dev/null
+/*
+ Unix SMB/Netbios implementation.
+ Version 3.0
+ Samba temporary memory allocation functions
+ Copyright (C) Andrew Tridgell 2000
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/* this is a very simple temporary memory allocator. To use it do the following:
+
+ 1) when you first want to allocate a pool of meomry use
+ talloc_init() and save the resulting context pointer somewhere
+
+ 2) to allocate memory use talloc()
+
+ 3) when _all_ of the memory allocated using this context is no longer needed
+ use talloc_destroy()
+
+ talloc does not zero the memory. It guarantees memory of a
+ TALLOC_ALIGN alignment
+*/
+
+#include "includes.h"
+
+#define TALLOC_ALIGN 32
+#define TALLOC_CHUNK_SIZE (0x2000)
+
+/* initialissa talloc context. */
+TALLOC_CTX *talloc_init(void)
+{
+ TALLOC_CTX *t;
+
+ t = (TALLOC_CTX *)malloc(sizeof(*t));
+ if (!t) return NULL;
+
+ t->list = NULL;
+
+ return t;
+}
+
+/* allocate a bit of memory from the specified pool */
+void *talloc(TALLOC_CTX *t, size_t size)
+{
+ void *p;
+
+ size = (size + TALLOC_ALIGN) & (~TALLOC_ALIGN-1);
+
+ if (!t->list || (t->list->total_size - t->list->alloc_size) < size) {
+ struct talloc_chunk *c;
+ size_t asize = (size + TALLOC_CHUNK_SIZE) & ~(TALLOC_CHUNK_SIZE-1);
+
+ c = (struct talloc_chunk *)malloc(sizeof(*c));
+ if (!c) return NULL;
+ c->next = t->list;
+ c->ptr = (void *)malloc(asize);
+ if (!c->ptr) {
+ free(c);
+ return NULL;
+ }
+ c->alloc_size = 0;
+ c->total_size = asize;
+ t->list = c;
+ }
+
+ p = t->list->ptr + t->list->alloc_size;
+ t->list->alloc_size += size;
+ return p;
+}
+
+/* destroy a whole pool */
+void talloc_destroy(TALLOC_CTX *t)
+{
+ struct talloc_chunk *c;
+
+ while (t->list) {
+ c = t->list->next;
+ free(t->list->ptr);
+ free(t->list);
+ t->list = c;
+ }
+
+ free(t);
+}
/* check for new network interfaces */
reload_interfaces(t);
+
+ /* free up temp memory */
+ lp_talloc_free();
}
} /* process */
#define NUMBER_OF_STATIC_STRING_BUFS 20
+static TALLOC_CTX *lp_talloc;
+
/******************************************************************* a
-convenience routine to grab string parameters into a rotating buffer,
+free up temporary memory - called from the main loop
+********************************************************************/
+void lp_talloc_free(void)
+{
+ if (!lp_talloc) return;
+ talloc_destroy(lp_talloc);
+ lp_talloc = NULL;
+}
+
+/*******************************************************************
+convenience routine to grab string parameters into temporary memory
and run standard_sub_basic on them. The buffers can be written to by
callers without affecting the source string.
********************************************************************/
static char *lp_string(const char *s)
{
- static char *bufs[NUMBER_OF_STATIC_STRING_BUFS];
- static size_t buflen[NUMBER_OF_STATIC_STRING_BUFS];
- static int next = -1;
- char *ret;
- int i;
- size_t len = s?strlen(s):0;
-
- if (next == -1) {
- /* initialisation */
- for (i=0;i<NUMBER_OF_STATIC_STRING_BUFS;i++) {
- bufs[i] = NULL;
- buflen[i] = 0;
- }
- next = 0;
- }
+ size_t len = s?strlen(s):0;
+ char *ret;
- len = MAX(len+100,sizeof(pstring)); /* the +100 is for some
- substitution room */
-
- if (buflen[next] != len) {
- buflen[next] = len;
- if (bufs[next])
- free(bufs[next]);
- bufs[next] = (char *)malloc(len);
- if (!bufs[next]) {
- DEBUG(0,("out of memory in lp_string()"));
- exit(1);
- }
- }
+ if (!lp_talloc) lp_talloc = talloc_init();
+
+ ret = (char *)talloc(lp_talloc, len + 100); /* leave room for substitution */
- ret = &bufs[next][0];
- next = (next+1)%NUMBER_OF_STATIC_STRING_BUFS;
+ if (!ret) return NULL;
- if (!s)
- *ret = 0;
- else
- StrnCpy(ret,s,len-1);
+ if (!s)
+ *ret = 0;
+ else
+ StrnCpy(ret,s,len);
- trim_string(ret, "\"", "\"");
+ trim_string(ret, "\"", "\"");
- standard_sub_basic(ret);
- return(ret);
+ standard_sub_basic(ret);
+ return(ret);
}
{
pstring n2;
BOOL bRetval;
-
+
add_to_file_list(pszFname);
bRetval = False;
gotstart = 1;
}
- if( $0 ~ /^TDB_CONTEXT|^TDB_DATA|^smb_ucs2_t/ ) {
+ if( $0 ~ /^TDB_CONTEXT|^TDB_DATA|^smb_ucs2_t|^TALLOC_CTX/ ) {
gotstart = 1;
}
errno = 0;
+ /* free up temporary memory */
+ lp_talloc_free();
+
while(!receive_message_or_smb(InBuffer,BUFFER_SIZE,select_timeout,&got_smb))
{
if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
git.samba.org / jerry / samba.git / commitdiff