Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change default debug level #254

Merged
merged 4 commits into from
Jul 28, 2022
Merged

Change default debug level #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb056bf
Change default debug level from 1 to 0.
markito3 Jul 17, 2022
c023f15
Go to new scheme for naming home directories based on debug level.
markito3 Jul 18, 2022
83f09bd
Fix case where there is a dirtag and a debug-level tag in the home di…
markito3 Jul 18, 2022
4aad922
Drop the debug level "hybrid" in favor of "optdbg".
markito3 Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile_halld_amp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ ifdef HALLD_AMP_DIRTAG
HALLD_AMP_DIR := $(HALLD_AMP_DIR)^$(HALLD_AMP_DIRTAG)
endif
ifeq ($(HALLD_AMP_DEBUG_LEVEL), 0)
HALLD_AMP_DIR := $(HALLD_AMP_DIR)+opt
override HALLD_AMP_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3
else ifeq ($(HALLD_AMP_DEBUG_LEVEL), 1)
HALLD_AMP_DIR := $(HALLD_AMP_DIR)+optdbg
else ifeq ($(HALLD_AMP_DEBUG_LEVEL), 2)
HALLD_AMP_DIR := $(HALLD_AMP_DIR)+dbg
override HALLD_AMP_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0
Expand Down
3 changes: 2 additions & 1 deletion Makefile_halld_recon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ ifdef HALLD_RECON_DIRTAG
HALLD_RECON_DIR := $(HALLD_RECON_DIR)^$(HALLD_RECON_DIRTAG)
endif
ifeq ($(HALLD_RECON_DEBUG_LEVEL), 0)
HALLD_RECON_DIR := $(HALLD_RECON_DIR)+opt
override HALLD_RECON_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3
else ifeq ($(HALLD_RECON_DEBUG_LEVEL), 1)
HALLD_RECON_DIR := $(HALLD_RECON_DIR)+optdbg
else ifeq ($(HALLD_RECON_DEBUG_LEVEL), 2)
HALLD_RECON_DIR := $(HALLD_RECON_DIR)+dbg
override HALLD_RECON_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0
Expand Down
3 changes: 2 additions & 1 deletion Makefile_halld_sim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ ifdef HALLD_SIM_DIRTAG
HALLD_SIM_DIR := $(HALLD_SIM_DIR)^$(HALLD_SIM_DIRTAG)
endif
ifeq ($(HALLD_SIM_DEBUG_LEVEL), 0)
HALLD_SIM_DIR := $(HALLD_SIM_DIR)+opt
override HALLD_SIM_SCONS_OPTIONS += DEBUG=0 OPTIMIZATION=3
else ifeq ($(HALLD_SIM_DEBUG_LEVEL), 1)
HALLD_SIM_DIR := $(HALLD_SIM_DIR)+optdbg
else ifeq ($(HALLD_SIM_DEBUG_LEVEL), 2)
HALLD_SIM_DIR := $(HALLD_SIM_DIR)+dbg
override HALLD_SIM_SCONS_OPTIONS += DEBUG=1 OPTIMIZATION=0
Expand Down
2 changes: 1 addition & 1 deletion version.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
$year = $d{year};
$debug_level = $d{debug_level};
$profiling = $d{profiling};
if ($debug_level eq '') {$debug_level = 1} # set a default level
if ($debug_level eq '') {$debug_level = 0} # set a default level
if ($version) {
print_command("${name_in_caps}_VERSION", $version);
}
Expand Down
10 changes: 9 additions & 1 deletion version_check.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,17 @@
} else {
$version_field = $token0[1];
}
#print "version_field = $version_field\n";
#print "first preliminary version_field = $version_field\n";
@token4 = split(/\^/, $version_field);
if ($#token4 > 0) {
$dirtag_field = $token4[$#token4];
$dirtag_string = "\\^" . $dirtag_field;
$dirtag_string =~ s/\+/\\\+/;
#print "dirtag_field = $dirtag_field, dirtag_string = $dirtag_string\n";
@token5 = split (/$dirtag_string/, $version_field);
$version_field = $token5[0];
}
#print "second preliminary version_field = $version_field\n";
@token6 = split(/\+/, $version_field);
if ($#token6 > 0) {
$version_field = $token6[0];
Expand All @@ -99,7 +102,12 @@
@token7 = split(/\^/, $home_basename);
if ($#token7 > 0) {
$dirtag = $token7[1];
@token9 = split(/\+/, $dirtag);
if ($#token9 > 0) {
$dirtag = $token9[0];
}
}
#print "dirtag = $dirtag\n"
} else {
}
if ($dirtag) {
Expand Down
2 changes: 1 addition & 1 deletion version_defs.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@
diracxx => '',
hddm => '',
halld_amp => '');
@debug_type = ('opt', '', 'dbg');
@debug_type = ('', 'optdbg', 'dbg');