sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

save memory

Browse Source 
Hi!

Attached find a patch that I've wanted to check in for ages.
The whole area probably needs a major rewrite, but this is a
minimal patch that on a 32-bit box saves 1.5k per smbd per
defined share, twice as much on a 64-bit box.

Volker

From ebb80e664ecc49eb597a45cb57e1067fbae49e62 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Wed, 31 Oct 2007 15:04:34 +0100
Subject: [PATCH] Change global->copymap from bool* to a bitmap

We right now have 401 parameters, so with bool being represented as a 64-bit
integer this saves about 3k of memory per smbd per share that is defined in
smb.conf.
This commit is contained in:
Volker Lendecke
2007-10-31 15:06:22 +01:00
committed by Jeremy Allison
parent 5cf2811e8e
commit 94f2c35a68
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/param/loadparm.c
View File

@ -441,7 +441,7 @@ typedef struct {
bool bStrictAllocate; bool bStrictAllocate;
bool bStrictSync; bool bStrictSync;
char magic_char; char magic_char;
bool *copymap; struct bitmap *copymap;
bool bDeleteReadonly; bool bDeleteReadonly;
bool bFakeOplocks; bool bFakeOplocks;
bool bDeleteVetoFiles; bool bDeleteVetoFiles;
@ -2181,7 +2181,8 @@ static const char *get_boolean(bool bool_value);
static int getservicebyname(const char *pszServiceName, static int getservicebyname(const char *pszServiceName,
service * pserviceDest); service * pserviceDest);
static void copy_service(service * pserviceDest, static void copy_service(service * pserviceDest,
service * pserviceSource, bool *pcopymapDest); service * pserviceSource,
struct bitmap *pcopymapDest);
static bool do_parameter(const char *pszParmName, const char *pszParmValue); static bool do_parameter(const char *pszParmName, const char *pszParmValue);
static bool do_section(const char *pszSectionName); static bool do_section(const char *pszSectionName);
static void init_copymap(service * pservice); static void init_copymap(service * pservice);
@ -2455,7 +2456,7 @@ static void free_service(service *pservice)
pservice->szService)); pservice->szService));
string_free(&pservice->szService); string_free(&pservice->szService);
SAFE_FREE(pservice->copymap); bitmap_free(pservice->copymap);
for (i = 0; parm_table[i].label; i++) { for (i = 0; parm_table[i].label; i++) {
if ((parm_table[i].type == P_STRING || if ((parm_table[i].type == P_STRING ||
@ -3188,7 +3189,8 @@ static int getservicebyname(const char *pszServiceName, service * pserviceDest)
If pcopymapDest is NULL then copy all fields If pcopymapDest is NULL then copy all fields
***************************************************************************/ ***************************************************************************/
static void copy_service(service * pserviceDest, service * pserviceSource, bool *pcopymapDest) static void copy_service(service * pserviceDest, service * pserviceSource,
struct bitmap *pcopymapDest)
{ {
int i; int i;
bool bcopyall = (pcopymapDest == NULL); bool bcopyall = (pcopymapDest == NULL);
@ -3197,7 +3199,7 @@ static void copy_service(service * pserviceDest, service * pserviceSource, bool
for (i = 0; parm_table[i].label; i++) for (i = 0; parm_table[i].label; i++)
if (parm_table[i].ptr && parm_table[i].p_class == P_LOCAL && if (parm_table[i].ptr && parm_table[i].p_class == P_LOCAL &&
(bcopyall || pcopymapDest[i])) { (bcopyall || bitmap_query(pcopymapDest,i))) {
void *def_ptr = parm_table[i].ptr; void *def_ptr = parm_table[i].ptr;
void *src_ptr = void *src_ptr =
((char *)pserviceSource) + PTR_DIFF(def_ptr, ((char *)pserviceSource) + PTR_DIFF(def_ptr,
@ -3244,9 +3246,8 @@ static void copy_service(service * pserviceDest, service * pserviceSource, bool
if (bcopyall) { if (bcopyall) {
init_copymap(pserviceDest); init_copymap(pserviceDest);
if (pserviceSource->copymap) if (pserviceSource->copymap)
memcpy((void *)pserviceDest->copymap, bitmap_copy(pserviceDest->copymap,
(void *)pserviceSource->copymap, pserviceSource->copymap);
sizeof(bool) * NUMPARAMETERS);
} }
data = pserviceSource->param_opt; data = pserviceSource->param_opt;
@ -3985,15 +3986,17 @@ static bool handle_printing(int snum, const char *pszParmValue, char **ptr)
static void init_copymap(service * pservice) static void init_copymap(service * pservice)
{ {
int i; int i;
SAFE_FREE(pservice->copymap); if (pservice->copymap) {
pservice->copymap = SMB_MALLOC_ARRAY(bool,NUMPARAMETERS); bitmap_free(pservice->copymap);
}
pservice->copymap = bitmap_allocate(NUMPARAMETERS);
if (!pservice->copymap) if (!pservice->copymap)
DEBUG(0, DEBUG(0,
("Couldn't allocate copymap!! (size %d)\n", ("Couldn't allocate copymap!! (size %d)\n",
(int)NUMPARAMETERS)); (int)NUMPARAMETERS));
else else
for (i = 0; i < NUMPARAMETERS; i++) for (i = 0; i < NUMPARAMETERS; i++)
pservice->copymap[i] = True; bitmap_set(pservice->copymap, i);
} }
/*************************************************************************** /***************************************************************************
@ -4095,7 +4098,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
the same data pointer */ the same data pointer */
for (i = 0; parm_table[i].label; i++) for (i = 0; parm_table[i].label; i++)
if (parm_table[i].ptr == parm_table[parmnum].ptr) if (parm_table[i].ptr == parm_table[parmnum].ptr)
ServicePtrs[snum]->copymap[i] = False; bitmap_clear(ServicePtrs[snum]->copymap, i);
} }
/* if it is a special case then go ahead */ /* if it is a special case then go ahead */