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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 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
… …
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %RESOURCE; 111our %RESOURCE;
111 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 118our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
116 120
117our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 124our $DB_ENV;
121 125
122our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
123 127
124our %CFG; 128our %CFG;
125 129
126our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 131our $RUNTIME;
… …
161 165
162our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
163 167
164sub cf::map::normalise; 168sub cf::map::normalise;
165 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
166############################################################################# 174#############################################################################
167 175
168%REFLECT = (); 176%REFLECT = ();
169for (@REFLECT) { 177for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 179 $REFLECT{$reflect->{class}} = $reflect;
172} 180}
173 181
174# this is decidedly evil 182# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 184
177############################################################################# 185#############################################################################
178 186
179=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
180 188
… …
227returns directly I<after> the tick processing (and consequently, can only wake one process 235returns 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. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229 237
230=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
231 239
232This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 242that call.
235 243
236=item %cf::REFLECT 244=item %cf::REFLECT
237 245
… …
257$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
259 267
260 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
261 269
262 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 272 return;#d#
265 }#d# 273 }#d#
266 274
267 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
288)) { 296)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 298}
291 299
292$EV::DIED = sub { 300$EV::DIED = sub {
293 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
294}; 302};
295 303
296############################################################################# 304#############################################################################
297 305
298=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
395} 403}
396 404
397=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
398 406
399Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 408get spread over time.
401 409
402=cut 410=cut
403 411
404sub periodic($$) { 412sub periodic($$) {
405 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
422 430
423=cut 431=cut
424 432
425our @SLOT_QUEUE; 433our @SLOT_QUEUE;
426our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
427 436
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
431 440
432 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
433 443
434 while () { 444 while () {
435 next_job: 445 next_job:
446
436 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 448
438 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 453 $job->[2]->send;
442 Coro::cede; 454 Coro::cede;
443 goto next_job; 455 goto next_job;
444 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 458 }
446 } 459 }
447 460
448 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 464 $signal->wait;
452 } else { 465 } else {
466 $busy = 0;
453 Coro::schedule; 467 Coro::schedule;
454 } 468 }
455 } 469 }
456}; 470};
457 471
458sub get_slot($;$$) { 472sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
460 474
461 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
462 476
463 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
464 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
465 480
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
495 510
496sub sync_job(&) { 511sub sync_job(&) {
497 my ($job) = @_; 512 my ($job) = @_;
498 513
499 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
500 my $time = EV::time; 515 my $time = AE::time;
501 516
502 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
504 519
505 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
522 } else { 537 } else {
523 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
524 } 539 }
525 } 540 }
526 541
527 my $time = EV::time - $time; 542 my $time = AE::time - $time;
528 543
529 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
530 545
531 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
532 } else { 547 } else {
… …
576 reset_signals; 591 reset_signals;
577 &$cb 592 &$cb
578 }, @args; 593 }, @args;
579 594
580 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
581} 607}
582 608
583=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
584 610
585=cut 611=cut
… …
1302} 1328}
1303 1329
1304use File::Glob (); 1330use File::Glob ();
1305 1331
1306cf::player->attach ( 1332cf::player->attach (
1307 on_command => sub { 1333 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1309 1335
1310 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1311 or return; 1337 or return;
1312 1338
… …
1391 . "\n};\n1"; 1417 . "\n};\n1";
1392 1418
1393 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1394 } 1420 }
1395 1421
1422 my $pass = 0;
1396 my %done; 1423 my %done;
1397 while (%todo) { 1424 while (%todo) {
1398 my $progress; 1425 my $progress;
1399 1426
1427 ++$pass;
1428
1429 ext:
1400 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1432 next ext
1403 unless exists $done{$_}; 1433 unless exists $done{$_};
1404 } 1434 }
1405 1435
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1437
1408 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1442
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1444 if exists $v->{meta}{mandatory};
1416 1445
1417 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1418 } 1455 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1456 }
1424 1457
1425 skip: 1458 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1428 } 1466 }
1429 }; 1467 };
1430} 1468}
1431 1469
1432############################################################################# 1470#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1517 } 1555 }
1518 } 1556 }
1519} 1557}
1520 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1521sub save($) { 1572sub save($) {
1522 my ($pl) = @_; 1573 my ($pl) = @_;
1523 1574
1524 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1525 1576
… …
1530 1581
1531 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1533 1584
1534 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1589
1536 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1591 cf::cede_to_tick;
1538} 1592}
1539 1593
… …
1641 \@logins 1695 \@logins
1642} 1696}
1643 1697
1644=item $player->maps 1698=item $player->maps
1645 1699
1700=item cf::player::maps $login
1701
1646Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1647player. May block. 1703player. May block.
1648 1704
1649=cut 1705=cut
1650 1706
… …
1712=cut 1768=cut
1713 1769
1714sub find_by_path($) { 1770sub find_by_path($) {
1715 my ($path) = @_; 1771 my ($path) = @_;
1716 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1717 my ($match, $specificity); 1775 my ($match, $specificity);
1718 1776
1719 for my $region (list) { 1777 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1811
1754 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1813 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1784 1842
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1844}
1787 1845
1788# also paths starting with '/' 1846# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1848
1791sub thawer_merge { 1849sub thawer_merge {
1792 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1793 1851
1794 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
2008 2066
2009 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2010 } 2068 }
2011} 2069}
2012 2070
2013sub pre_load { } 2071sub pre_load { }
2014sub post_load { } 2072#sub post_load { } # XS
2015 2073
2016sub load { 2074sub load {
2017 my ($self) = @_; 2075 my ($self) = @_;
2018 2076
2019 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2134 }
2077 2135
2078 $self->post_load; 2136 $self->post_load;
2079} 2137}
2080 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2081sub customise_for { 2142sub customise_for {
2082 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2083 2144
2084 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2146 if $self->per_player;
… …
2162 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2163 2224
2164 () 2225 ()
2165} 2226}
2166 2227
2228# common code, used by both ->save and ->swapout
2167sub save { 2229sub _save {
2168 my ($self) = @_; 2230 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2231
2172 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2173 2233
2174 return unless $self->dirty; 2234 return unless $self->dirty;
2175 2235
… …
2195 } else { 2255 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2257 }
2198} 2258}
2199 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2200sub swap_out { 2268sub swap_out {
2201 my ($self) = @_; 2269 my ($self) = @_;
2202 2270
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2272
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2211 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2213 2327
2214 $self->deactivate; 2328 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2330 $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 2331
2262 $self->unlink_save; 2332 $self->unlink_save;
2263 $self->destroy; 2333 $self->destroy;
2264} 2334}
2265 2335
… …
2273 2343
2274 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2275 2345
2276 $self->unlink_save; 2346 $self->unlink_save;
2277 2347
2278 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2353
… …
2340 : normalise $_ 2410 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2412 ]
2343} 2413}
2344 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2345=back 2447=back
2346 2448
2347=head3 cf::object 2449=head3 cf::object
2348 2450
2349=cut 2451=cut
… …
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2620
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2521 2623
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2625}
2524 2626
2525sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2527 2629
… …
2544 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2546 2648
2547 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2550 2652
2551 $map->load; 2653 $map->load;
2552 $map->load_neighbours; 2654 $map->load_neighbours;
2553 2655
2554 return unless $self->contr->active; 2656 return unless $self->contr->active;
… …
2753 2855
2754 utf8::encode $text; 2856 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2756} 2858}
2757 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2886
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send 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 2888client 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 2889the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2764 2891
2765=cut 2892=cut
2766 2893
2767# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2769 "c/identify" => { 2902 "c/identify" => {
2770 id => "infobox", 2903 id => "infobox",
2771 title => "Identify", 2904 title => "Identify",
2772 reply => undef, 2905 reply => undef,
2773 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2908 "c/examine" => {
2776 id => "infobox", 2909 id => "infobox",
2777 title => "Examine", 2910 title => "Examine",
2778 reply => undef, 2911 reply => undef,
2779 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2919 },
2781 "c/book" => { 2920 "c/book" => {
2782 id => "infobox", 2921 id => "infobox",
2783 title => "Book", 2922 title => "Book",
2784 reply => undef, 2923 reply => undef,
… …
2900 my $pkt = "msg " 3039 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3042 );
2904 3043
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); 3044 $self->send_big_packet ($pkt);
2916} 3045}
2917 3046
2918=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2919 3048
2920Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2923 3052
2924sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2926 3055
2927 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3061 }
2933} 3062}
2934 3063
2935=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2936 3065
… …
2940 3069
2941sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2943 3072
2944 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3076 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3079 }
2951} 3080}
2952 3081
2953=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2954 3083
… …
3055 3184
3056 $coro 3185 $coro
3057} 3186}
3058 3187
3059cf::client->attach ( 3188cf::client->attach (
3060 on_destroy => sub { 3189 on_client_destroy => sub {
3061 my ($ns) = @_; 3190 my ($ns) = @_;
3062 3191
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3193 },
3065); 3194);
… …
3081our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3082 3211
3083$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3084 3213
3085$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3088 sort time 3217 sort time
3089)); 3218));
3090 3219
3091# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3145 3274
3146 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3147 3276
3277 my @res;
3148 local $_; 3278 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3279
3151 my $eval = 3280 my $eval =
3152 "do {\n" 3281 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3284 . $code
3156 . "\n}" 3285 . "\n}"
3157 ; 3286 ;
3158 3287
3288 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3162 3297
3163 if ($@) { 3298 if ($@) {
3164 warn "$@"; 3299 warn "$@";
3165 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3185=cut 3320=cut
3186 3321
3187sub register_script_function { 3322sub register_script_function {
3188 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3189 3324
3190 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3192} 3327}
3193 3328
3194=back 3329=back
3195 3330
3196=cut 3331=cut
… …
3217 3352
3218 $facedata->{version} == 2 3353 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3355
3221 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3359 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3362 };
3226 cf::cede_to_tick; 3363 cf::cede_to_tick;
3227 3364
3228 { 3365 {
3229 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3370
3234 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3375
3239 cf::cede_to_tick; 3376 cf::cede_to_tick;
3240 } 3377 }
3241 3378
3242 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3266 3403
3267 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3268 } 3405 }
3269 3406
3270 { 3407 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3274 3409
3275 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3413
3280 if ($info->{type} & 1) { 3414 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}; 3415 cf::face::set_type $idx, $info->{type};
3295 } else { 3416 } else {
3296 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3297 } 3418 }
3298 3419
… …
3382 3503
3383 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3384} 3505}
3385 3506
3386sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3511 or return;
3389 3512
3390 local $/; 3513 local $/;
3391 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3392 3515
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3394 3517
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $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}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3525 };
3403 warn $@ if $@; 3526 warn $@ if $@;
3404 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3405} 3530}
3406 3531
3407sub pidfile() { 3532sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
… …
3437 3562
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 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 3567
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3569
3450 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3457 }; 3577 };
3458 3578
3459 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3460 3580
3461 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3462 reload_resources; 3590 reload_resources;
3463 reload_config; 3591 reload_config;
3464 db_init; 3592 db_init;
3465 3593
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3594 cf::init_uuid;
3469 cf::init_signals; 3595 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3596 cf::init_skills;
3472 3597
3473 cf::init_beforeplay; 3598 cf::init_beforeplay;
3474 3599
3475 atomic; 3600 atomic;
… …
3482 use POSIX (); 3607 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3609
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3487 3615
3488 main_loop; 3616 main_loop;
3489} 3617}
3490 3618
3491############################################################################# 3619#############################################################################
… …
3493 3621
3494# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3495BEGIN { 3623BEGIN {
3496 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3500 }; 3628 };
3501 } 3629 }
3502} 3630}
3503 3631
3504sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3505 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3507 3637
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3639
3510 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3511 3641
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3643 or return;
3514 3644
3515 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3660 or return;
3531 3661
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3663 and return;
3534 3664
3535 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3666
3537 1 3667 1
3538} 3668}
3539 3669
3540our $uuid_lock; 3670our $uuid_lock;
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3800 }
3671 warn "cleared package $pkg\n";#d#
3672} 3801}
3673 3802
3674sub do_reload_perl() { 3803sub do_reload_perl() {
3675 # can/must only be called in main 3804 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3677 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3678 return; 3807 return;
3679 } 3808 }
3680 3809
3681 return if $RELOAD++; 3810 return if $RELOAD++;
3682 3811
3683 my $t1 = EV::time; 3812 my $t1 = AE::time;
3684 3813
3685 while ($RELOAD) { 3814 while ($RELOAD) {
3686 warn "reloading..."; 3815 warn "reloading...";
3687 3816
3688 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3759 3888
3760 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3761 3890
3762 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3763 require cf; 3892 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3765 3894
3766 warn "loading config and database again"; 3895 warn "loading config and database again";
3767 cf::reload_config; 3896 cf::reload_config;
3768 3897
3769 warn "loading extensions"; 3898 warn "loading extensions";
… …
3791 3920
3792 warn "reloaded"; 3921 warn "reloaded";
3793 --$RELOAD; 3922 --$RELOAD;
3794 } 3923 }
3795 3924
3796 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3798}; 3927};
3799 3928
3800our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3801 3930
… …
3804 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3805 3934
3806 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3808 3937
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 3939 do_reload_perl;
3811 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3812 }; 3941 };
3813 }; 3942 };
3814} 3943}
… …
3831 3960
3832our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3834 3963
3835sub wait_for_tick { 3964sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 3966
3838 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 3969 $signal->wait;
3841} 3970}
3842 3971
3843sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 3974
3846 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 3977 $signal->wait;
3849} 3978}
… …
3854 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3855 return; 3984 return;
3856 } 3985 }
3857 3986
3858 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 3990
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 3993 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3886} 4017}
3887 4018
3888{ 4019{
3889 # configure BDB 4020 # configure BDB
3890 4021
3891 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3894 4025
3895 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
… …
3977 } 4108 }
3978} 4109}
3979 4110
3980# load additional modules 4111# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3982 4114
3983END { cf::emergency_save } 4115END { cf::emergency_save }
3984 4116
39851 41171
3986 4118

Diff Legend

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