From 35aea6f59501002542b85b7e792930dc5f1ef2d6 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sat, 2 Dec 2017 11:28:18 +0100 Subject: [PATCH] Rename Donald::Select to My::Select Use the namespace My:: for packages declared inside the main script. --- clusterd | 112 +++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/clusterd b/clusterd index 8d865b4..150f802 100755 --- a/clusterd +++ b/clusterd @@ -15,7 +15,7 @@ use POSIX; use IO::Pipe; #-------------------------------------- -package Donald::Select; +package My::Select; use warnings; use strict; @@ -27,7 +27,7 @@ use Donald::Tools; our $time=Donald::Tools::uptime(); -sub Donald::Select::time +sub My::Select::time { return $time; } @@ -168,7 +168,7 @@ sub run 1; #-------------------------------------- -package Donald::Select::INET ; +package My::Select::INET ; use warnings; use strict; @@ -204,13 +204,13 @@ sub send_data sub reader { my ($self,$sub,@args)=@_; - Donald::Select::reader($$self,$sub,@args); + My::Select::reader($$self,$sub,@args); } sub receive_data { my ($self,$sub,@args)=@_; - Donald::Select::reader($$self,\&receive_data_cb,$self,$sub,@args); + My::Select::reader($$self,\&receive_data_cb,$self,$sub,@args); } sub receive_data_cb @@ -220,7 +220,7 @@ sub receive_data_cb my $peer = $$self->recv($data,$UDP_MAX); my ($udp_peer_port,$peer_iaddr)=unpack_sockaddr_in($peer); my $udp_peer_addr=inet_ntoa($peer_iaddr); - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); $sub->($data,$udp_peer_addr,$udp_peer_port,@args); } @@ -312,13 +312,13 @@ sub msg_state { sub init { restore_state; msg_text('node monitor: started. (recovery mode)'); - Donald::Select::timeout(630,sub{$MONITOR_STARTING=0;msg_text('node monitor: recovery finished');}); - Donald::Select::timeout(630,\&timeout_hosts); + My::Select::timeout(630,sub{$MONITOR_STARTING=0;msg_text('node monitor: recovery finished');}); + My::Select::timeout(630,\&timeout_hosts); } sub timeout_hosts { - Donald::Select::timeout_requeue(60); - my $timeout=Donald::Select::time()-1230; # 2x10 minutes + 30 seconds + My::Select::timeout_requeue(60); + my $timeout=My::Select::time()-1230; # 2x10 minutes + 30 seconds for (keys %H) { my $h=$H{$_}; @@ -343,7 +343,7 @@ sub rx_hostannounce { } else { $MONITOR_STARTING or msg_state('NEW','UP',$host,"discovered running node $version - $unixrev"); } - $H{$host}=['UP',Donald::Select::time,$seq+1,@more]; + $H{$host}=['UP',My::Select::time,$seq+1,@more]; } else { my $h=$H{$host}; if ($h->[0] eq 'UP') { @@ -371,7 +371,7 @@ sub rx_hostannounce { msg_state('DOWN','UP',$host,$seq-$h->[2]." packet(s) lost"); } } - @$h=('UP',Donald::Select::time,$seq+1,@more); + @$h=('UP',My::Select::time,$seq+1,@more); } } @@ -404,12 +404,12 @@ sub bigben { sub bigben_timer { bigben(); - Donald::Select::timeout_requeue(30); + My::Select::timeout_requeue(30); } sub bigben_init { $DAY_LAST_MSG=day(); - Donald::Select::timeout(30,\&bigben_timer); + My::Select::timeout(30,\&bigben_timer); } @@ -435,24 +435,24 @@ sub receive { $|=1; warn "NETLOG $msg\n" unless $msg=~/NETLOG/; } - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); } sub connect_request { - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); my $socket=$listen_socket->accept(); $socket->blocking(0); my $peernode=$socket->peerhost; my $buffer=''; - Donald::Select::reader($socket,\&receive,$socket,$peernode,\$buffer); + My::Select::reader($socket,\&receive,$socket,$peernode,\$buffer); # warn "$peernode: connect\n"; } sub init { $listen_socket=new IO::Socket::INET(Proto=>'tcp',LocalPort=>1028,Listen=>1,ReuseAddr=>1) or die "$!\n"; - Donald::Select::reader($listen_socket,\&connect_request); + My::Select::reader($listen_socket,\&connect_request); bigben_init(); } @@ -470,7 +470,7 @@ our $BC_RATE=8; # packets per second broadcast our (%options); # RUN OPTIONS -our $donald_s; # Donald::Select::INET udp socket +our $donald_s; # My::Select::INET udp socket our $my_hostname; our $my_ip; # '141.14.12.12' @@ -686,13 +686,13 @@ my %RECEIVER; # ( filename => $receiver, .... ) sub purge_old_receiver { while (my ($n,$v)=each %RECEIVER) { - if ($v->[1]+10[1]+10[0]->name,"\n"; log_to_stat_target('timeout receiving ',$v->[0]->name); delete $RECEIVER{$n}; } } - Donald::Select::timeout_requeue(60); + My::Select::timeout_requeue(60); } #------------------------------------------------------------- @@ -847,7 +847,7 @@ sub udp_rx_filedata { -e $tmp_filename and unlink($tmp_filename); my $fh=IO::File->new($tmp_filename,O_WRONLY|O_CREAT,0); defined $fh or return warn "$tmp_filename: $!\n"; - $receiver = [$st_want,Donald::Select::time,$fh,[]]; + $receiver = [$st_want,My::Select::time,$fh,[]]; $RECEIVER{$filename}=$receiver; } @@ -857,7 +857,7 @@ sub udp_rx_filedata { # write data ( size cant be 0 here ) $receiver->[2]->seek($pos,0) or return warn "$tmp_filename: $!\n"; $receiver->[2]->syswrite($data) or return warn "$tmp_filename: $!\n";; - $receiver->[1]=Donald::Select::time; + $receiver->[1]=My::Select::time; my $s=$receiver->[3]=[normalize_seg(@{$receiver->[3]},[$pos,length($data)])]; #warn "$filename: receive $pos length ",length($data)," segments now: ",join(",",map( {'['.$_->[0].','.$_->[1].']'} @{$receiver->[3]})),"\n"; @@ -922,7 +922,7 @@ sub sample_rproc { # every 5 seconds @proc_running_10=(@proc_running_10[1..@proc_running_10-1],running_proc()); $SAMPLE_TICK=0; } - Donald::Select::timeout_requeue(5); + My::Select::timeout_requeue(5); } #----------------------------------------------------------- stat @@ -963,7 +963,7 @@ sub loadavg { # AXP : (system load average) , LINUX: (system load average, pl our $STAT_TARGET='lol'; our $STAT_SEQ=0; sub send_stat { - Donald::Select::timeout_requeue(600); + My::Select::timeout_requeue(600); my ($load_avg,$pload,$pcapacity)=loadavg(); defined $load_avg or return; udp_send_message($STAT_TARGET,'loadavg.2',$my_hostname,$STAT_SEQ++,$load_avg,version_info(),$pload,$pcapacity,$my_unixrev); @@ -1025,12 +1025,12 @@ our %mgmt_sockets; sub mgmt_init { $mgmt_listen_socket=new IO::Socket::INET(LocalPort=>$MGMT_PORT,Proto=>'tcp',Listen=>1,ReuseAddr=>1); defined $mgmt_listen_socket or die "$!\n"; - Donald::Select::reader($mgmt_listen_socket,\&mgmt_connect_request); + My::Select::reader($mgmt_listen_socket,\&mgmt_connect_request); } sub mgmt_connect_request { - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); # listen socket ready @@ -1040,7 +1040,7 @@ sub mgmt_connect_request { ### warn "accepted mgmt connection from $peernode\n"; - Donald::Select::reader($socket,\&mgmt_receive,$socket); + My::Select::reader($socket,\&mgmt_receive,$socket); $mgmt_sockets{$socket}=$socket; $socket->print("clusterd ".version_info()." stupid console\n"); $socket->print("For historical messages, grep \"clusterd\" from /var/log/messages on $STAT_TARGET (or \"tail -f /var/log/messages |grep cluster\")\n"); @@ -1057,7 +1057,7 @@ sub mgmt_receive { return; } - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); $data=~s/\r?\n$//; length $data or return; if ($data eq 'l') { @@ -1240,12 +1240,12 @@ our %CLP_HANDLER=('CMD'=>\&clp_rx_CMD,'LSOF'=>\&clp_rx_LSOF); sub clp_init { $clp_listen_socket=new IO::Socket::INET(LocalPort=>$CLP_PORT,Proto=>'tcp',Listen=>1,ReuseAddr=>1); defined $clp_listen_socket or die "$!\n"; - Donald::Select::reader($clp_listen_socket,\&clp_connect_request); + My::Select::reader($clp_listen_socket,\&clp_connect_request); } sub clp_connect_request { - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); # listen socket ready @@ -1255,7 +1255,7 @@ sub clp_connect_request { my $buffer=''; - Donald::Select::reader($socket,\&clp_receive,$socket,\$buffer); + My::Select::reader($socket,\&clp_receive,$socket,\$buffer); $clp_sockets{$socket}=$socket; } @@ -1277,7 +1277,7 @@ sub clp_receive { $$bufref=substr($$bufref,2+$l); clp_message($s,$msg) and return; } - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); } sub clp_message { @@ -1350,7 +1350,7 @@ sub sync_cluster_pw { defined $CLUSTER_PW and warn "$CLUSTER_PW_FILE: $!\n"; $CLUSTER_PW=undef; } - Donald::Select::timeout(60,\&sync_cluster_pw); + My::Select::timeout(60,\&sync_cluster_pw); return defined $CLUSTER_PW; } @@ -1371,7 +1371,7 @@ sub init_area { warn "I am area router for $AREA_ROUTER{$my_hostname}\n"; $area_socket=new IO::Socket::INET (Proto=>'udp',LocalPort=>$UDP_PORT+1) or die "$!\n"; - Donald::Select::reader($area_socket,\&area_message,$area_socket); + My::Select::reader($area_socket,\&area_message,$area_socket); } sub area_message { @@ -1382,7 +1382,7 @@ sub area_message { my $udp_peer_addr=inet_ntoa($peer_iaddr); $donald_s->send_data($AREA_ROUTER{$my_hostname},$UDP_PORT,$data); # broadcast to our network - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); } sub udp_broadcast_message { @@ -1416,7 +1416,7 @@ sub check_progfile_status { else { $PROG_MTIME=$f[9]; } - Donald::Select::timeout(60,\&check_progfile_status); + My::Select::timeout(60,\&check_progfile_status); } sub version_info { # 'V1.31 - 20090617-155314' @@ -1451,7 +1451,7 @@ sub pload_debug { } sub check_overload() { - Donald::Select::timeout_requeue(600); + My::Select::timeout_requeue(600); if ($CPUS) { my $running_proc_10=running_proc_10(); my $pload_10=running_proc_10()/$CPUS; @@ -1495,9 +1495,9 @@ sub exec_at { my $pbuffer=''; my $olbuffer=''; my $elbuffer=''; - Donald::Select::reader($s,\&cmd_rx,$host,$s,\$pbuffer,\$olbuffer,\$elbuffer); + My::Select::reader($s,\&cmd_rx,$host,$s,\$pbuffer,\$olbuffer,\$elbuffer); $slave=1; - Donald::Select::run() if $slave;; + My::Select::run() if $slave;; } sub lsof { @@ -1514,10 +1514,10 @@ sub lsof { clp_send_message($s,'LSOF',$pattern); my $pbuffer=''; my $olbuffer=''; - Donald::Select::reader($s,\&lsof_rx,$host,$s,\$pbuffer,\$olbuffer); + My::Select::reader($s,\&lsof_rx,$host,$s,\$pbuffer,\$olbuffer); $slave++; } - Donald::Select::run() if $slave;; + My::Select::run() if $slave;; } sub lsof_rx { @@ -1539,7 +1539,7 @@ sub lsof_rx { $$pbufref=substr($$pbufref,2+$l); lsof_msg($host,$s,$msg,$olbufref); } - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); } sub lsof_msg { @@ -1570,7 +1570,7 @@ sub cmd_rx { $$pbufref=substr($$pbufref,2+$l); cmd_msg($host,$s,$msg,$olbufref,$elbufref); } - Donald::Select::reader_requeue(); + My::Select::reader_requeue(); } sub cmd_msg { @@ -1640,7 +1640,7 @@ GetOptions if (defined $options{'push'}) { sync_cluster_pw() or die "$CLUSTER_PW_FILE: $!\n"; - $donald_s=new Donald::Select::INET(Proto=>'udp') or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp') or die "$!\n"; push_file($donald_s,$options{'push'}); } elsif (defined $options{'exec'}) { if (substr($options{'exec'},0,1) eq '@') { @@ -1649,31 +1649,31 @@ if (defined $options{'push'}) { exec_at(substr($options{'exec'},1),@ARGV); } else { sync_cluster_pw() or die "$CLUSTER_PW_FILE: $!\n"; - $donald_s=new Donald::Select::INET(Proto=>'udp') or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp') or die "$!\n"; send_exec($donald_s,$options{'exec'}); } } elsif (defined $options{'push_amd_tar'}) { sync_cluster_pw() or die "$CLUSTER_PW_FILE: $!\n"; - $donald_s=new Donald::Select::INET(Proto=>'udp') or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp') or die "$!\n"; push_amd_tar($donald_s); } elsif (defined $options{'send-restart'}) { sync_cluster_pw() or die "$CLUSTER_PW_FILE: $!\n"; - $donald_s=new Donald::Select::INET(Proto=>'udp') or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp') or die "$!\n"; udp_broadcast_message($donald_s,'restart'); } elsif (defined $options{'flush-gidcache'}) { sync_cluster_pw() or die "$CLUSTER_PW_FILE: $!\n"; - $donald_s=new Donald::Select::INET(Proto=>'udp') or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp') or die "$!\n"; udp_broadcast_message($donald_s,'flush-gidcache'); } elsif (defined $options{'make-automaps'}) { sync_cluster_pw() or die "$CLUSTER_PW_FILE: $!\n"; - $donald_s=new Donald::Select::INET(Proto=>'udp') or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp') or die "$!\n"; udp_broadcast_message($donald_s,'make-automaps'); } elsif (defined $options{'daemon'}) { $options{'kill'} and Donald::Tools::kill_previous_server('clusterd') and sleep 2; $SIG{PIPE}='IGNORE'; - $donald_s=new Donald::Select::INET(Proto=>'udp',Broadcast=>1,LocalPort=>$UDP_PORT) or die "$!\n"; + $donald_s=new My::Select::INET(Proto=>'udp',Broadcast=>1,LocalPort=>$UDP_PORT) or die "$!\n"; $donald_s->receive_data(\&udp_message,$donald_s); unless ($options{'foreground'}) { @@ -1700,14 +1700,14 @@ if (defined $options{'push'}) { sync_cluster_pw() or warn "$CLUSTER_PW_FILE: $!\n"; - Donald::Select::timeout(60,\&purge_old_receiver); - Donald::Select::timeout(rand(60),\&send_stat); - Donald::Select::timeout(0,\&sample_rproc) unless Donald::Tools::is_alpha; + My::Select::timeout(60,\&purge_old_receiver); + My::Select::timeout(rand(60),\&send_stat); + My::Select::timeout(0,\&sample_rproc) unless Donald::Tools::is_alpha; $my_hostname eq $STAT_TARGET and My::Cluster::Updown::init(); $my_hostname eq 'lol' and My::NetlogReceiver::init(); - Donald::Select::timeout(600,\&check_overload); + My::Select::timeout(600,\&check_overload); - Donald::Select::run(); + My::Select::run(); } elsif ($options{'lsof'}) { lsof($options{'lsof'}); } elsif ($options{'kill'}) {