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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.525 by root, Wed Apr 21 03:34:26 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
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %RESOURCE; 111our %RESOURCE;
109 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 118our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
114 120
115our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 124our $DB_ENV;
119 125
120our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
121 127
122our %CFG; 128our %CFG;
123 129
124our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 131our $RUNTIME;
… …
159 165
160our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
161 167
162sub cf::map::normalise; 168sub cf::map::normalise;
163 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
184
164############################################################################# 185#############################################################################
165 186
166=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
167 188
168=over 4 189=over 4
… …
214returns 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
215per 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.
216 237
217=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
218 239
219This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 242that call.
222 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
223=back 250=back
224 251
225=cut 252=cut
226 253
227BEGIN { 254$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 255 my $msg = join "", @_;
230 256
231 $msg .= "\n" 257 $msg .= "\n"
232 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
233 259
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 261
236 LOG llevError, $msg; 262 LOG llevError, $msg;
237 }; 263};
238}
239 264
240$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
242 267
243 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 272 return;#d#
246 }#d# 273 }#d#
247 274
248 # kill coroutine otherwise 275 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 276 Coro::terminate
251}; 277};
252
253$SIG{__DIE__} = sub { }; #d#?
254 278
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 296)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 298}
275 299
276$EV::DIED = sub { 300$EV::DIED = sub {
277 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
278}; 302};
279 303
280############################################################################# 304#############################################################################
281 305
282=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
379} 403}
380 404
381=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
382 406
383Like 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
384get spread over timer. 408get spread over time.
385 409
386=cut 410=cut
387 411
388sub periodic($$) { 412sub periodic($$) {
389 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
406 430
407=cut 431=cut
408 432
409our @SLOT_QUEUE; 433our @SLOT_QUEUE;
410our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
411 436
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
415 440
416 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
417 443
418 while () { 444 while () {
419 next_job: 445 next_job:
446
420 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 448
422 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 453 $job->[2]->send;
426 Coro::cede; 454 Coro::cede;
427 goto next_job; 455 goto next_job;
428 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 458 }
430 } 459 }
431 460
432 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
433 # 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
434 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 464 $signal->wait;
436 } else { 465 } else {
466 $busy = 0;
437 Coro::schedule; 467 Coro::schedule;
438 } 468 }
439 } 469 }
440}; 470};
441 471
442sub get_slot($;$$) { 472sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
444 474
445 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
446 476
447 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
448 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
449 480
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
479 510
480sub sync_job(&) { 511sub sync_job(&) {
481 my ($job) = @_; 512 my ($job) = @_;
482 513
483 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
484 my $time = EV::time; 515 my $time = AE::time;
485 516
486 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
488 519
489 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
506 } else { 537 } else {
507 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
508 } 539 }
509 } 540 }
510 541
511 my $time = EV::time - $time; 542 my $time = AE::time - $time;
512 543
513 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
514 545
515 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
516 } else { 547 } else {
… …
560 reset_signals; 591 reset_signals;
561 &$cb 592 &$cb
562 }, @args; 593 }, @args;
563 594
564 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 )
565} 607}
566 608
567=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
568 610
569=cut 611=cut
… …
1286} 1328}
1287 1329
1288use File::Glob (); 1330use File::Glob ();
1289 1331
1290cf::player->attach ( 1332cf::player->attach (
1291 on_command => sub { 1333 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1293 1335
1294 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1295 or return; 1337 or return;
1296 1338
… …
1375 . "\n};\n1"; 1417 . "\n};\n1";
1376 1418
1377 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1378 } 1420 }
1379 1421
1422 my $pass = 0;
1380 my %done; 1423 my %done;
1381 while (%todo) { 1424 while (%todo) {
1382 my $progress; 1425 my $progress;
1383 1426
1427 ++$pass;
1428
1429 ext:
1384 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1432 next ext
1387 unless exists $done{$_}; 1433 unless exists $done{$_};
1388 } 1434 }
1389 1435
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1437
1392 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1442
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1444 if exists $v->{meta}{mandatory};
1400 1445
1401 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;
1402 } 1455 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1456 }
1408 1457
1409 skip: 1458 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 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 }
1412 } 1466 }
1413 }; 1467 };
1414} 1468}
1415 1469
1416############################################################################# 1470#############################################################################
… …
1500 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1501 } 1555 }
1502 } 1556 }
1503} 1557}
1504 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
1505sub save($) { 1572sub save($) {
1506 my ($pl) = @_; 1573 my ($pl) = @_;
1507 1574
1508 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1509 1576
… …
1514 1581
1515 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1517 1584
1518 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];
1519 1589
1520 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1591 cf::cede_to_tick;
1522} 1592}
1523 1593
… …
1625 \@logins 1695 \@logins
1626} 1696}
1627 1697
1628=item $player->maps 1698=item $player->maps
1629 1699
1700=item cf::player::maps $login
1701
1630Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1631player. May block. 1703player. May block.
1632 1704
1633=cut 1705=cut
1634 1706
… …
1696=cut 1768=cut
1697 1769
1698sub find_by_path($) { 1770sub find_by_path($) {
1699 my ($path) = @_; 1771 my ($path) = @_;
1700 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1701 my ($match, $specificity); 1775 my ($match, $specificity);
1702 1776
1703 for my $region (list) { 1777 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1736 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
1737 1811
1738 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1813 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1768 1842
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1844}
1771 1845
1772# also paths starting with '/' 1846# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1848
1775sub thawer_merge { 1849sub thawer_merge {
1776 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1777 1851
1778 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
1992 2066
1993 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1994 } 2068 }
1995} 2069}
1996 2070
1997sub pre_load { } 2071sub pre_load { }
1998sub post_load { } 2072#sub post_load { } # XS
1999 2073
2000sub load { 2074sub load {
2001 my ($self) = @_; 2075 my ($self) = @_;
2002 2076
2003 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2060 } 2134 }
2061 2135
2062 $self->post_load; 2136 $self->post_load;
2063} 2137}
2064 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
2065sub customise_for { 2142sub customise_for {
2066 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2067 2144
2068 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2146 if $self->per_player;
… …
2146 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2147 2224
2148 () 2225 ()
2149} 2226}
2150 2227
2228# common code, used by both ->save and ->swapout
2151sub save { 2229sub _save {
2152 my ($self) = @_; 2230 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2231
2156 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2157 2233
2158 return unless $self->dirty; 2234 return unless $self->dirty;
2159 2235
… …
2179 } else { 2255 } else {
2180 $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);
2181 } 2257 }
2182} 2258}
2183 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2184sub swap_out { 2268sub swap_out {
2185 my ($self) = @_; 2269 my ($self) = @_;
2186 2270
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2272
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2195 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2196 $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};
2197 2327
2198 $self->deactivate; 2328 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2330 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2331
2246 $self->unlink_save; 2332 $self->unlink_save;
2247 $self->destroy; 2333 $self->destroy;
2248} 2334}
2249 2335
… …
2257 2343
2258 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2259 2345
2260 $self->unlink_save; 2346 $self->unlink_save;
2261 2347
2262 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2353
… …
2324 : normalise $_ 2410 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2412 ]
2327} 2413}
2328 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
2329=back 2447=back
2330 2448
2331=head3 cf::object 2449=head3 cf::object
2332 2450
2333=cut 2451=cut
… …
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2620
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2505 2623
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2625}
2508 2626
2509sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2511 2629
… …
2528 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2530 2648
2531 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2534 2652
2535 $map->load; 2653 $map->load;
2536 $map->load_neighbours; 2654 $map->load_neighbours;
2537 2655
2538 return unless $self->contr->active; 2656 return unless $self->contr->active;
2539 2657
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2542 2660
2543 # only activate afterwards, to support waiting in hooks 2661 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2662 $self->activate_recursive
2663 unless exists $self->{_link_pos}; # maybe we re in-flight again
2545} 2664}
2546 2665
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2667
2549Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
… …
2737 2856
2738 utf8::encode $text; 2857 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2859}
2741 2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2884}
2885
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2887
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2889client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2890the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2892
2749=cut 2893=cut
2750 2894
2751# non-persistent channels (usually the info channel) 2895# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2753 "c/identify" => { 2903 "c/identify" => {
2754 id => "infobox", 2904 id => "infobox",
2755 title => "Identify", 2905 title => "Identify",
2756 reply => undef, 2906 reply => undef,
2757 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2909 "c/examine" => {
2760 id => "infobox", 2910 id => "infobox",
2761 title => "Examine", 2911 title => "Examine",
2762 reply => undef, 2912 reply => undef,
2763 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2920 },
2765 "c/book" => { 2921 "c/book" => {
2766 id => "infobox", 2922 id => "infobox",
2767 title => "Book", 2923 title => "Book",
2768 reply => undef, 2924 reply => undef,
… …
2884 my $pkt = "msg " 3040 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3041 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3043 );
2888 3044
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3045 $self->send_big_packet ($pkt);
2900} 3046}
2901 3047
2902=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2903 3049
2904Sends an ext event to the client. 3050Sends an ext event to the client.
… …
2907 3053
2908sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2910 3056
2911 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3062 }
2917} 3063}
2918 3064
2919=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2920 3066
… …
2924 3070
2925sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2927 3073
2928 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3077 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3080 }
2935} 3081}
2936 3082
2937=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2938 3084
… …
3039 3185
3040 $coro 3186 $coro
3041} 3187}
3042 3188
3043cf::client->attach ( 3189cf::client->attach (
3044 on_destroy => sub { 3190 on_client_destroy => sub {
3045 my ($ns) = @_; 3191 my ($ns) = @_;
3046 3192
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3194 },
3049); 3195);
… …
3065our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3066 3212
3067$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3068 3214
3069$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3072 sort time 3218 sort time
3073)); 3219));
3074 3220
3075# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
… …
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3129 3275
3130 %vars = (_dummy => 0) unless %vars; 3276 %vars = (_dummy => 0) unless %vars;
3131 3277
3278 my @res;
3132 local $_; 3279 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3280
3135 my $eval = 3281 my $eval =
3136 "do {\n" 3282 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3285 . $code
3140 . "\n}" 3286 . "\n}"
3141 ; 3287 ;
3142 3288
3289 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
3146 3298
3147 if ($@) { 3299 if ($@) {
3148 warn "$@"; 3300 warn "$@";
3149 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
… …
3169=cut 3321=cut
3170 3322
3171sub register_script_function { 3323sub register_script_function {
3172 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3173 3325
3174 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3176} 3328}
3177 3329
3178=back 3330=back
3179 3331
3180=cut 3332=cut
… …
3201 3353
3202 $facedata->{version} == 2 3354 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3356
3205 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3360 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3363 };
3210 cf::cede_to_tick; 3364 cf::cede_to_tick;
3211 3365
3212 { 3366 {
3213 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
… …
3215 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3371
3218 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3376
3223 cf::cede_to_tick; 3377 cf::cede_to_tick;
3224 } 3378 }
3225 3379
3226 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
… …
3250 3404
3251 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3252 } 3406 }
3253 3407
3254 { 3408 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3258 3410
3259 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3412 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3414
3264 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3416 cf::face::set_type $idx, $info->{type};
3279 } else { 3417 } else {
3280 $RESOURCE{$name} = $info; 3418 $RESOURCE{$name} = $info;
3281 } 3419 }
3282 3420
… …
3366 3504
3367 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3368} 3506}
3369 3507
3370sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3512 or return;
3373 3513
3374 local $/; 3514 local $/;
3375 *CFG = YAML::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3376 3516
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3378 3518
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3526 };
3387 warn $@ if $@; 3527 warn $@ if $@;
3388 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3389} 3531}
3390 3532
3391sub pidfile() { 3533sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!"; 3535 or die "$PIDFILE: $!";
… …
3421 3563
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431 3568
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3570
3434 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
… …
3441 }; 3578 };
3442 3579
3443 evthread_start IO::AIO::poll_fileno; 3580 evthread_start IO::AIO::poll_fileno;
3444 3581
3445 cf::sync_job { 3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3446 reload_resources; 3591 reload_resources;
3447 reload_config; 3592 reload_config;
3448 db_init; 3593 db_init;
3449 3594
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3595 cf::init_uuid;
3453 cf::init_signals; 3596 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3597 cf::init_skills;
3456 3598
3457 cf::init_beforeplay; 3599 cf::init_beforeplay;
3458 3600
3459 atomic; 3601 atomic;
… …
3466 use POSIX (); 3608 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3610
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3611 (pop @POST_INIT)->(0) while @POST_INIT;
3470 }; 3612 };
3613
3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3471 3616
3472 main_loop; 3617 main_loop;
3473} 3618}
3474 3619
3475############################################################################# 3620#############################################################################
… …
3477 3622
3478# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3479BEGIN { 3624BEGIN {
3480 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3484 }; 3629 };
3485 } 3630 }
3486} 3631}
3487 3632
3488sub write_runtime_sync { 3633sub write_runtime_sync {
3634 my $t0 = AE::time;
3635
3489 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3491 3638
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3640
3494 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3495 3642
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3644 or return;
3498 3645
3499 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
… …
3514 or return; 3661 or return;
3515 3662
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3664 and return;
3518 3665
3519 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3667
3521 1 3668 1
3522} 3669}
3523 3670
3524our $uuid_lock; 3671our $uuid_lock;
… …
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3798 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3799 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 3801 }
3655 warn "cleared package $pkg\n";#d#
3656} 3802}
3657 3803
3658sub do_reload_perl() { 3804sub do_reload_perl() {
3659 # can/must only be called in main 3805 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3661 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3662 return; 3808 return;
3663 } 3809 }
3664 3810
3665 return if $RELOAD++; 3811 return if $RELOAD++;
3666 3812
3667 my $t1 = EV::time; 3813 my $t1 = AE::time;
3668 3814
3669 while ($RELOAD) { 3815 while ($RELOAD) {
3670 warn "reloading..."; 3816 warn "reloading...";
3671 3817
3672 warn "entering sync_job"; 3818 warn "entering sync_job";
… …
3743 3889
3744 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3745 3891
3746 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3747 require cf; 3893 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3749 3895
3750 warn "loading config and database again"; 3896 warn "loading config and database again";
3751 cf::reload_config; 3897 cf::reload_config;
3752 3898
3753 warn "loading extensions"; 3899 warn "loading extensions";
… …
3775 3921
3776 warn "reloaded"; 3922 warn "reloaded";
3777 --$RELOAD; 3923 --$RELOAD;
3778 } 3924 }
3779 3925
3780 $t1 = EV::time - $t1; 3926 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 3927 warn "reload completed in ${t1}s\n";
3782}; 3928};
3783 3929
3784our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3785 3931
… …
3788 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3789 3935
3790 $RELOAD_WATCHER ||= cf::async { 3936 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 3937 Coro::AIO::aio_wait cache_extensions;
3792 3938
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 3940 do_reload_perl;
3795 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3796 }; 3942 };
3797 }; 3943 };
3798} 3944}
… …
3815 3961
3816our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3818 3964
3819sub wait_for_tick { 3965sub wait_for_tick {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821 3967
3822 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3823 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait; 3970 $signal->wait;
3825} 3971}
3826 3972
3827sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829 3975
3830 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 3978 $signal->wait;
3833} 3979}
… …
3838 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3839 return; 3985 return;
3840 } 3986 }
3841 3987
3842 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3989
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 3991
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 3994 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
… …
3870} 4018}
3871 4019
3872{ 4020{
3873 # configure BDB 4021 # configure BDB
3874 4022
3875 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3878 4026
3879 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
… …
3961 } 4109 }
3962} 4110}
3963 4111
3964# load additional modules 4112# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3966 4115
3967END { cf::emergency_save } 4116END { cf::emergency_save }
3968 4117
39691 41181
3970 4119

Diff Legend

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