summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Multi/Core.pm82
-rw-r--r--lib/Multi/IRC.pm2
-rw-r--r--lib/VNDB.pm10
-rw-r--r--lib/VNDB/HomePages.pm2
-rw-r--r--lib/VNDB/Util/Tools.pm10
-rw-r--r--lib/global.pl4
-rw-r--r--util/multi.pl21
7 files changed, 60 insertions, 71 deletions
diff --git a/lib/Multi/Core.pm b/lib/Multi/Core.pm
index 6f3b452c..6f94f860 100644
--- a/lib/Multi/Core.pm
+++ b/lib/Multi/Core.pm
@@ -8,8 +8,7 @@ package Multi::Core;
use strict;
use warnings;
use POE 'Component::Cron';
-use Storable 'freeze', 'thaw';
-use IPC::ShareLite ':lock';
+use Tie::ShareLite ':lock';
use Time::HiRes 'time', 'gettimeofday', 'tv_interval'; # overload time()
use DateTime::Event::Cron; # bug in PoCo::Cron
@@ -18,9 +17,9 @@ sub spawn {
my $p = shift;
POE::Session->create(
package_states => [
- $p => [qw| _start register addcron fetch queue execute finish log cmd_exit |],
+ $p => [qw| _start register addcron heartbeat queue prepare execute finish log cmd_exit |],
],
- heap => { cron => [], queue => [], cmds => [], running => 0, starttime => 0 },
+ heap => { cron => [], cmds => [], running => 0, starttime => 0 },
);
}
@@ -29,7 +28,8 @@ sub _start {
$_[KERNEL]->alias_set('core');
$_[KERNEL]->call(core => register => qr/^(exit|reload)$/, 'cmd_exit');
$_[KERNEL]->yield(queue => $_) for (grep !/^-/, @ARGV);
- $_[KERNEL]->yield(fetch => time) if $Multi::DAEMONIZE != 1;
+ $_[KERNEL]->yield(heartbeat => time) if $Multi::DAEMONIZE != 1;
+ $_[KERNEL]->yield('prepare');
}
@@ -47,32 +47,36 @@ sub addcron { # cronline, cmd
}
-sub fetch { # lastfetch
- my $s = IPC::ShareLite->new(-key => $VNDB::SHMKEY,-create => 1, -destroy => 0);
- $s->lock(LOCK_SH);
- my $l = $s->fetch();
- if($l) {
- my $cmds = thaw($l);
- $_[KERNEL]->yield(queue => $_) for(@$cmds);
- $s->lock(LOCK_EX);
- $s->store('');
- }
- $s->unlock;
- undef $s;
-
+sub heartbeat { # last beat
+ $_[KERNEL]->yield('prepare');
$_[KERNEL]->call(core => log => 1, 'Heartbeat took %.2fs, possible block', time-$_[ARG0])
if time > $_[ARG0]+3;
- $_[KERNEL]->delay(fetch => 1, time) if $Multi::DAEMONIZE == 0;
+ $_[KERNEL]->delay(heartbeat => 1, time) if $Multi::DAEMONIZE == 0;
}
sub queue { # cmd
- push @{$_[HEAP]{queue}}, $_[ARG0];
- $_[KERNEL]->call(core => log => 3, "Queuing '%s'. Queue size: %d", $_[ARG0], scalar @{$_[HEAP]{queue}});
- if(!$_[HEAP]{running}) {
- $_[KERNEL]->yield(execute => $_[ARG0]);
+ my $s = tie my %s, 'Tie::ShareLite', @VNDB::SHMOPTS;
+ $s->lock(LOCK_EX);
+ my @q = ( ($s{queue} ? @{$s{queue}} : ()), $_[ARG0] );
+ $s{queue} = \@q;
+ $s->unlock();
+
+ $_[KERNEL]->call(core => log => 3, "Queuing '%s'.", $_[ARG0]);
+ $_[KERNEL]->yield('prepare');
+}
+
+
+sub prepare { # determines whether to execute a new cmd
+ return if $Multi::STOP || $_[HEAP]{running};
+
+ my $s = tie my %s, 'Tie::ShareLite', @VNDB::SHMOPTS;
+ $s->lock(LOCK_SH);
+ if($s{queue} && @{$s{queue}}) {
+ $_[KERNEL]->yield(execute => $s{queue}[0]);
$_[HEAP]{running} = 1;
}
+ $s->unlock();
}
@@ -91,15 +95,18 @@ sub execute { # cmd
}
-sub finish { # cmd [, stop ]
+sub finish { # cmd
$_[HEAP]{running} = 0;
- $_[HEAP]{queue} = [ grep { $_ ne $_[ARG0] } @{$_[HEAP]{queue}} ];
- $_[KERNEL]->call(core => log => 2, "Unqueuing '%s' after %.2fs. Queue size: %d",
- $_[ARG0], tv_interval($_[HEAP]{starttime}), scalar @{$_[HEAP]{queue}});
- if(@{$_[HEAP]{queue}} && !$_[ARG1]) {
- $_[KERNEL]->yield(execute => $_[HEAP]{queue}[0]);
- $_[HEAP]{running} = 1;
- }
+ $_[KERNEL]->call(core => log => 2, "Unqueuing '%s' after %.2fs.",
+ $_[ARG0], tv_interval($_[HEAP]{starttime}));
+
+ my $s = tie my %s, 'Tie::ShareLite', @VNDB::SHMOPTS;
+ $s->lock(LOCK_EX);
+ my @q = grep { $_ ne $_[ARG0] } $s{queue} ? @{$s{queue}} : ();
+ $s{queue} = \@q;
+ $s->unlock();
+
+ $_[KERNEL]->yield('prepare');
}
@@ -121,18 +128,11 @@ sub log { # level, msg
sub cmd_exit {
- $Multi::RESTART = 1 if $_[ARG0] eq 'reload';
- $_[KERNEL]->call(core => finish => $_[ARG0], 1);
+ $Multi::STOP = $_[ARG0] eq 'reload' ? 2 : 1;
+ $_[KERNEL]->call(core => finish => $_[ARG0]);
$_[KERNEL]->call(core => log => 2, 'Exiting...');
-
- my $s = IPC::ShareLite->new(-key => 'VNDB',-create => 1, -destroy => 0);
- $s->lock(LOCK_EX);
- $s->store(freeze($_[HEAP]->{queue}));
- $s->unlock();
- undef $s;
-
- $_[KERNEL]->delay('fetch'); # stop fetching
+ $_[KERNEL]->delay('heartbeat'); # stop the heartbeats
$_->delete() for (@{$_[HEAP]{cron}}); # stop scheduling cron jobs
$_[KERNEL]->signal($_[KERNEL], 'shutdown'); # Broadcast to other sessions
}
diff --git a/lib/Multi/IRC.pm b/lib/Multi/IRC.pm
index 75300419..4643a8fb 100644
--- a/lib/Multi/IRC.pm
+++ b/lib/Multi/IRC.pm
@@ -85,7 +85,7 @@ sub irc_001 {
sub irc_public {
if($_[ARG2] =~ /^!info/) {
$_[KERNEL]->post(circ => privmsg => $_[ARG1][0],
- 'Hello, I am HMX-12 Multi v'.$Multi::VERSION.' made by the great Yorhel! (Please ask Ayo for more info)');
+ 'Hello, I am HMX-12 Multi v'.$VNDB::VERSION.' made by the great Yorhel! (Please ask Ayo for more info)');
} else {
$_[KERNEL]->call(irc => vndbid => $_[ARG1][0], $_[ARG2]);
}
diff --git a/lib/VNDB.pm b/lib/VNDB.pm
index 6cd0f6ff..ffec7881 100644
--- a/lib/VNDB.pm
+++ b/lib/VNDB.pm
@@ -3,13 +3,9 @@ package VNDB;
use strict;
use warnings;
-require 'global.pl';
-
-our($VERSION, $DEBUG, %VNDBopts, @WARN);
-
-$DEBUG = 1;
-$VERSION = '1.14';
-%VNDBopts = (
+BEGIN { require 'global.pl'; }
+our $DEBUG;
+our %VNDBopts = (
CookieDomain => '.vndb.org',
root_url => $DEBUG ? 'http://beta.vndb.org' : 'http://vndb.org',
static_url => $DEBUG ? 'http://static.beta.vndb.org' : 'http://static.vndb.org',
diff --git a/lib/VNDB/HomePages.pm b/lib/VNDB/HomePages.pm
index c79b3ac6..eb0f9e0b 100644
--- a/lib/VNDB/HomePages.pm
+++ b/lib/VNDB/HomePages.pm
@@ -133,7 +133,7 @@ sub History { # type(p,v,r,u), id, [rss|/]
$x->startTag('item');
$x->dataElement(title => $_->{ititle});
$x->dataElement(link => $url);
- $x->dataElement(pubDate => VNDB::time2str($_->{requested}));
+ $x->dataElement(pubDate => NTL::time2str($_->{requested}));
$x->dataElement(guid => $url);
$x->dataElement(description => $_->{comments});
$x->endTag('item');
diff --git a/lib/VNDB/Util/Tools.pm b/lib/VNDB/Util/Tools.pm
index fe031acb..c2d9268b 100644
--- a/lib/VNDB/Util/Tools.pm
+++ b/lib/VNDB/Util/Tools.pm
@@ -4,8 +4,7 @@ package VNDB::Util::Tools;
use strict;
use warnings;
use Encode;
-use Storable 'freeze', 'thaw';
-use IPC::ShareLite ':lock';
+use Tie::ShareLite ':lock';
use Exporter 'import';
our $VERSION = $VNDB::VERSION;
@@ -131,11 +130,10 @@ sub AddDefaultStuff {
sub RunCmd { # cmd
- my $s = IPC::ShareLite->new(-key => $VNDB::SHMKEY, -create => 1, -destroy => 0);
+ my $s = tie my %s, 'Tie::ShareLite', @VNDB::SHMOPTS;
$s->lock(LOCK_EX);
- my $l = $s->fetch();
- my @queue = ($l?@{thaw($l)}:(), $_[1]);
- $s->store(freeze(\@queue));
+ $s{queue} = [] if !$s{queue};
+ push(@{$s{queue}}, grep !/^-/, $_[1]);
$s->unlock();
}
diff --git a/lib/global.pl b/lib/global.pl
index 76985342..74c3c070 100644
--- a/lib/global.pl
+++ b/lib/global.pl
@@ -1,7 +1,9 @@
package VNDB;
our @DBLOGIN = ( 'dbi:Pg:dbname=vndb', 'vndb', 'passwd' );
-our $SHMKEY = 'VNDB';
+our @SHMOPTS = ( -key => 'VNDB', -create => 'yes', -destroy => 'no', -mode => 0666);
+our $DEBUG = 1;
+our $VERSION = '1.15';
our $PLAT = {
win => 'Windows',
diff --git a/util/multi.pl b/util/multi.pl
index 4c22bced..022160ee 100644
--- a/util/multi.pl
+++ b/util/multi.pl
@@ -34,10 +34,9 @@ package Multi;
use strict;
use warnings;
+use Tie::ShareLite ':lock';
use Time::HiRes;
use POE;
-use Storable 'freeze', 'thaw';
-use IPC::ShareLite ':lock';
use DBI;
use lib '/www/vndb/lib';
@@ -52,20 +51,18 @@ BEGIN { require 'global.pl' }
$ENV{PATH} = '/usr/bin';
-our $VERSION = '0.9';
our $LOGDIR = '/www/vndb/data/log';
our $LOGLVL = 3; # 3:DEBUG, 2:ACTIONS, 1:WARN
-our $RESTART = 0;
+our $STOP = 0;
our $DAEMONIZE = (grep /^-c$/, @ARGV) ? 1 : (grep /^-s$/, @ARGV) ? 2 : 0;
our %MODULES = ();
if(grep /^-a$/, @ARGV) {
- my $s = IPC::ShareLite->new(-key => $VNDB::SHMKEY,-create => 1, -destroy => 0);
+ my $s = tie my %s, 'Tie::ShareLite', @VNDB::SHMOPTS;
$s->lock(LOCK_EX);
- my $l = $s->fetch();
- my @queue = ($l?@{thaw($l)}:(), grep !/^-/, @ARGV);
- $s->store(freeze(\@queue));
+ my @q = ( ($s{queue} ? @{$s{queue}} : ()), (grep !/^-/, @ARGV) );
+ $s{queue} = \@q;
$s->unlock();
exit;
}
@@ -81,17 +78,13 @@ Multi::RG->spawn();
Multi::Image->spawn();
Multi::Sitemap->spawn();
Multi::Maintenance->spawn();
-Multi::IRC->spawn(
- server => 'irc.synirc.net',
- user => 'Multi_'.$$,
- channel => '#vndb_test'
-) if 0;
+Multi::IRC->spawn() if !$VNDB::DEBUG;
$SIG{__WARN__} = sub {(local$_=shift)=~s/\r?\n//;$poe_kernel->call(core=>log=>1,'__WARN__: '.$_)};
$poe_kernel->run();
-exec $0, grep /^-/, @ARGV if $RESTART;
+exec $0, grep /^-/, @ARGV if $STOP == 2;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 16:16:35 +0000