From a46b2a6daa2f3f85ae283e6136609de1c31b930e Mon Sep 17 00:00:00 2001 From: knarf Date: Fri, 11 Sep 2009 16:07:35 +0000 Subject: simplify code by combining similar (debug) functions git-svn-id: http://svn.cactuscode.org/flesh/trunk@4569 17b73243-c579-4c4c-a9d2-2d5706c11dac --- lib/sbin/CST | 15 ++++++++------- lib/sbin/CSTUtils.pl | 28 ++++++++++++++++++++++++++++ lib/sbin/ConfigurationParser.pl | 11 ----------- lib/sbin/ScheduleParser.pl | 24 ------------------------ lib/sbin/interface_parser.pl | 26 -------------------------- lib/sbin/parameter_parser.pl | 22 ---------------------- 6 files changed, 36 insertions(+), 90 deletions(-) (limited to 'lib/sbin') diff --git a/lib/sbin/CST b/lib/sbin/CST index 08021f5c..8aa35b7d 100644 --- a/lib/sbin/CST +++ b/lib/sbin/CST @@ -6,7 +6,7 @@ # @desc # Parses the the configuration files for thorns. # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.78 2009-09-11 14:36:10 knarf Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.79 2009-09-11 16:07:35 knarf Exp $ #@@*/ # Global parameter to track the number of errors from the CST @@ -88,7 +88,8 @@ print "Parsing configuration files...\n"; $configuration_database = &CreateConfigurationDatabase($config_dir, %thorns); #$debug_configuration = 1; -&print_configuration_database($configuration_database) if($debug_configuration); +&print_database("configuration", $configuration_database) if($debug_configuration); +&save_database("configuration", $configuration_database) if($debug_configuration); # Restrict the rest of this to thorns with source @@ -99,8 +100,8 @@ print "Parsing interface files...\n"; %interface_database = &create_interface_database(scalar(keys %system_database), %system_database, %source_thorns); #$debug_interface = 1; -&print_interface_database(%interface_database) if($debug_interface); -&save_interface_database(%interface_database) if ($debug_interface); +&print_database("interface", %interface_database) if($debug_interface); +&save_database("interface", %interface_database) if ($debug_interface); # Parse the parameter.ccl files print "Parsing parameter files...\n"; @@ -123,13 +124,13 @@ print "Checking consistency...\n"; $err_msg = &CheckCrossConsistency(\%interface_database,\%parameter_database); #$debug_interface = 1; -&print_interface_database(%interface_database) if($debug_interface); +&print_database("interface", %interface_database) if($debug_interface); #$debug_parameters=1; -&print_parameter_database(%parameter_database ) if($debug_parameters); +&print_database("parameter", %parameter_database ) if($debug_parameters); #$debug_schedule = 1; -&print_schedule_database(%schedule_database) if($debug_schedule); +&print_database("schedule", %schedule_database) if($debug_schedule); # Create all the bindings print "Creating Thorn-Flesh bindings...\n"; diff --git a/lib/sbin/CSTUtils.pl b/lib/sbin/CSTUtils.pl index 63bd7431..1c2fb0e2 100644 --- a/lib/sbin/CSTUtils.pl +++ b/lib/sbin/CSTUtils.pl @@ -846,4 +846,32 @@ sub recurse_deps return ""; } +sub print_database +{ + my($type, %database) = @_; + my($field); + print "$type database dump:\n"; + + foreach $field ( sort keys %database ) + { + print "$field has value $database{$field}\n"; + } +} + +sub save_database +{ + my($type, %database) = @_; + my($field); + + if ($type !~ /[a-zA-Z.]+/) { + die "first parameter of save_database contains forbidden characters"; + } + open SAVE_DATABASE, ">$type_database"; + foreach $field ( sort keys %database ) + { + print SAVE_DATABASE "$field has value $database{$field}\n"; + } + close SAVE_DATABASE; +} + 1; diff --git a/lib/sbin/ConfigurationParser.pl b/lib/sbin/ConfigurationParser.pl index 9262860d..3b4dc8fb 100644 --- a/lib/sbin/ConfigurationParser.pl +++ b/lib/sbin/ConfigurationParser.pl @@ -347,15 +347,4 @@ sub ParseOptionalBlock return ($optional, $define, $line_number); } -sub print_configuration_database -{ - my($database) = @_; - my($field); - - foreach $field ( sort keys %$database ) - { - print "$field has value $database->{$field}\n"; - } -} - 1; diff --git a/lib/sbin/ScheduleParser.pl b/lib/sbin/ScheduleParser.pl index b37bb174..9fdff5f5 100644 --- a/lib/sbin/ScheduleParser.pl +++ b/lib/sbin/ScheduleParser.pl @@ -559,30 +559,6 @@ sub ParseScheduleStatement return ($line_number, $type, $groups); } -#/*@@ -# @routine print_schedule_database -# @date Thu Sep 16 19:13:05 1999 -# @author Tom Goodale -# @desc -# Prints out a schedule database. -# @enddesc -# @calls -# @calledby -# @history -# -# @endhistory -#@@*/ -sub print_schedule_database -{ - my(%schedule_database) = @_; - my($field); - - foreach $field ( sort keys %schedule_database ) - { - print "$field has value $schedule_database{$field}\n"; - } -} - #/*@@ # @routine PrintScheduleStatistics # @date Sun Sep 19 13:07:08 1999 diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl index b43a5391..d7696358 100644 --- a/lib/sbin/interface_parser.pl +++ b/lib/sbin/interface_parser.pl @@ -1180,32 +1180,6 @@ sub parse_interface_ccl } } - -sub print_interface_database -{ - my(%database) = @_; - my($field); - - foreach $field ( sort keys %database ) - { - print "$field has value $database{$field}\n"; - } -} - -sub save_interface_database -{ - my(%database) = @_; - my($field); - - open SAVE_INTERFACE_DATABASE, ">interface_database"; - foreach $field ( sort keys %database ) - { - print SAVE_INTERFACE_DATABASE "$field has value $database{$field}\n"; - } - close SAVE_INTERFACE_DATABASE; -} - - #/*@@ # @routine PrintInterfaceStatistics # @date Sun Sep 19 13:03:23 1999 diff --git a/lib/sbin/parameter_parser.pl b/lib/sbin/parameter_parser.pl index 220acf1f..9f96b420 100644 --- a/lib/sbin/parameter_parser.pl +++ b/lib/sbin/parameter_parser.pl @@ -13,8 +13,6 @@ #%parameter_database = create_parameter_database(%implementations); -#&print_parameter_database(%parameter_database); - #/*@@ # @routine create_parameter_database # @date Wed Sep 16 11:45:18 1998 @@ -511,26 +509,6 @@ sub parse_param_ccl return %parameter_db; } -#/*@@ -# @routine print_parameter_database -# @date Wed Sep 16 14:58:52 1998 -# @author Tom Goodale -# @desc -# Prints out a parameter database. -# @enddesc -#@@*/ -sub print_parameter_database -{ - my(%parameter_database) = @_; - my($field); - - foreach $field ( sort keys %parameter_database ) - { - print "$field has value $parameter_database{$field}\n"; - } -} - - #/*@@ # @routine PrintParameterStatistics # @date Sun Sep 19 13:04:18 1999 -- cgit v1.2.3