[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Fri Oct 3 05:26:05 MDT 2014
The branch, master has been updated
via 1c5ef28 Reduce the no-op build times by 30%
via 540f3ad waf: add k5crypto to the list of system libraries if they are reported by the krb5config but not found as requied by the different tests
via 0d1e326 librpc: simplify ndr_pull_dnsp_string
from 5e43cec Fix typo in samba-tool manpage
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1c5ef289a872cf0dc78b2e9dd35b20fa99db86fb
Author: Thomas Nagy <tnagy2pow10 at gmail.com>
Date: Fri Sep 26 23:46:01 2014 +0200
Reduce the no-op build times by 30%
Change-Id: Ie68436c1e7c75c1786e9ed6b6a54d2b55abbbcea
Reviewed-by: Matthieu Patou <mat at matws.net>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Fri Oct 3 13:25:18 CEST 2014 on sn-devel-104
commit 540f3ad347998c1fbe6d30380c02186cb1f88aa4
Author: Matthieu Patou <mat at matws.net>
Date: Wed May 14 16:38:08 2014 -0700
waf: add k5crypto to the list of system libraries if they are reported by the krb5config but not found as requied by the different tests
Otherwise on some systems we have error message like
"Implied dependency k5crypto in winbind_krb5_locator is of type EMPTY"
Even though krb5config indicated that this library is needed and the
library is present
Signed-off-by: Matthieu Patou <mat at matws.net>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 0d1e326a68d7b89d548a4b0e03be598c64d13224
Author: Matthieu Patou <mat at matws.net>
Date: Sun Oct 13 21:39:51 2013 -0700
librpc: simplify ndr_pull_dnsp_string
total_len is 1 and never varies.
Signed-off-by: Matthieu Patou <mat at matws.net>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_deps.py | 6 +-
buildtools/wafsamba/samba_optimisation.py | 145 +++++++++++++++++++++++++++++
librpc/ndr/ndr_dnsp.c | 7 +-
wscript_configure_system_mitkrb5 | 4 +
4 files changed, 154 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index c00744e..3be9956 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -1021,7 +1021,7 @@ def save_samba_deps(bld, tgt_list):
denv.outenv[t.sname] = tdeps
depsfile = os.path.join(bld.bdir, "sambadeps")
- denv.store(depsfile)
+ denv.store_fast(depsfile)
@@ -1031,12 +1031,12 @@ def load_samba_deps(bld, tgt_list):
denv = Environment.Environment()
try:
debug('deps: checking saved dependencies')
- denv.load(depsfile)
+ denv.load_fast(depsfile)
if (denv.version != savedeps_version or
denv.savedeps_inputs != savedeps_inputs or
denv.savedeps_outputs != savedeps_outputs):
return False
- except:
+ except Exception:
return False
# check if critical files have changed
diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index f0f430d..1333f8b 100644
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -6,6 +6,7 @@
# overall this makes some build tasks quite a bit faster
+import Build, Utils, Node
from TaskGen import feature, after
import preproc, Task
@@ -163,3 +164,147 @@ def suncc_wrap(cls):
return oldrun(self)
cls.run = run
suncc_wrap(Task.TaskBase.classes['cc_link'])
+
+
+
+def hash_env_vars(self, env, vars_lst):
+ idx = str(id(env)) + str(vars_lst)
+ try:
+ return self.cache_sig_vars[idx]
+ except KeyError:
+ pass
+
+ m = Utils.md5()
+ m.update(''.join([str(env[a]) for a in vars_lst]))
+
+ ret = self.cache_sig_vars[idx] = m.digest()
+ return ret
+Build.BuildContext.hash_env_vars = hash_env_vars
+
+
+def store_fast(self, filename):
+ file = open(filename, 'wb')
+ data = self.get_merged_dict()
+ try:
+ Build.cPickle.dump(data, file, -1)
+ finally:
+ file.close()
+Environment.Environment.store_fast = store_fast
+
+def load_fast(self, filename):
+ file = open(filename, 'rb')
+ try:
+ data = Build.cPickle.load(file)
+ finally:
+ file.close()
+ self.table.update(data)
+Environment.Environment.load_fast = load_fast
+
+def is_this_a_static_lib(self, name):
+ try:
+ cache = self.cache_is_this_a_static_lib
+ except AttributeError:
+ cache = self.cache_is_this_a_static_lib = {}
+ try:
+ return cache[name]
+ except KeyError:
+ ret = cache[name] = 'cstaticlib' in self.bld.name_to_obj(name, self.env).features
+ return ret
+TaskGen.task_gen.is_this_a_static_lib = is_this_a_static_lib
+
+def shared_ancestors(self):
+ try:
+ cache = self.cache_is_this_a_static_lib
+ except AttributeError:
+ cache = self.cache_is_this_a_static_lib = {}
+ try:
+ return cache[id(self)]
+ except KeyError:
+
+ ret = []
+ if 'cshlib' in self.features: # or 'cprogram' in self.features:
+ if getattr(self, 'uselib_local', None):
+ lst = self.to_list(self.uselib_local)
+ ret = [x for x in lst if not self.is_this_a_static_lib(x)]
+ cache[id(self)] = ret
+ return ret
+TaskGen.task_gen.shared_ancestors = shared_ancestors
+
+ at feature('cc', 'cxx')
+ at after('apply_link', 'init_cc', 'init_cxx', 'apply_core')
+def apply_lib_vars(self):
+ """after apply_link because of 'link_task'
+ after default_cc because of the attribute 'uselib'"""
+
+ # after 'apply_core' in case if 'cc' if there is no link
+
+ env = self.env
+ app = env.append_value
+ seen_libpaths = set([])
+
+ # OPTIMIZATION 1: skip uselib variables already added (700ms)
+ seen_uselib = set([])
+
+ # 1. the case of the libs defined in the project (visit ancestors first)
+ # the ancestors external libraries (uselib) will be prepended
+ self.uselib = self.to_list(self.uselib)
+ names = self.to_list(self.uselib_local)
+
+ seen = set([])
+ tmp = Utils.deque(names) # consume a copy of the list of names
+ while tmp:
+ lib_name = tmp.popleft()
+ # visit dependencies only once
+ if lib_name in seen:
+ continue
+
+ y = self.name_to_obj(lib_name)
+ if not y:
+ raise Utils.WafError('object %r was not found in uselib_local (required by %r)' % (lib_name, self.name))
+ y.post()
+ seen.add(lib_name)
+
+ # OPTIMIZATION 2: pre-compute ancestors shared libraries (100ms)
+ tmp.extend(y.shared_ancestors())
+
+ # link task and flags
+ if getattr(y, 'link_task', None):
+
+ link_name = y.target[y.target.rfind('/') + 1:]
+ if 'cstaticlib' in y.features:
+ app('STATICLIB', link_name)
+ elif 'cshlib' in y.features or 'cprogram' in y.features:
+ # WARNING some linkers can link against programs
+ app('LIB', link_name)
+
+ # the order
+ self.link_task.set_run_after(y.link_task)
+
+ # for the recompilation
+ dep_nodes = getattr(self.link_task, 'dep_nodes', [])
+ self.link_task.dep_nodes = dep_nodes + y.link_task.outputs
+
+ # OPTIMIZATION 3: reduce the amount of function calls
+ # add the link path too
+ par = y.link_task.outputs[0].parent
+ if id(par) not in seen_libpaths:
+ seen_libpaths.add(id(par))
+ tmp_path = par.bldpath(self.env)
+ if not tmp_path in env['LIBPATH']:
+ env.prepend_value('LIBPATH', tmp_path)
+
+
+ # add ancestors uselib too - but only propagate those that have no staticlib
+ for v in self.to_list(y.uselib):
+ if v not in seen_uselib:
+ seen_uselib.add(v)
+ if not env['STATICLIB_' + v]:
+ if not v in self.uselib:
+ self.uselib.insert(0, v)
+
+ # 2. the case of the libs defined outside
+ for x in self.uselib:
+ for v in self.p_flag_vars:
+ val = self.env[v + '_' + x]
+ if val:
+ self.env.append_value(v, val)
diff --git a/librpc/ndr/ndr_dnsp.c b/librpc/ndr/ndr_dnsp.c
index fcb623a..46141c1 100644
--- a/librpc/ndr/ndr_dnsp.c
+++ b/librpc/ndr/ndr_dnsp.c
@@ -135,7 +135,6 @@ _PUBLIC_ void ndr_print_dnsp_string(struct ndr_print *ndr, const char *name,
_PUBLIC_ enum ndr_err_code ndr_pull_dnsp_string(struct ndr_pull *ndr, int ndr_flags, const char **string)
{
uint8_t len;
- uint32_t total_len;
char *ret;
NDR_CHECK(ndr_pull_uint8(ndr, ndr_flags, &len));
@@ -144,13 +143,11 @@ _PUBLIC_ enum ndr_err_code ndr_pull_dnsp_string(struct ndr_pull *ndr, int ndr_fl
if (!ret) {
return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Failed to pull dnsp_string");
}
- total_len = 1;
- ret = talloc_zero_array(ndr->current_mem_ctx, char, len+1);
+ ret = talloc_zero_array(ndr->current_mem_ctx, char, len + 1);
if (!ret) {
return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Failed to pull dnsp_string");
}
- NDR_CHECK(ndr_pull_bytes(ndr, (uint8_t *)&ret[total_len-1], len));
- total_len = len;
+ NDR_CHECK(ndr_pull_bytes(ndr, (uint8_t *)ret, len));
(*string) = ret;
NDR_PULL_ALIGN(ndr, 1);
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index e0d3760..ce49ab7 100644
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -28,6 +28,10 @@ if conf.env.KRB5_CONFIG:
conf.check_cfg(path=conf.env.KRB5_CONFIG, args="--cflags --libs",
package="gssapi", uselib_store="GSSAPI")
krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI'])
+ if 'k5crypto' in conf.env['LIB_GSSAPI']:
+ krb5_define_syslib(conf, "k5crypto", conf.env['LIB_GSSAPI'])
+ if 'com_err' in conf.env['LIB_GSSAPI']:
+ krb5_define_syslib(conf, "com_err", conf.env['LIB_GSSAPI'])
if 'gssapi_krb5' in conf.env['LIB_GSSAPI']:
krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI'])
--
Samba Shared Repository
More information about the samba-cvs
mailing list