sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

wafsamba: Use native waf timer

Browse Source 
__main__:1: DeprecationWarning: time.clock has been deprecated in Python 3.3
  and will be removed from Python 3.8: use time.perf_counter
  or time.process_time instead

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13998

Signed-off-by: Lukas Slebodnik <lslebodn@fedoraproject.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
Lukas Slebodnik 2019-06-12 12:27:04 +02:00 committed by Andreas Schneider
parent d4b72821dc
commit dc27ff44de
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
buildtools/wafsamba/samba_deps.py
View File

@ -1,6 +1,6 @@
# Samba automatic dependency handling and project rules # Samba automatic dependency handling and project rules
import os, sys, re, time import os, sys, re
from waflib import Build, Options, Logs, Utils, Errors from waflib import Build, Options, Logs, Utils, Errors
from waflib.Logs import debug from waflib.Logs import debug
@ -1102,8 +1102,7 @@ def check_project_rules(bld):
if not force_project_rules and load_samba_deps(bld, tgt_list): if not force_project_rules and load_samba_deps(bld, tgt_list):
return return
global tstart timer = Utils.Timer()
tstart = time.clock()
bld.new_rules = True bld.new_rules = True
Logs.info("Checking project rules ...") Logs.info("Checking project rules ...")
@ -1112,26 +1111,26 @@ def check_project_rules(bld):
expand_subsystem_deps(bld) expand_subsystem_deps(bld)
debug("deps: expand_subsystem_deps: %f" % (time.clock() - tstart)) debug("deps: expand_subsystem_deps: %s" % str(timer))
replace_grouping_libraries(bld, tgt_list) replace_grouping_libraries(bld, tgt_list)
debug("deps: replace_grouping_libraries: %f" % (time.clock() - tstart)) debug("deps: replace_grouping_libraries: %s" % str(timer))
build_direct_deps(bld, tgt_list) build_direct_deps(bld, tgt_list)
debug("deps: build_direct_deps: %f" % (time.clock() - tstart)) debug("deps: build_direct_deps: %s" % str(timer))
break_dependency_loops(bld, tgt_list) break_dependency_loops(bld, tgt_list)
debug("deps: break_dependency_loops: %f" % (time.clock() - tstart)) debug("deps: break_dependency_loops: %s" % str(timer))
if Options.options.SHOWDEPS: if Options.options.SHOWDEPS:
show_dependencies(bld, Options.options.SHOWDEPS, set()) show_dependencies(bld, Options.options.SHOWDEPS, set())
calculate_final_deps(bld, tgt_list, loops) calculate_final_deps(bld, tgt_list, loops)
debug("deps: calculate_final_deps: %f" % (time.clock() - tstart)) debug("deps: calculate_final_deps: %s" % str(timer))
if Options.options.SHOW_DUPLICATES: if Options.options.SHOW_DUPLICATES:
show_object_duplicates(bld, tgt_list) show_object_duplicates(bld, tgt_list)
@ -1140,7 +1139,7 @@ def check_project_rules(bld):
for f in [ build_dependencies, build_includes, add_init_functions ]: for f in [ build_dependencies, build_includes, add_init_functions ]:
debug('deps: project rules checking %s', f) debug('deps: project rules checking %s', f)
for t in tgt_list: f(t) for t in tgt_list: f(t)
debug("deps: %s: %f" % (f, time.clock() - tstart)) debug("deps: %s: %s" % (f, str(timer)))
debug('deps: project rules stage1 completed') debug('deps: project rules stage1 completed')
@ -1148,17 +1147,17 @@ def check_project_rules(bld):
Logs.error("Duplicate sources present - aborting") Logs.error("Duplicate sources present - aborting")
sys.exit(1) sys.exit(1)
debug("deps: check_duplicate_sources: %f" % (time.clock() - tstart)) debug("deps: check_duplicate_sources: %s" % str(timer))
if not bld.check_group_ordering(tgt_list): if not bld.check_group_ordering(tgt_list):
Logs.error("Bad group ordering - aborting") Logs.error("Bad group ordering - aborting")
sys.exit(1) sys.exit(1)
debug("deps: check_group_ordering: %f" % (time.clock() - tstart)) debug("deps: check_group_ordering: %s" % str(timer))
show_final_deps(bld, tgt_list) show_final_deps(bld, tgt_list)
debug("deps: show_final_deps: %f" % (time.clock() - tstart)) debug("deps: show_final_deps: %s" % str(timer))
debug('deps: project rules checking completed - %u targets checked', debug('deps: project rules checking completed - %u targets checked',
len(tgt_list)) len(tgt_list))
@ -1166,7 +1165,7 @@ def check_project_rules(bld):
if not bld.is_install: if not bld.is_install:
save_samba_deps(bld, tgt_list) save_samba_deps(bld, tgt_list)
debug("deps: save_samba_deps: %f" % (time.clock() - tstart)) debug("deps: save_samba_deps: %s" % str(timer))
Logs.info("Project rules pass") Logs.info("Project rules pass")