From 4ba77aa4cb92a6c4731dfd208457e403d5e32ee0 Mon Sep 17 00:00:00 2001 From: Hades DAQ Date: Fri, 21 Feb 2014 11:58:15 +0100 Subject: [PATCH] latest versions --- hmon/HPlot.pm | 19 +++- hmon/hmon_busynew.pl | 103 ++++++++++++++++++ hmon/hmon_endpoints.pl | 2 +- hmon/speakdaemon.pl | 2 +- hub/startup.script | 8 ++ main/data_sources.db | 14 +-- main/main_hades.script | 22 ++-- main/startup_briccolage.sh | 8 +- .../register_thresholds_20120405_181232.db | 2 +- nettools/reviveoep.pl | 2 +- oracle/daq2ora_client.pl | 3 +- oracle/runinfo2orastart_parallel.sh | 5 +- pion/addresses_pion.db | 6 +- pion/config/nxyter.sh | 6 +- pion/config/nxyter/nxsetup_0x3800.dat | 6 +- pion/config/nxyter/nxsetup_0x3801.dat | 8 +- pion/config/nxyter/nxsetup_0x3802.dat | 49 --------- pion/config/nxyter/nxsetup_0x3803.dat | 49 --------- pion/config/nxyter/trb3_setup.sh | 1 + pion/startup.script | 1 - shower/configure_shower.script | 5 +- start/startup.script | 5 +- utils/move_doublecpu_irq.sh | 8 +- 23 files changed, 186 insertions(+), 148 deletions(-) create mode 100755 hmon/hmon_busynew.pl delete mode 100644 pion/config/nxyter/nxsetup_0x3802.dat delete mode 100644 pion/config/nxyter/nxsetup_0x3803.dat diff --git a/hmon/HPlot.pm b/hmon/HPlot.pm index 0b4798e..3b9afb9 100644 --- a/hmon/HPlot.pm +++ b/hmon/HPlot.pm @@ -7,13 +7,13 @@ use FileHandle; my $p; -use constant {TYPE_HISTORY => 1}; +use constant {TYPE_HISTORY => 1, TYPE_BARGRAPH => 2}; use constant {OUT_PNG => 1, OUT_SVG => 2, #n/a OUT_SCREEN => 3}; #n/a -my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd'); +my @color= ('#2222dd','#dd2222','#22dd22','#dd8822','#dd22dd','#22dddd','#dddd22','#8888dd','#dddd88'); sub plot_write { my ($file,$str,$no) = @_; @@ -119,6 +119,19 @@ sub PlotInit { } plot_write($fh," "); } + elsif($p->{$name}->{type} == TYPE_BARGRAPH) { + plot_write($fh,"set style fill solid 1.00 border -1"); + plot_write($fh,"set grid noxtics ytics"); + plot_write($fh,"set boxwidth 2 absolute"); + plot_write($fh,"set xtics ('MDC12' 0,'MDC34' 1,'TOF' 2, 'RPC' 3, 'RICH' 4, 'SHW' 5, 'Start' 6, 'FW' 7) offset 2,0 scale 0"); + plot_write($fh,"set style histogram title offset character 0, 0, 0"); + plot_write($fh,"set style data histograms"); + plot_write($fh,"plot ",1); + for(my $j=0; $j<$p->{$name}->{curves};$j++) { + plot_write($fh,"'-' lt rgb \"$color[$j]\" title \"".($p->{$name}->{titles}->[$j] || "$j")."\" ",1); + } + plot_write($fh," "); + } else { die "Plot type not supported"; } @@ -157,4 +170,4 @@ sub PlotAdd { } -1; \ No newline at end of file +1; diff --git a/hmon/hmon_busynew.pl b/hmon/hmon_busynew.pl new file mode 100755 index 0000000..5c6d0bc --- /dev/null +++ b/hmon/hmon_busynew.pl @@ -0,0 +1,103 @@ +#!/usr/bin/perl -w + +use warnings; +use strict; +use Data::Dumper; +use Data::TreeDumper; +use Hmon; +use QA; +use HADES::TrbNet; +use HPlot; +use Time::HiRes qw(usleep); +use List::Util qw[min max]; + + +my $plot = (); +$plot->{name} = "BusyTimes"; +$plot->{file} = "files/BusyTimes"; +$plot->{curves} = 9; +$plot->{entries} = 200; +$plot->{type} = HPlot::TYPE_HISTORY; +$plot->{output} = HPlot::OUT_PNG; +$plot->{titles}->[0] = "MDC12"; +$plot->{titles}->[1] = "MDC34"; +$plot->{titles}->[2] = "Shower"; +$plot->{titles}->[3] = "RPC"; +$plot->{titles}->[4] = "Rich"; +$plot->{titles}->[5] = "TOF"; +$plot->{titles}->[6] = "Wall"; +$plot->{titles}->[7] = "St/Vt/Cts"; +$plot->{titles}->[8] = "Pion"; +$plot->{xlabel} = "Time"; +$plot->{ylabel} = "Deadtime (%)"; +$plot->{sizex} = 830; +$plot->{sizey} = 420; +$plot->{nokey} = 0; +$plot->{xscale} = 4; +HPlot::PlotInit($plot); + +my $plot2=(); +$plot2->{name} = "BusyTimeBars"; +$plot2->{file} = "files/BusyTimeBars"; +$plot2->{curves} = 1; +$plot2->{type} = HPlot::TYPE_BARGRAPH; +$plot2->{output} = HPlot::OUT_PNG; +$plot2->{ylabel} = "Deadtime (%)"; +$plot2->{sizex} = 265; +$plot2->{sizey} = 380; +$plot2->{nokey} = 1; + +my $str = Hmon::MakeTitle(12,9,"BusyTimesNew",0); + $str .= qq@@; + $str .= Hmon::MakeFooter(); + Hmon::WriteFile("BusyTimesNew",$str); + +my $fqa = QA::OpenQAFile() or die "No connection to QA Logfile"; + +trb_init_ports() or die trb_strerror(); + +my $diff; +my $old; +my $iter=0; + +while (1) { + my $o; + my $t = trb_registertime_read_mem(0x8000,0x4030,0,8); + $o->{0x8000} = $t->{0x8000}; + $t = trb_registertime_read_mem(0x8001,0x4030,0,8); + $o->{0x8001} = $t->{0x8001}; + $t = trb_registertime_read_mem(0x8002,0x4030,0,8); + $o->{0x8002} = $t->{0x8002}; + $t = trb_registertime_read_mem(0x8003,0x4030,0,8); + $o->{0x8003} = $t->{0x8003}; + + if (defined $old) { + foreach my $b (keys %$o) { + for my $v (0..7) { + my $tdiff = $o->{$b}->{time}->[$v] - $old->{$b}->{time}->[$v]; + if ($tdiff < 0) { $tdiff += 2**16;} + $tdiff *= 16; + my $vdiff = $o->{$b}->{value}->[$v] - $old->{$b}->{value}->[$v]; + if ($vdiff < 0) { $vdiff += 2**32;} + $diff->{$b}->[$v] = $vdiff/($tdiff|1); + } + } + + HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[6],0); #MDC12 + HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[7],1); #MDC34 + HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[3],2); #Shower + + HPlot::PlotAdd('BusyTimes',max($diff->{0x8001}->[1],$diff->{0x8001}->[2]),3); #RPC + HPlot::PlotAdd('BusyTimes',max($diff->{0x8001}->[3],$diff->{0x8001}->[4],$diff->{0x8001}->[5]),4); #Rich + HPlot::PlotAdd('BusyTimes',$diff->{0x8002}->[1],5); #Tof + HPlot::PlotAdd('BusyTimes',$diff->{0x8001}->[6],6); #Wall + HPlot::PlotAdd('BusyTimes',$diff->{0x8002}->[2],7); #Start/Cts + HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),8); #Pion + } + + unless(++$iter % 4) { + HPlot::PlotDraw('BusyTimes'); + } + $old = $o; + usleep(250000); + } diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl index f0236d8..41a505f 100755 --- a/hmon/hmon_endpoints.pl +++ b/hmon/hmon_endpoints.pl @@ -112,7 +112,7 @@ while(1) { #Pion 0x8900,0x3800,0x3801, #Start TRB3 - 0x8880,0x5000,0x5001,0x5002 + 0x8880,0x5000,0x5001,0x5002,0x5003 ); ###strip the register value diff --git a/hmon/speakdaemon.pl b/hmon/speakdaemon.pl index f2e3385..344f70d 100755 --- a/hmon/speakdaemon.pl +++ b/hmon/speakdaemon.pl @@ -11,7 +11,7 @@ $SIG{USR1} = sub { $inhibit = 1; }; $SIG{USR2} = sub { $inhibit = 0; system("killall espeak");}; #system("espeak -ven-male2 -s 130 -g 1 \"Speech daemon is online\" 2>/dev/null"); my $fq = QA::OpenQAFile(); -my $cmd = "./hmon_tail -n 0 -F /home/hadaq/trbsoft/daq/tools/hmon/files/speaklog"; +my $cmd = "./hmon_tail -n 0 -F /home/hadaq/trbsoft/hadesdaq/hmon/files/speaklog"; # my $fq = "remote"; # my $cmd = "./hmon_ssh -T $QA::QAServer \"tail -n 0 -F /home/hadaq/trbsoft/daq/tools/hmon/files/speaklog\" DAQ is going to be restarted." "STARTUP" & trbcmd w 0x1031 0xc1 0xfbf #one hardware port is not working, but nothing connected trbcmd w 0x1031 0xc3 0xfbf #one hardware port is not working, but nothing connected +# 2014-02-18 removed due to frequent busy +switchport.pl 0x1003 5 off + + # 2012-04-30: 10:16:00 0x223b removed from system, reinit doesnt work # switchport.pl 0x1133 5 off @@ -61,7 +65,7 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & time ./startup.pl -f main_hades.script -eb off -o file \ -m TOF -m RPC -m WALL -m RICH -m SHOWER \ -m STARTCTS -m NORESET -m CONFIGONLY -m MON_CTS \ - -m NOMDC #-m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv + -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv ######################################## ### DO NOT CHANGE ANY MDC SETTINGS HERE - without changing them in reviveoep.pl as well!!!!!! @@ -74,7 +78,7 @@ notifyall.sh "DAQ" " DAQ is going to be restarted." "STARTUP" & #All calib to EB1 trbcmd w 0x0003 0xa0f3 0xff1 -/home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh & +#/home/hadaq/trbsoft/hadesdaq/utils/move_doublecpu_irq.sh & scp /home/hadaq/oper/daq2ora/daq2ora_current.txt hades33:/home/hadaq/trbsoft/hadesdaq/hmon/files/ & diff --git a/mdc/thresholds/register_thresholds_20120405_181232.db b/mdc/thresholds/register_thresholds_20120405_181232.db index 6c4833b..a092f8f 100644 --- a/mdc/thresholds/register_thresholds_20120405_181232.db +++ b/mdc/thresholds/register_thresholds_20120405_181232.db @@ -242,7 +242,7 @@ 0x2214 1 0x5a 0x5a 0x54 0x5a 0x2215 2 0x52 0x50 0x60 0x60 0x5e 0x60 0x2216 2 0x60 0x50 0x60 0x60 0x5a 0x60 -0x2217 1 0x60 0x50 0x60 0x54 +0x2217 1 0x70 0x60 0x70 0x64 0x2218 1 0x54 0x50 0x60 0x60 0x2219 1 0x5c 0x60 0x60 0x60 0x221a 1 0x5e 0x5a 0x5a 0x5a diff --git a/nettools/reviveoep.pl b/nettools/reviveoep.pl index d1f073e..6c9d277 100755 --- a/nettools/reviveoep.pl +++ b/nettools/reviveoep.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -BEGIN {push @INC, '/home/hadaq/trbsoft/daq/tools/hmon/'} +BEGIN {push @INC, '/home/hadaq/trbsoft/hadesdaq/hmon/'} use warnings; diff --git a/oracle/daq2ora_client.pl b/oracle/daq2ora_client.pl index 4b94614..703e037 100755 --- a/oracle/daq2ora_client.pl +++ b/oracle/daq2ora_client.pl @@ -84,7 +84,8 @@ if($opt_daemon){ threads->new( \&statusServer ); #-------- need to explicitely set oracle environment if this was started by icinga restarthandler (not-login ssh!) -$ENV{ORACLE_HOME}='/usr/lib/oracle/11.2/client'; +$ENV{ORACLE_HOME}='/usr/lib/oracle/12.1/client64'; +$ENV{LD_LIBRARY_PATH}='/usr/lib/oracle/12.1/client64/lib'; #-------- Connect the database $status = "Try to connect to the Data Base ..."; diff --git a/oracle/runinfo2orastart_parallel.sh b/oracle/runinfo2orastart_parallel.sh index e10203e..b0e2f70 100755 --- a/oracle/runinfo2orastart_parallel.sh +++ b/oracle/runinfo2orastart_parallel.sh @@ -1,12 +1,15 @@ #!/bin/bash ## start script for separate runinfo2ora processes # JAM feb-2012 +# JAM added ld_library_path in feb-2014 # for icinga restart handler, we need to kill old processes first: echo "killing old processes:" /bin/pidof -x runinfo2ora.pl /bin/pidof -x runinfo2ora.pl | /usr/bin/xargs /bin/kill -9 # need to specify oracle environment for remote icinga restart: -export ORACLE_HOME=/usr/lib/oracle/11.2/client +export ORACLE_HOME=/usr/lib/oracle/12.1/client64 +export PATH=$PATH:$ORACLE_HOME/bin +export LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/oper_5/eb_runinfo2ora_1.txt > /home/hadaq/log/runinfo2ora_1_log.txt 2>&1 & sleep 1 /home/hadaq/trbsoft/daq/oracle/runinfo2ora.pl -f /home/hadaq/oper/oper_2/eb_runinfo2ora_2.txt > /home/hadaq/log/runinfo2ora_2_log.txt 2>&1 & diff --git a/pion/addresses_pion.db b/pion/addresses_pion.db index e76846f..387edcb 100644 --- a/pion/addresses_pion.db +++ b/pion/addresses_pion.db @@ -1,9 +1,9 @@ #Address # S/N # FPGA # Design # TRB # ################################################### 0x3800 0750 0 0 033 -0x3801 0751 1 0 033 -0x3802 0752 2 0 033 -0x3803 0753 3 0 033 +0x3820 0751 1 0 033 +0x3821 0752 2 0 033 +0x3801 0753 3 0 033 #0x3810 0750 0 0 075 #0x3811 0751 1 0 075 diff --git a/pion/config/nxyter.sh b/pion/config/nxyter.sh index 72c6ad1..1321e2e 100755 --- a/pion/config/nxyter.sh +++ b/pion/config/nxyter.sh @@ -24,8 +24,8 @@ done #./trb3_setup.sh 0x3802 #./trb3_setup.sh 0x3803 -trbcmd w 0x8900 0xc0 0xfff3 -trbcmd w 0x8900 0xc1 0xfff3 -trbcmd w 0x8900 0xc3 0xfff3 +trbcmd w 0x8900 0xc0 0xfff9 +trbcmd w 0x8900 0xc1 0xfff9 +trbcmd w 0x8900 0xc3 0xfff9 cd .. diff --git a/pion/config/nxyter/nxsetup_0x3800.dat b/pion/config/nxyter/nxsetup_0x3800.dat index 5f421cb..429b338 100644 --- a/pion/config/nxyter/nxsetup_0x3800.dat +++ b/pion/config/nxyter/nxsetup_0x3800.dat @@ -21,7 +21,7 @@ 0x000000ff # 17 0x00000023 # 18 Common Threshold, default 0x80 0x0000001e # 19 -0x0000005f # 20 +0x0000007d # 20 0x0000008e # 21 0x00000064 # 22 0x00000089 # 23 @@ -33,8 +33,8 @@ 0x00000045 # 29 0x000000be # 30 0x000000be # 31 -0x00000000 # 32 TestTrigger setup etc. , default 0x00 -0x0000000c # 33 clock input 256A, set bit #3, default 0x08 (normal mode) +0x00000004 # 32 TestTrigger setup etc. , default 0x00 +0x00000008 # 33 clock input 256A, set bit #3, default 0x08 (normal mode) 0x000000be # 34 0x000000be # 35 0x000000be # 36 diff --git a/pion/config/nxyter/nxsetup_0x3801.dat b/pion/config/nxyter/nxsetup_0x3801.dat index 24db9e5..2b039cc 100644 --- a/pion/config/nxyter/nxsetup_0x3801.dat +++ b/pion/config/nxyter/nxsetup_0x3801.dat @@ -19,9 +19,9 @@ 0x00000000 # 15 Channel Masks END 0x000000a0 # 16 0x000000ff # 17 -0x00000028 # 18 Common Threshold, default 0x80 +0x00000023 # 18 Common Threshold, default 0x80 0x0000001e # 19 -0x0000005f # 20 +0x00000064 # 20 0x0000008e # 21 0x00000064 # 22 0x00000089 # 23 @@ -33,8 +33,8 @@ 0x00000045 # 29 0x000000be # 30 0x000000be # 31 -0x00000004 # 32 TestTrigger setup etc. , default 0x00 -0x00000008 # 33 clock input 256A, set bit #3, default 0x08 (normal mode) +0x00000000 # 32 TestTrigger setup etc. , default 0x00 +0x0000000c # 33 clock input 256A, set bit #3, default 0x08 (normal mode) 0x000000be # 34 0x000000be # 35 0x000000be # 36 diff --git a/pion/config/nxyter/nxsetup_0x3802.dat b/pion/config/nxyter/nxsetup_0x3802.dat deleted file mode 100644 index 3e2d7e6..0000000 --- a/pion/config/nxyter/nxsetup_0x3802.dat +++ /dev/null @@ -1,49 +0,0 @@ -#------------------------------------------ -# Value I2C RegisterAddress -#------------------------------------------ -0x00000000 # 0 Channel Masks BEGIN -0x00000000 # 1 -0x00000000 # 2 -0x00000000 # 3 -0x00000000 # 4 -0x00000000 # 5 -0x00000000 # 6 -0x00000000 # 7 -0x00000000 # 8 -0x00000000 # 9 -0x00000000 # 10 -0x00000000 # 11 -0x00000000 # 12 -0x00000000 # 13 -0x00000000 # 14 -0x00000000 # 15 Channel Masks END -0x000000a0 # 16 -0x000000ff # 17 -0x00000023 # 18 Common Threshold, default 0x80 -0x0000001e # 19 -0x0000005f # 20 -0x0000009b # 21 -0x00000064 # 22 -0x00000089 # 23 -0x000000ff # 24 Testpulse Strength, default 0x80 -0x00000045 # 25 -0x0000000f # 26 iDUR (26) Analog dead time (changes nxtimer CVT) -0x00000036 # 27 -0x0000005c # 28 -0x00000045 # 29 -0x000000be # 30 -0x000000be # 31 -0x00000000 # 32 TestTrigger setup etc. , default 0x00 -0x0000000c # 33 clock input 256A, set bit #3, default 0x08 (normal mode) -0x000000be # 34 -0x000000be # 35 -0x000000be # 36 -0x000000be # 37 -0x00000000 # 38 -0x00000000 # 39 -0x000000be # 40 -0x000000be # 41 -0x000000be # 42 Channel shutdown register, FIFO, do not touch -0x00000000 # 43 -0x00000000 # 44 -0x000000ff # 45 diff --git a/pion/config/nxyter/nxsetup_0x3803.dat b/pion/config/nxyter/nxsetup_0x3803.dat deleted file mode 100644 index ef4eabc..0000000 --- a/pion/config/nxyter/nxsetup_0x3803.dat +++ /dev/null @@ -1,49 +0,0 @@ -#------------------------------------------ -# Value I2C RegisterAddress -#------------------------------------------ -0x00000000 # 0 Channel Masks BEGIN -0x00000000 # 1 -0x00000000 # 2 -0x00000000 # 3 -0x00000000 # 4 -0x00000000 # 5 -0x00000000 # 6 -0x00000000 # 7 -0x00000000 # 8 -0x00000000 # 9 -0x00000000 # 10 -0x00000000 # 11 -0x00000000 # 12 -0x00000000 # 13 -0x00000000 # 14 -0x00000000 # 15 Channel Masks END -0x000000a0 # 16 -0x000000ff # 17 -0x00000028 # 18 Common Threshold, default 0x80 -0x0000001e # 19 -0x0000005f # 20 -0x000000ae # 21 -0x00000064 # 22 -0x00000089 # 23 -0x000000ff # 24 Testpulse Strength, default 0x80 -0x00000045 # 25 -0x0000000f # 26 iDUR (26) Analog dead time (changes nxtimer CVT) -0x00000036 # 27 -0x0000005c # 28 -0x00000045 # 29 -0x000000be # 30 -0x000000be # 31 -0x00000004 # 32 TestTrigger setup etc. , default 0x00 -0x00000008 # 33 clock input 256A, set bit #3, default 0x08 (normal mode) -0x000000be # 34 -0x000000be # 35 -0x000000be # 36 -0x000000be # 37 -0x00000000 # 38 -0x00000000 # 39 -0x000000be # 40 -0x000000be # 41 -0x000000be # 42 Channel shutdown register, FIFO, do not touch -0x00000000 # 43 -0x00000000 # 44 -0x000000ff # 45 diff --git a/pion/config/nxyter/trb3_setup.sh b/pion/config/nxyter/trb3_setup.sh index 32d39f6..b791faf 100755 --- a/pion/config/nxyter/trb3_setup.sh +++ b/pion/config/nxyter/trb3_setup.sh @@ -21,6 +21,7 @@ trbcmd w $board 0x8101 0x01 # Write nxsetup.dat to memory and transfer to nx-i2c-registers trbcmd wm $board 0x8200 0 nxsetup_$board.dat +echo "Using nxsetup_$board.dat" #trbcmd w $board 0x8212 150 # threshold, load from dat file diff --git a/pion/startup.script b/pion/startup.script index 603448f..97ccd1d 100644 --- a/pion/startup.script +++ b/pion/startup.script @@ -2,7 +2,6 @@ !ifndef RESTART set_addresses serials_pion.db addresses_pion.db !endif -wait exec_cmd{local} echo "---> Configuring n-XYTERs" exec_cmd /home/hadaq/trbsoft/hadesdaq/pion/config/nxyter_wrapper.sh diff --git a/shower/configure_shower.script b/shower/configure_shower.script index 4e8ad70..07da048 100644 --- a/shower/configure_shower.script +++ b/shower/configure_shower.script @@ -1,8 +1,9 @@ ###WARNING: PEDESTALS SET TO CONSTANT FF for testing purposes -exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds.dat write #NORMAL -#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE +#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds.dat write #NORMAL +exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_ff.dat write #QUIET MODE +#exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerpeds_00.dat write #no thresholds #exec_cmd /home/hadaq/bin/showerpeds.pl -f /home/hadaq/trbsoft/daq/shower/showerPed_1111_hv2300V.txt write diff --git a/start/startup.script b/start/startup.script index be8db16..26cb4c7 100644 --- a/start/startup.script +++ b/start/startup.script @@ -11,4 +11,7 @@ trbcmd w 0x5000 0xc801 0x000f0000 trbcmd w 0x5001 0xc801 0x000f0000 trbcmd w 0x5002 0xc801 0x000f0000 -trbcmd w 0x5003 0xc801 0x000f0000 \ No newline at end of file +trbcmd w 0x5003 0xc801 0x000f0000 + + +trbcmd w 0xfe48 0xc801 0x000f0000 diff --git a/utils/move_doublecpu_irq.sh b/utils/move_doublecpu_irq.sh index b8733f4..b6d00c7 100755 --- a/utils/move_doublecpu_irq.sh +++ b/utils/move_doublecpu_irq.sh @@ -1,8 +1,8 @@ #!/bin/bash #ssh root@lxhadeb01 'echo 000000 > /proc/irq/1272/smp_affinity' -ssh root@lxhadeb02 'echo c > /proc/irq/1272/smp_affinity' -ssh root@lxhadeb03 'echo c > /proc/irq/1272/smp_affinity' -ssh root@lxhadeb04 'echo c > /proc/irq/1272/smp_affinity' -ssh root@lxhadeb05 'echo 0c > /proc/irq/31/smp_affinity;echo 03 > /proc/irq/32/smp_affinity;echo 03 > /proc/irq/33/smp_affinity;' +ssh root@lxhadeb02p 'echo c > /proc/irq/1272/smp_affinity' +ssh root@lxhadeb03p 'echo c > /proc/irq/1272/smp_affinity' +ssh root@lxhadeb04p 'echo c > /proc/irq/1272/smp_affinity' +ssh root@lxhadeb05p 'echo 0c > /proc/irq/31/smp_affinity;echo 03 > /proc/irq/32/smp_affinity;echo 03 > /proc/irq/33/smp_affinity;' #ssh root@lxhadeb05 'echo 030 > /proc/irq/46/smp_affinity;echo 0c0 > /proc/irq/47/smp_affinity;echo 300 > /proc/irq/48/smp_affinity;echo c00 > /proc/irq/49/smp_affinity;' -- 2.43.0