ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.569 by root, Wed May 4 07:36:40 2011 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
58use IO::AIO (); 62use IO::AIO ();
59use Time::HiRes;
60use Compress::LZF; 63use Compress::LZF;
61use Digest::MD5 (); 64use Digest::MD5 ();
62 65
63AnyEvent::detect; 66AnyEvent::detect;
64 67
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
108our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 117
113our %RESOURCE; # unused 118#our %RESOURCE; # unused
114 119
115our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
117 122
118our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
129our $DB_ENV; 134our $DB_ENV;
130 135
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 137
133our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 140
135our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
137our $NOW; 144our $NOW;
138 145
139our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
150 157
151our @POST_INIT; 158our @POST_INIT;
152 159
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
155 165
156binmode STDOUT; 166binmode STDOUT;
157binmode STDERR; 167binmode STDERR;
158 168
159# read virtual server time, if available 169# read virtual server time, if available
193 203
194=over 4 204=over 4
195 205
196=item $cf::UPTIME 206=item $cf::UPTIME
197 207
198The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
199 224
200=item $cf::RUNTIME 225=item $cf::RUNTIME
201 226
202The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 228every server tick.
204 229
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 233
209Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
212database environment. 237database environment.
213 238
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 239=item $cf::LOADAVG
223 240
224The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
234Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235from wherever your confdir points to. 252from wherever your confdir points to.
236 253
237=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
238 255
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
240returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
242 272
243=cut 273=cut
244 274
245sub wait_for_tick(); 275sub wait_for_tick();
246sub wait_for_tick_begin(); 276sub wait_for_tick_begin();
312)) { 342)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 344}
315 345
316$EV::DIED = sub { 346$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
318}; 348};
319 349
320############################################################################# 350#############################################################################
321 351
322sub fork_call(&@); 352sub fork_call(&@);
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 380 $d
351 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
352} 382}
353 383
354=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
355 385
356Loads the given file from path and returns its contents. Croaks on error 386Loads the given file from path and returns its contents. Croaks on error
357and can block. 387and can block.
358 388
359=cut 389=cut
361sub load_file($) { 391sub load_file($) {
362 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
364 394
365 $data 395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
366} 434}
367 435
368=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
369 437
370Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
505Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
506(default: 0): This call blocks and returns only when you have at least 574(default: 0): This call blocks and returns only when you have at least
507C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede. 576till the next cede.
509 577
510Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
511should use 100 or more. 579should use 100 or more.
512 580
513The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
514used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
515 583
545 } 613 }
546 } 614 }
547 615
548 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 619 } else {
553 $busy = 0; 620 $busy = 0;
554 Coro::schedule; 621 Coro::schedule;
555 } 622 }
556 } 623 }
671 reset_signals; 738 reset_signals;
672} 739}
673 740
674sub fork_call(&@) { 741sub fork_call(&@) {
675 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
676
677 # we seemingly have to make a local copy of the whole thing,
678 # otherwise perl prematurely frees the stuff :/
679 # TODO: investigate and fix (likely this will be rather laborious)
680 743
681 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
682 cf::post_fork; 745 cf::post_fork;
683 &$cb 746 &$cb
684 } @args; 747 } @args;
834 897
835 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
836 } 899 }
837 } 900 }
838 901
839 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
840 my $data = $process->(\@data); 903 my $data = $process->(\@data);
841 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
842 905
843 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844 907
845 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
846 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
1366=cut 1429=cut
1367 1430
1368############################################################################# 1431#############################################################################
1369# command handling &c 1432# command handling &c
1370 1433
1371=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1372 1435
1373Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1374$name. 1437$name.
1375 1438
1376=cut 1439=cut
1382 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1383 1446
1384 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1385} 1448}
1386 1449
1387=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1388 1451
1389Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1392the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1393has logged in successfully. 1456has logged in successfully.
1394 1457
1395If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1396called.
1397 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1398=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1399 1466
1400Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1401exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1402are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1403is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1404log-in. 1471log-in.
1405 1472
1406If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1407called.
1408 1474
1409=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1411sub register_extcmd { 1482sub register_extcmd($$) {
1412 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1413 1484
1414 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1415} 1486}
1416 1487
1417sub register_exticmd { 1488sub register_async_extcmd($$) {
1418 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1419 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1420 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1421} 1504}
1422 1505
1423use File::Glob (); 1506use File::Glob ();
1424 1507
1425cf::player->attach ( 1508cf::player->attach (
1439 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1440 1523
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1525
1443 if (ref $msg) { 1526 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1528
1449 my @reply;
1450
1451 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1453 } 1547 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457 1548
1458 } else { 1549 } else {
1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460 } 1551 }
1461 1552
1474 }; 1565 };
1475 1566
1476 $grp 1567 $grp
1477} 1568}
1478 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1479sub load_extensions { 1581sub load_extensions {
1480 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1481 1585
1482 cf::sync_job { 1586 cf::sync_job {
1483 my %todo; 1587 my %todo;
1484 1588
1485 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1528 unless exists $done{$_}; 1632 unless exists $done{$_};
1529 } 1633 }
1530 1634
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1533 my $active = eval $v->{source}; 1646 my $active = eval $source;
1534 1647
1535 if (length $@) { 1648 if (length $@) {
1536 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1537 1650
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1825} 1938}
1826 1939
1827=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828 1941
1829Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1830
1831=item $player->ext_reply ($msgid, @msg)
1832
1833Sends an ext reply to the player.
1834
1835=cut
1836
1837sub ext_reply($$@) {
1838 my ($self, $id, @msg) = @_;
1839
1840 $self->ns->ext_reply ($id, @msg)
1841}
1842 1943
1843=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1844 1945
1845Sends an ext event to the client. 1946Sends an ext event to the client.
1846 1947
2171 2272
2172 { 2273 {
2173 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2174 2275
2175 return unless $self->valid; 2276 return unless $self->valid;
2176 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2177 2278
2178 $self->alloc; 2279 $self->alloc;
2179 2280
2180 $self->pre_load; 2281 $self->pre_load;
2181 cf::cede_to_tick; 2282 cf::cede_to_tick;
2204 } else { 2305 } else {
2205 $self->post_load_original 2306 $self->post_load_original
2206 if delete $self->{load_original}; 2307 if delete $self->{load_original};
2207 } 2308 }
2208 2309
2209 $self->in_memory (cf::MAP_INACTIVE); 2310 $self->state (cf::MAP_INACTIVE);
2210 2311
2211 cf::cede_to_tick; 2312 cf::cede_to_tick;
2212 # now do the right thing for maps 2313 # now do the right thing for maps
2213 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2214 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2245# if $self->per_party; 2346# if $self->per_party;
2246 2347
2247 $self 2348 $self
2248} 2349}
2249 2350
2250# find and load all maps in the 3x3 area around a map
2251sub load_neighbours {
2252 my ($map) = @_;
2253
2254 my @neigh; # diagonal neighbours
2255
2256 for (0 .. 3) {
2257 my $neigh = $map->tile_path ($_)
2258 or next;
2259 $neigh = find $neigh, $map
2260 or next;
2261 $neigh->load;
2262
2263 # now find the diagonal neighbours
2264 push @neigh,
2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2267 }
2268
2269 for (grep defined $_->[0], @neigh) {
2270 my ($path, $origin) = @$_;
2271 my $neigh = find $path, $origin
2272 or next;
2273 $neigh->load;
2274 }
2275}
2276
2277sub find_sync { 2351sub find_sync {
2278 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2279 2353
2280 # it's a bug to call this from the main context 2354 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2299 2373
2300sub find_async { 2374sub find_async {
2301 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2302 2376
2303 $path = normalise $path, $origin; 2377 $path = normalise $path, $origin;
2304 2378
2305 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2306 return $map if !$load || $map->linkable; 2380 return $map if !$load || $map->linkable;
2307 } 2381 }
2308 2382
2309 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2377 return if $self->players; 2451 return if $self->players;
2378 2452
2379 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate; 2454 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2383 2457
2384 # then atomically save 2458 # then atomically save
2385 $self->_save; 2459 $self->_save;
2386 2460
2387 # then free the map 2461 # then free the map
2413 2487
2414 return if $self->players; 2488 return if $self->players;
2415 2489
2416 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2417 2491
2418 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2419 2493
2420 # need to save uniques path 2494 # need to save uniques path
2421 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423 2497
2576 2650
2577Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2578 2652
2579=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2580 2654
2581returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2582even if the object actually exists. May block. 2656even if the object actually exists. May block.
2583 2657
2584=cut 2658=cut
2585 2659
2586sub deref { 2660sub deref {
2753 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2754 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2755 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2756 2830
2757 $map->load; 2831 $map->load;
2758 $map->load_neighbours;
2759 2832
2760 return unless $self->contr->active; 2833 return unless $self->contr->active;
2761 2834
2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763 if ($self->enter_map ($map, $x, $y)) { 2836 if ($self->enter_map ($map, $x, $y)) {
3179=cut 3252=cut
3180 3253
3181sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
3182 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
3183 3256
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
3187 push @msg, msgtype => "event_$type";
3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190}
3191
3192=item $client->ext_reply ($msgid, @msg)
3193
3194Sends an ext reply to the client.
3195
3196=cut
3197
3198sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_;
3200
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
3208} 3258}
3209 3259
3210=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
3211 3261
3212Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
3267 my ($ns, $buf) = @_; 3317 my ($ns, $buf) = @_;
3268 3318
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3320
3271 if (ref $msg) { 3321 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276 3323
3277 my @reply;
3278
3279 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
3281 } 3342 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
3286 } else { 3343 } else {
3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288 } 3345 }
3289 3346
3290 cf::override; 3347 cf::override;
3458=cut 3515=cut
3459 3516
3460############################################################################# 3517#############################################################################
3461# the server's init and main functions 3518# the server's init and main functions
3462 3519
3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3596
3463sub load_facedata($) { 3597sub load_facedata($) {
3464 my ($path) = @_; 3598 my ($path) = @_;
3465 3599
3466 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?)
3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3469
3470 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471 3601
3472 trace "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3473 3603
3474 my $facedata = decode_storable load_file $path; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3475 3605
3476 $facedata->{version} == 2 3606 $facedata->{version} == 2
3477 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3478 3608
3479 # patch in the exptable 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3481 $facedata->{resource}{"res/exp_table"} = { 3611
3482 type => FT_RSRC, 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3483 data => $exp_table, 3613
3484 hash => (Digest::MD5::md5 $exp_table), 3614 # BEGIN ATOMIC
3485 }; 3615 # from here on, everything must be atomic - no thread switch allowed
3486 cf::cede_to_tick; 3616 my $t1 = EV::time;
3487 3617
3488 { 3618 {
3489 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3490 3620
3491 while (my ($face, $info) = each %$faces) { 3621 for my $face (sort keys %$faces) {
3622 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3624
3494 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3499 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3500 cf::cede_to_tick; 3631 delete $cf::face::META[$idx];
3501 } 3632 }
3502 3633
3503 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3504 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3505 3636
3510 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3512 } else { 3643 } else {
3513 error "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3514 } 3645 }
3515
3516 cf::cede_to_tick;
3517 } 3646 }
3518 } 3647 }
3519 3648
3520 { 3649 {
3521 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3522 3651
3523 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3524 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3525 cf::cede_to_tick;
3526 } 3654 }
3527 3655
3528 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3529 } 3657 }
3530 3658
3531 { 3659 {
3532 my $res = $facedata->{resource}; 3660 my $res = $facedata->{resource};
3533 3661
3534 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3663 if (defined (my $type = $info->{type})) {
3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3666
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3672 $cf::face::HASH{$info->{hash}} = $idx;
3540 } else { 3673 } else {
3541 $RESOURCE{$name} = $info; # unused 3674# $RESOURCE{$name} = $info; # unused
3542 } 3675 }
3543
3544 cf::cede_to_tick;
3545 } 3676 }
3546 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3547 3688
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3690
3691 aio_close $fh if $fh; # close old facedata
3549 3692
3550 1 3693 1
3551} 3694}
3552 3695
3553register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
3564 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3566 cf::arch::commit_load; 3709 cf::arch::commit_load;
3567 3710
3568 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3569} 3726}
3570 3727
3571sub reload_regions { 3728sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?) 3730 # for this (global event?)
3581 if exists $_->{match}; 3738 if exists $_->{match};
3582 } 3739 }
3583} 3740}
3584 3741
3585sub reload_facedata { 3742sub reload_facedata {
3586 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3587 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3588} 3745}
3589 3746
3590sub reload_archetypes { 3747sub reload_archetypes {
3591 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3592 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3593} 3762}
3594 3763
3595sub reload_treasures { 3764sub reload_treasures {
3596 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3597 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
3618} 3787}
3619 3788
3620sub reload_resources { 3789sub reload_resources {
3621 trace "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3622 3791
3623 reload_exp_table;
3624 reload_materials; 3792 reload_materials;
3625 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3626 reload_sound; 3795 reload_sound;
3627 reload_archetypes; 3796 reload_archetypes;
3628 reload_regions; 3797 reload_regions;
3629 reload_treasures; 3798 reload_treasures;
3630 3799
3682 3851
3683sub main { 3852sub main {
3684 cf::init_globals; # initialise logging 3853 cf::init_globals; # initialise logging
3685 3854
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3855 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3856 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3857 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3859
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3861
3693 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696 (async { 3865 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3699 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
3702 evthread_start IO::AIO::poll_fileno; 3871 evthread_start IO::AIO::poll_fileno;
3703 3872
3704 cf::sync_job { 3873 cf::sync_job {
3705 cf::incloader::init (); 3874 cf::incloader::init ();
3706 3875
3876 db_init;
3877
3707 cf::init_anim; 3878 cf::init_anim;
3708 cf::init_attackmess; 3879 cf::init_attackmess;
3709 cf::init_dynamic; 3880 cf::init_dynamic;
3710 3881
3711 cf::load_settings; 3882 cf::load_settings;
3712 3883
3713 reload_resources; 3884 reload_resources;
3714 reload_config; 3885 reload_config;
3715 db_init;
3716 3886
3717 cf::init_uuid; 3887 cf::init_uuid;
3718 cf::init_signals; 3888 cf::init_signals;
3719 cf::init_skills; 3889 cf::init_skills;
3720 3890
3734 }; 3904 };
3735 3905
3736 cf::object::thawer::errors_are_fatal 0; 3906 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3907 info "parse errors in files are no longer fatal from this point on.\n";
3738 3908
3739 my $free_main; $free_main = EV::idle sub { 3909 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3910 undef &main; # free gobs of memory :)
3742 }; 3911 };
3743 3912
3744 goto &main_loop; 3913 goto &main_loop;
3745} 3914}
3902 4071
3903 cf::write_runtime_sync; # external watchdog should not bark 4072 cf::write_runtime_sync; # external watchdog should not bark
3904 4073
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 4074 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 4075 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4076 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 4077 }
3909 4078
3910 cf::write_runtime_sync; # external watchdog should not bark 4079 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 4080 };
3912 4081
4093 4262
4094############################################################################# 4263#############################################################################
4095 4264
4096my $bug_warning = 0; 4265my $bug_warning = 0;
4097 4266
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4267sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4268 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4269
4104 my $signal = new Coro::Signal; 4270 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4271}
4108 4272
4109sub wait_for_tick_begin() { 4273sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4275
4112 my $signal = new Coro::Signal; 4276 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4277 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4278 $signal->wait;
4115} 4279}
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4283 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4284 unless ++$bug_warning > 10;
4121 return; 4285 return;
4122 } 4286 }
4123 4287
4124 cf::server_tick; # one server iteration 4288 cf::one_tick; # one server iteration
4125 4289
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4290 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4291
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4292 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4293 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4135 } 4299 }
4136 4300
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4301 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4302 $sig->send;
4139 } 4303 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4304 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4305
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4306 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4307 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4308
4147 if (0) { 4309 if (0) {
4153 } 4315 }
4154} 4316}
4155 4317
4156{ 4318{
4157 # configure BDB 4319 # configure BDB
4320 info "initialising database";
4158 4321
4159 BDB::min_parallel 16; 4322 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4325
4163 unless ($DB_ENV) { 4326 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4327 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4328 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4329 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 }; 4355 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 }; 4358 };
4359
4360 info "database initialised";
4196} 4361}
4197 4362
4198{ 4363{
4199 # configure IO::AIO 4364 # configure IO::AIO
4200 4365
4366 info "initialising aio";
4201 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
4202 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
4203 undef $AnyEvent::AIO::WATCHER; 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
4204} 4371}
4205 4372
4206our $_log_backtrace; 4373our $_log_backtrace;
4207our $_log_backtrace_last; 4374our $_log_backtrace_last;
4208 4375

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines