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.482 by root, Sun Oct 11 05:31:54 2009 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
227returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
228per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229 240
230=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
231 242
232This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 245that call.
235 246
236=item %cf::REFLECT 247=item %cf::REFLECT
237 248
… …
257$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
259 270
260 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
261 272
262 if ($Coro::current == $Coro::main) {#d# 273 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 275 return;#d#
265 }#d# 276 }#d#
266 277
267 # kill coroutine otherwise 278 # kill coroutine otherwise
… …
288)) { 299)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 301}
291 302
292$EV::DIED = sub { 303$EV::DIED = sub {
293 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
294}; 305};
295 306
296############################################################################# 307#############################################################################
297 308
298=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
395} 406}
396 407
397=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
398 409
399Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 411get spread over time.
401 412
402=cut 413=cut
403 414
404sub periodic($$) { 415sub periodic($$) {
405 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
422 433
423=cut 434=cut
424 435
425our @SLOT_QUEUE; 436our @SLOT_QUEUE;
426our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
427 439
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
431 443
432 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
433 446
434 while () { 447 while () {
435 next_job: 448 next_job:
449
436 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 451
438 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 456 $job->[2]->send;
442 Coro::cede; 457 Coro::cede;
443 goto next_job; 458 goto next_job;
444 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 461 }
446 } 462 }
447 463
448 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 467 $signal->wait;
452 } else { 468 } else {
469 $busy = 0;
453 Coro::schedule; 470 Coro::schedule;
454 } 471 }
455 } 472 }
456}; 473};
457 474
458sub get_slot($;$$) { 475sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
460 477
461 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
462 479
463 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
464 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
465 483
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
495 513
496sub sync_job(&) { 514sub sync_job(&) {
497 my ($job) = @_; 515 my ($job) = @_;
498 516
499 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
500 my $time = EV::time; 518 my $time = AE::time;
501 519
502 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
504 522
505 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
522 } else { 540 } else {
523 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
524 } 542 }
525 } 543 }
526 544
527 my $time = EV::time - $time; 545 my $time = AE::time - $time;
528 546
529 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
530 548
531 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
532 } else { 550 } else {
… …
576 reset_signals; 594 reset_signals;
577 &$cb 595 &$cb
578 }, @args; 596 }, @args;
579 597
580 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
581} 610}
582 611
583=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
584 613
585=cut 614=cut
… …
1166 1195
1167 sync_job { 1196 sync_job {
1168 if (length $$rdata) { 1197 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1172 1202
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1233 $av = $st->{objs}; 1263 $av = $st->{objs};
1234 } 1264 }
1235 1265
1236 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1239 1270
1240 ($data, $av) 1271 ($data, $av)
1241} 1272}
1242 1273
1243=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1302} 1333}
1303 1334
1304use File::Glob (); 1335use File::Glob ();
1305 1336
1306cf::player->attach ( 1337cf::player->attach (
1307 on_command => sub { 1338 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1309 1340
1310 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1311 or return; 1342 or return;
1312 1343
… …
1391 . "\n};\n1"; 1422 . "\n};\n1";
1392 1423
1393 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1394 } 1425 }
1395 1426
1427 my $pass = 0;
1396 my %done; 1428 my %done;
1397 while (%todo) { 1429 while (%todo) {
1398 my $progress; 1430 my $progress;
1399 1431
1432 ++$pass;
1433
1434 ext:
1400 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1437 next ext
1403 unless exists $done{$_}; 1438 unless exists $done{$_};
1404 } 1439 }
1405 1440
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1442
1408 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1447
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1449 if exists $v->{meta}{mandatory};
1416 1450
1417 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1418 } 1460 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1461 }
1424 1462
1425 skip: 1463 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1428 } 1471 }
1429 }; 1472 };
1430} 1473}
1431 1474
1432############################################################################# 1475#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1517 } 1560 }
1518 } 1561 }
1519} 1562}
1520 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1521sub save($) { 1577sub save($) {
1522 my ($pl) = @_; 1578 my ($pl) = @_;
1523 1579
1524 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1525 1581
… …
1530 1586
1531 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1533 1589
1534 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1594
1536 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1596 cf::cede_to_tick;
1538} 1597}
1539 1598
… …
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1636
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579 $pl->deactivate; 1638 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1583 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1584 1642
1585 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1641 \@logins 1699 \@logins
1642} 1700}
1643 1701
1644=item $player->maps 1702=item $player->maps
1645 1703
1704=item cf::player::maps $login
1705
1646Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1647player. May block. 1707player. May block.
1648 1708
1649=cut 1709=cut
1650 1710
… …
1712=cut 1772=cut
1713 1773
1714sub find_by_path($) { 1774sub find_by_path($) {
1715 my ($path) = @_; 1775 my ($path) = @_;
1716 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1717 my ($match, $specificity); 1779 my ($match, $specificity);
1718 1780
1719 for my $region (list) { 1781 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1815
1754 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1817 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1784 1846
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1848}
1787 1849
1788# also paths starting with '/' 1850# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1852
1791sub thawer_merge { 1853sub thawer_merge {
1792 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1793 1855
1794 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
2008 2070
2009 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2010 } 2072 }
2011} 2073}
2012 2074
2013sub pre_load { } 2075sub pre_load { }
2014sub post_load { } 2076#sub post_load { } # XS
2015 2077
2016sub load { 2078sub load {
2017 my ($self) = @_; 2079 my ($self) = @_;
2018 2080
2019 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2138 }
2077 2139
2078 $self->post_load; 2140 $self->post_load;
2079} 2141}
2080 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2081sub customise_for { 2146sub customise_for {
2082 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2083 2148
2084 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2150 if $self->per_player;
… …
2101 or next; 2166 or next;
2102 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2103 or next; 2168 or next;
2104 $neigh->load; 2169 $neigh->load;
2105 2170
2171 # now find the diagonal neighbours
2106 push @neigh, 2172 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2175 }
2110 2176
… …
2162 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2163 2229
2164 () 2230 ()
2165} 2231}
2166 2232
2233# common code, used by both ->save and ->swapout
2167sub save { 2234sub _save {
2168 my ($self) = @_; 2235 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2236
2172 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2173 2238
2174 return unless $self->dirty; 2239 return unless $self->dirty;
2175 2240
… …
2195 } else { 2260 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2262 }
2198} 2263}
2199 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2200sub swap_out { 2273sub swap_out {
2201 my ($self) = @_; 2274 my ($self) = @_;
2202 2275
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2277
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2211 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2213 2332
2214 $self->deactivate; 2333 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2335 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2336
2262 $self->unlink_save; 2337 $self->unlink_save;
2263 $self->destroy; 2338 $self->destroy;
2264} 2339}
2265 2340
… …
2273 2348
2274 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2275 2350
2276 $self->unlink_save; 2351 $self->unlink_save;
2277 2352
2278 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2358
… …
2340 : normalise $_ 2415 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2417 ]
2343} 2418}
2344 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2345=back 2452=back
2346 2453
2347=head3 cf::object 2454=head3 cf::object
2348 2455
2349=cut 2456=cut
… …
2481 2588
2482Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2483 2590
2484The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2487map. 2594map.
2488 2595
2489Will never block. 2596Will never block.
2490 2597
2491=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2513 my ($self) = @_; 2620 my ($self) = @_;
2514 2621
2515 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2516 2623
2624 ++$self->{_link_recursion};
2625
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2627
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2521 2630
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2632}
2524 2633
2525sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2527 2636
… …
2544 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2546 2655
2547 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2550 2659
2551 $map->load; 2660 $map->load;
2552 $map->load_neighbours; 2661 $map->load_neighbours;
2553 2662
2554 return unless $self->contr->active; 2663 return unless $self->contr->active;
2555 2664
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2558 2667 # entering was successful
2668 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2670 $self->activate_recursive;
2561} 2671 }
2562 2672
2673}
2674
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2676
2565Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
… …
2575 2687
2576our $GOTOGEN; 2688our $GOTOGEN;
2577 2689
2578sub cf::object::player::goto { 2690sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2580 2698
2581 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2701
2584 $self->enter_link; 2702 $self->enter_link;
… …
2608 my $map = eval { 2726 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2610 2728
2611 if ($map) { 2729 if ($map) {
2612 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2732 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2734 }
2617 2735
2618 $map 2736 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2629 } 2747 }
2630 2748
2631 $done->() if $done; 2749 $done->($self) if $done;
2632 })->prio (1); 2750 })->prio (1);
2633} 2751}
2634 2752
2635=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2636 2754
… …
2753 2871
2754 utf8::encode $text; 2872 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2756} 2874}
2757 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2902
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2761client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2762the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2764 2907
2765=cut 2908=cut
2766 2909
2767# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2769 "c/identify" => { 2918 "c/identify" => {
2770 id => "infobox", 2919 id => "infobox",
2771 title => "Identify", 2920 title => "Identify",
2772 reply => undef, 2921 reply => undef,
2773 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2924 "c/examine" => {
2776 id => "infobox", 2925 id => "infobox",
2777 title => "Examine", 2926 title => "Examine",
2778 reply => undef, 2927 reply => undef,
2779 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2935 },
2781 "c/book" => { 2936 "c/book" => {
2782 id => "infobox", 2937 id => "infobox",
2783 title => "Book", 2938 title => "Book",
2784 reply => undef, 2939 reply => undef,
… …
2900 my $pkt = "msg " 3055 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3058 );
2904 3059
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2916} 3061}
2917 3062
2918=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2919 3064
2920Sends an ext event to the client. 3065Sends an ext event to the client.
… …
2923 3068
2924sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2926 3071
2927 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3077 }
2933} 3078}
2934 3079
2935=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2936 3081
… …
2940 3085
2941sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2943 3088
2944 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3092 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3095 }
2951} 3096}
2952 3097
2953=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2954 3099
… …
3055 3200
3056 $coro 3201 $coro
3057} 3202}
3058 3203
3059cf::client->attach ( 3204cf::client->attach (
3060 on_destroy => sub { 3205 on_client_destroy => sub {
3061 my ($ns) = @_; 3206 my ($ns) = @_;
3062 3207
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3209 },
3065); 3210);
… …
3081our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3082 3227
3083$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3084 3229
3085$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3088 sort time 3233 sort time
3089)); 3234));
3090 3235
3091# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3145 3290
3146 %vars = (_dummy => 0) unless %vars; 3291 %vars = (_dummy => 0) unless %vars;
3147 3292
3293 my @res;
3148 local $_; 3294 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3295
3151 my $eval = 3296 my $eval =
3152 "do {\n" 3297 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3300 . $code
3156 . "\n}" 3301 . "\n}"
3157 ; 3302 ;
3158 3303
3304 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3162 3313
3163 if ($@) { 3314 if ($@) {
3164 warn "$@"; 3315 warn "$@";
3165 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
… …
3185=cut 3336=cut
3186 3337
3187sub register_script_function { 3338sub register_script_function {
3188 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3189 3340
3190 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3192} 3343}
3193 3344
3194=back 3345=back
3195 3346
3196=cut 3347=cut
… …
3217 3368
3218 $facedata->{version} == 2 3369 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3371
3221 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3375 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3378 };
3226 cf::cede_to_tick; 3379 cf::cede_to_tick;
3227 3380
3228 { 3381 {
3229 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3386
3234 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3391
3239 cf::cede_to_tick; 3392 cf::cede_to_tick;
3240 } 3393 }
3241 3394
3242 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
… …
3266 3419
3267 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3268 } 3421 }
3269 3422
3270 { 3423 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3274 3425
3275 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3429
3280 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3295 } else { 3432 } else {
3296 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3297 } 3434 }
3298 3435
3299 cf::cede_to_tick; 3436 cf::cede_to_tick;
3300 } 3437 }
3301 } 3438 }
3302 3439
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3441
3305 1 3442 1
3306} 3443}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3444
3328register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3330 3447
3331 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3487sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3373} 3490}
3374 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3375sub reload_resources { 3515sub reload_resources {
3376 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3377 3517
3378 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3379 reload_archetypes; 3520 reload_archetypes;
3380 reload_regions; 3521 reload_regions;
3381 reload_treasures; 3522 reload_treasures;
3382 3523
3383 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3384} 3525}
3385 3526
3386sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3531 or return;
3389 3532
3390 local $/; 3533 local $/;
3391 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3392 3535
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3537
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3540
3398 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3545 };
3403 warn $@ if $@; 3546 warn $@ if $@;
3404 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3405} 3550}
3406 3551
3407sub pidfile() { 3552sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3554 or die "$PIDFILE: $!";
… …
3437 3582
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3587
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3589
3450 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
… …
3457 }; 3597 };
3458 3598
3459 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3460 3600
3461 cf::sync_job { 3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3462 reload_resources; 3610 reload_resources;
3463 reload_config; 3611 reload_config;
3464 db_init; 3612 db_init;
3465 3613
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3614 cf::init_uuid;
3469 cf::init_signals; 3615 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3616 cf::init_skills;
3472 3617
3473 cf::init_beforeplay; 3618 cf::init_beforeplay;
3474 3619
3475 atomic; 3620 atomic;
… …
3482 use POSIX (); 3627 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3629
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3631 };
3632
3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3487 3635
3488 main_loop; 3636 main_loop;
3489} 3637}
3490 3638
3491############################################################################# 3639#############################################################################
… …
3493 3641
3494# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3495BEGIN { 3643BEGIN {
3496 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3500 }; 3648 };
3501 } 3649 }
3502} 3650}
3503 3651
3504sub write_runtime_sync { 3652sub write_runtime_sync {
3653 my $t0 = AE::time;
3654
3505 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3507 3657
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3659
3510 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3511 3661
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3663 or return;
3514 3664
3515 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3680 or return;
3531 3681
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3683 and return;
3534 3684
3535 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3686
3537 1 3687 1
3538} 3688}
3539 3689
3540our $uuid_lock; 3690our $uuid_lock;
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3820 }
3671 warn "cleared package $pkg\n";#d#
3672} 3821}
3673 3822
3674sub do_reload_perl() { 3823sub do_reload_perl() {
3675 # can/must only be called in main 3824 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3677 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3678 return; 3827 return;
3679 } 3828 }
3680 3829
3681 return if $RELOAD++; 3830 return if $RELOAD++;
3682 3831
3683 my $t1 = EV::time; 3832 my $t1 = AE::time;
3684 3833
3685 while ($RELOAD) { 3834 while ($RELOAD) {
3686 warn "reloading..."; 3835 warn "reloading...";
3687 3836
3688 warn "entering sync_job"; 3837 warn "entering sync_job";
… …
3759 3908
3760 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3761 3910
3762 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3763 require cf; 3912 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3765 3914
3766 warn "loading config and database again"; 3915 warn "loading config and database again";
3767 cf::reload_config; 3916 cf::reload_config;
3768 3917
3769 warn "loading extensions"; 3918 warn "loading extensions";
… …
3791 3940
3792 warn "reloaded"; 3941 warn "reloaded";
3793 --$RELOAD; 3942 --$RELOAD;
3794 } 3943 }
3795 3944
3796 $t1 = EV::time - $t1; 3945 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 3946 warn "reload completed in ${t1}s\n";
3798}; 3947};
3799 3948
3800our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3801 3950
… …
3804 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3805 3954
3806 $RELOAD_WATCHER ||= cf::async { 3955 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 3956 Coro::AIO::aio_wait cache_extensions;
3808 3957
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 3959 do_reload_perl;
3811 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3812 }; 3961 };
3813 }; 3962 };
3814} 3963}
… …
3831 3980
3832our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3834 3983
3835sub wait_for_tick { 3984sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 3986
3838 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 3989 $signal->wait;
3841} 3990}
3842 3991
3843sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 3994
3846 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 3997 $signal->wait;
3849} 3998}
… …
3854 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3855 return; 4004 return;
3856 } 4005 }
3857 4006
3858 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 4010
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4013 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
… …
3886} 4037}
3887 4038
3888{ 4039{
3889 # configure BDB 4040 # configure BDB
3890 4041
3891 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3894 4045
3895 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
… …
3977 } 4128 }
3978} 4129}
3979 4130
3980# load additional modules 4131# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3982 4134
3983END { cf::emergency_save } 4135END { cf::emergency_save }
3984 4136
39851 41371
3986 4138

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines