From b4fc1b91713bf0b6ec6e647ee44b58043677a2f9 Mon Sep 17 00:00:00 2001 From: Hadaq Hades Date: Mon, 24 Mar 2014 11:10:35 +0100 Subject: [PATCH] JAM: adjusted eventbuilder startup script concerning cpu taskset --- evtbuild/start_eb_gbe.pl | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl index 13dd817..cf0bcaa 100755 --- a/evtbuild/start_eb_gbe.pl +++ b/evtbuild/start_eb_gbe.pl @@ -16,7 +16,7 @@ my @arg_list = @ARGV; #- the command line option flags my $opt_help = 0; -my $opt_ebconf = "/home/hadaq/trbsoft/hadesdaq/evtbuild/eb.conf.withdabc"; +my $opt_ebconf = "/home/hadaq/trbsoft/hadesdaq/evtbuild/eb.conf"; my $opt_ioc = ""; my $opt_test = 0; my $opt_verb = 0; @@ -54,7 +54,6 @@ my $EB_CPU_status_href = \%EB_CPU_status; my $expect_ioc_script = "/tmp/ioc_exit.exp"; my $log_path = "/tmp/log"; - my %temp_args; my $temp_args_href = \%temp_args; read_config $opt_ebconf => %$temp_args_href; @@ -156,9 +155,9 @@ sub init_CPU_status() # } #JAM adjust this to actual affinities for eth0 settings TODO - +# eth0 interrupts are above core 8 now foreach my $core (0..11){ - if($core < 4 ){ + if(($core < 2) || ($core> 8 ) ){ $EB_CPU_status_href->{'192.168.100.12'}->{$core} = "res"; #reserved $EB_CPU_status_href->{'192.168.100.13'}->{$core} = "res"; #reserved $EB_CPU_status_href->{'192.168.100.14'}->{$core} = "res"; #reserved @@ -170,8 +169,9 @@ sub init_CPU_status() } } +# eth0 ir is set above core 11 foreach my $core (0..23){ - if($core < 4 ){ + if( ($core < 2) ||( $core > 11) ){ $EB_CPU_status_href->{'192.168.100.15'}->{$core} = "res"; #reserved } else{ @@ -572,12 +572,14 @@ if( $EB_Args_href->{$ebproc}->{'RFIO'} ){ # SMALLFILES for online monitoring node - my $core_nr = &getCoreNr($cpu); - + my $core_nr = &getCoreNr($cpu) . "," . &getCoreNr($cpu) . "," . &getCoreNr($cpu); +# my $core_nr = &getCoreNr($cpu); +# dabc is set to 3 cores + # JAM use fixed core number for kp1pc092 tests: # my $core_nr = 1; - my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr $cmd_dabc $conf_dabc &\""; - + my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports taskset -c $core_nr $cmd_dabc $conf_dabc &\""; +# my $exe_dabc = "ssh -n $cpu -l $username \"$dabclogin $cdworkdir $exports $cmd_dabc $conf_dabc &\""; my $log = $log_path . "/log_" . $ebproc . "_" . "startEB.txt"; -- 2.43.0