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.473 by root, Fri Jun 26 16:32:10 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
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
117our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
118 127
119our %CFG; 128our %CFG;
120 129
121our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 131our $RUNTIME;
… …
134our $JITTER; # average jitter 143our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
136 145
137our @POST_INIT; 146our @POST_INIT;
138 147
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
140 150
141binmode STDOUT; 151binmode STDOUT;
142binmode STDERR; 152binmode STDERR;
143 153
144# read virtual server time, if available 154# read virtual server time, if available
… …
155 165
156our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
157 167
158sub cf::map::normalise; 168sub cf::map::normalise;
159 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
160############################################################################# 185#############################################################################
161 186
162=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
163 188
164=over 4 189=over 4
… …
210returns 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
211per 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.
212 237
213=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
214 239
215This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 242that call.
218 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
219=back 250=back
220 251
221=cut 252=cut
222 253
223BEGIN { 254$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 255 my $msg = join "", @_;
226 256
227 $msg .= "\n" 257 $msg .= "\n"
228 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
229 259
230 $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;
231 261
232 LOG llevError, $msg; 262 LOG llevError, $msg;
233 }; 263};
234}
235 264
236$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
238 267
239 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 272 return;#d#
242 }#d# 273 }#d#
243 274
244 # kill coroutine otherwise 275 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 276 Coro::terminate
247}; 277};
248
249$SIG{__DIE__} = sub { }; #d#?
250 278
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 296)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 298}
271 299
272$EV::DIED = sub { 300$EV::DIED = sub {
273 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
274}; 302};
275 303
276############################################################################# 304#############################################################################
277 305
278=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
375} 403}
376 404
377=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
378 406
379Like 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
380get spread over timer. 408get spread over time.
381 409
382=cut 410=cut
383 411
384sub periodic($$) { 412sub periodic($$) {
385 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
402 430
403=cut 431=cut
404 432
405our @SLOT_QUEUE; 433our @SLOT_QUEUE;
406our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
407 436
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
411 440
412 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
413 443
414 while () { 444 while () {
415 next_job: 445 next_job:
446
416 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 448
418 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 453 $job->[2]->send;
422 Coro::cede; 454 Coro::cede;
423 goto next_job; 455 goto next_job;
424 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 458 }
426 } 459 }
427 460
428 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 464 $signal->wait;
432 } else { 465 } else {
466 $busy = 0;
433 Coro::schedule; 467 Coro::schedule;
434 } 468 }
435 } 469 }
436}; 470};
437 471
438sub get_slot($;$$) { 472sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
440 474
441 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
442 476
443 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
444 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
445 480
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
475 510
476sub sync_job(&) { 511sub sync_job(&) {
477 my ($job) = @_; 512 my ($job) = @_;
478 513
479 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 515 my $time = AE::time;
481 516
482 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
484 519
485 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
502 } else { 537 } else {
503 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
504 } 539 }
505 } 540 }
506 541
507 my $time = EV::time - $time; 542 my $time = AE::time - $time;
508 543
509 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
510 545
511 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
512 } else { 547 } else {
… …
556 reset_signals; 591 reset_signals;
557 &$cb 592 &$cb
558 }, @args; 593 }, @args;
559 594
560 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 )
561} 607}
562 608
563=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
564 610
565=cut 611=cut
… …
1282} 1328}
1283 1329
1284use File::Glob (); 1330use File::Glob ();
1285 1331
1286cf::player->attach ( 1332cf::player->attach (
1287 on_command => sub { 1333 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1289 1335
1290 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1291 or return; 1337 or return;
1292 1338
… …
1371 . "\n};\n1"; 1417 . "\n};\n1";
1372 1418
1373 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1374 } 1420 }
1375 1421
1422 my $pass = 0;
1376 my %done; 1423 my %done;
1377 while (%todo) { 1424 while (%todo) {
1378 my $progress; 1425 my $progress;
1379 1426
1427 ++$pass;
1428
1429 ext:
1380 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1432 next ext
1383 unless exists $done{$_}; 1433 unless exists $done{$_};
1384 } 1434 }
1385 1435
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1437
1388 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1442
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1444 if exists $v->{meta}{mandatory};
1396 1445
1397 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;
1398 } 1455 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1456 }
1404 1457
1405 skip: 1458 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 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 }
1408 } 1466 }
1409 }; 1467 };
1410} 1468}
1411 1469
1412############################################################################# 1470#############################################################################
… …
1496 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1497 } 1555 }
1498 } 1556 }
1499} 1557}
1500 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
1501sub save($) { 1572sub save($) {
1502 my ($pl) = @_; 1573 my ($pl) = @_;
1503 1574
1504 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1505 1576
… …
1510 1581
1511 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1513 1584
1514 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];
1515 1589
1516 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1591 cf::cede_to_tick;
1518} 1592}
1519 1593
… …
1621 \@logins 1695 \@logins
1622} 1696}
1623 1697
1624=item $player->maps 1698=item $player->maps
1625 1699
1700=item cf::player::maps $login
1701
1626Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1627player. May block. 1703player. May block.
1628 1704
1629=cut 1705=cut
1630 1706
… …
1692=cut 1768=cut
1693 1769
1694sub find_by_path($) { 1770sub find_by_path($) {
1695 my ($path) = @_; 1771 my ($path) = @_;
1696 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1697 my ($match, $specificity); 1775 my ($match, $specificity);
1698 1776
1699 for my $region (list) { 1777 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1732 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
1733 1811
1734 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1813 $self->_create_random_map (
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1764 1842
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 1844}
1767 1845
1768# also paths starting with '/' 1846# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 1848
1771sub thawer_merge { 1849sub thawer_merge {
1772 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1773 1851
1774 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
1988 2066
1989 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1990 } 2068 }
1991} 2069}
1992 2070
1993sub pre_load { } 2071sub pre_load { }
1994sub post_load { } 2072#sub post_load { } # XS
1995 2073
1996sub load { 2074sub load {
1997 my ($self) = @_; 2075 my ($self) = @_;
1998 2076
1999 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2056 } 2134 }
2057 2135
2058 $self->post_load; 2136 $self->post_load;
2059} 2137}
2060 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
2061sub customise_for { 2142sub customise_for {
2062 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2063 2144
2064 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2146 if $self->per_player;
… …
2142 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2143 2224
2144 () 2225 ()
2145} 2226}
2146 2227
2228# common code, used by both ->save and ->swapout
2147sub save { 2229sub _save {
2148 my ($self) = @_; 2230 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2231
2152 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2153 2233
2154 return unless $self->dirty; 2234 return unless $self->dirty;
2155 2235
… …
2175 } else { 2255 } else {
2176 $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);
2177 } 2257 }
2178} 2258}
2179 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2180sub swap_out { 2268sub swap_out {
2181 my ($self) = @_; 2269 my ($self) = @_;
2182 2270
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2272
2188 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2190 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2191 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2192 $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};
2193 2327
2194 $self->deactivate; 2328 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2330 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2331
2242 $self->unlink_save; 2332 $self->unlink_save;
2243 $self->destroy; 2333 $self->destroy;
2244} 2334}
2245 2335
… …
2253 2343
2254 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2255 2345
2256 $self->unlink_save; 2346 $self->unlink_save;
2257 2347
2258 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2353
… …
2320 : normalise $_ 2410 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2412 ]
2323} 2413}
2324 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
2325=back 2447=back
2326 2448
2327=head3 cf::object 2449=head3 cf::object
2328 2450
2329=cut 2451=cut
… …
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2620
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2501 2623
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2625}
2504 2626
2505sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2507 2629
… …
2524 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2526 2648
2527 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2530 2652
2531 $map->load; 2653 $map->load;
2532 $map->load_neighbours; 2654 $map->load_neighbours;
2533 2655
2534 return unless $self->contr->active; 2656 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2657
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2540} 2663}
2541 2664
2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2543 2666
2544Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
… …
2732 2855
2733 utf8::encode $text; 2856 utf8::encode $text;
2734 $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);
2735} 2858}
2736 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
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 2886
2739Send 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
2740client 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
2741the 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
… …
2743 2891
2744=cut 2892=cut
2745 2893
2746# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2748 "c/identify" => { 2902 "c/identify" => {
2749 id => "infobox", 2903 id => "infobox",
2750 title => "Identify", 2904 title => "Identify",
2751 reply => undef, 2905 reply => undef,
2752 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2754 "c/examine" => { 2908 "c/examine" => {
2755 id => "infobox", 2909 id => "infobox",
2756 title => "Examine", 2910 title => "Examine",
2757 reply => undef, 2911 reply => undef,
2758 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",
2759 }, 2919 },
2760 "c/book" => { 2920 "c/book" => {
2761 id => "infobox", 2921 id => "infobox",
2762 title => "Book", 2922 title => "Book",
2763 reply => undef, 2923 reply => undef,
… …
2879 my $pkt = "msg " 3039 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3042 );
2883 3043
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2895} 3045}
2896 3046
2897=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2898 3048
2899Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2902 3052
2903sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2905 3055
2906 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3061 }
2912} 3062}
2913 3063
2914=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2915 3065
… …
2919 3069
2920sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2922 3072
2923 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3076 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3079 }
2930} 3080}
2931 3081
2932=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2933 3083
… …
3034 3184
3035 $coro 3185 $coro
3036} 3186}
3037 3187
3038cf::client->attach ( 3188cf::client->attach (
3039 on_destroy => sub { 3189 on_client_destroy => sub {
3040 my ($ns) = @_; 3190 my ($ns) = @_;
3041 3191
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3193 },
3044); 3194);
… …
3060our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3061 3211
3062$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3063 3213
3064$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3067 sort time 3217 sort time
3068)); 3218));
3069 3219
3070# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3124 3274
3125 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3126 3276
3277 my @res;
3127 local $_; 3278 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3279
3130 my $eval = 3280 my $eval =
3131 "do {\n" 3281 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3284 . $code
3135 . "\n}" 3285 . "\n}"
3136 ; 3286 ;
3137 3287
3288 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3297
3142 if ($@) { 3298 if ($@) {
3143 warn "$@"; 3299 warn "$@";
3144 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3164=cut 3320=cut
3165 3321
3166sub register_script_function { 3322sub register_script_function {
3167 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3168 3324
3169 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3171} 3327}
3172 3328
3173=back 3329=back
3174 3330
3175=cut 3331=cut
… …
3196 3352
3197 $facedata->{version} == 2 3353 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3355
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3359 type => FT_RSRC,
3203 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),
3204 }; 3362 };
3205 cf::cede_to_tick; 3363 cf::cede_to_tick;
3206 3364
3207 { 3365 {
3208 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3210 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3370
3213 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3375
3218 cf::cede_to_tick; 3376 cf::cede_to_tick;
3219 } 3377 }
3220 3378
3221 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3245 3403
3246 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3247 } 3405 }
3248 3406
3249 { 3407 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3253 3409
3254 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3413
3259 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3274 } else { 3416 } else {
3275 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3276 } 3418 }
3277 3419
… …
3361 3503
3362 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3363} 3505}
3364 3506
3365sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3511 or return;
3368 3512
3369 local $/; 3513 local $/;
3370 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3371 3515
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3373 3517
3374 $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};
3375 $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};
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3525 };
3382 warn $@ if $@; 3526 warn $@ if $@;
3383 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3384} 3530}
3385 3531
3386sub pidfile() { 3532sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
… …
3400 3546
3401 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3402 print $fh $$; 3548 print $fh $$;
3403} 3549}
3404 3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3558}
3559
3405sub main { 3560sub main {
3406 cf::init_globals; # initialise logging 3561 cf::init_globals; # initialise logging
3407 3562
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 3567
3418 $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
3419 3569
3420 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3427 }; 3577 };
3428 3578
3429 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3430 3580
3431 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
3432 reload_resources; 3590 reload_resources;
3433 reload_config; 3591 reload_config;
3434 db_init; 3592 db_init;
3435 3593
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3594 cf::init_uuid;
3439 cf::init_signals; 3595 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3596 cf::init_skills;
3442 3597
3443 cf::init_beforeplay; 3598 cf::init_beforeplay;
3444 3599
3445 atomic; 3600 atomic;
… …
3447 load_extensions; 3602 load_extensions;
3448 3603
3449 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3450 3605
3451 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3452 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};
3453 3609
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3455 }; 3611 };
3456 3612
3457 EV::loop; 3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3458} 3617}
3459 3618
3460############################################################################# 3619#############################################################################
3461# initialisation and cleanup 3620# initialisation and cleanup
3462 3621
3463# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3464BEGIN { 3623BEGIN {
3465 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3469 }; 3628 };
3470 } 3629 }
3471} 3630}
3472 3631
3473sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3474 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3476 3637
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3639
3479 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3480 3641
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3643 or return;
3483 3644
3484 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3499 or return; 3660 or return;
3500 3661
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3663 and return;
3503 3664
3504 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3666
3506 1 3667 1
3507} 3668}
3508 3669
3509our $uuid_lock; 3670our $uuid_lock;
… …
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 3800 }
3640 warn "cleared package $pkg\n";#d#
3641} 3801}
3642 3802
3643sub do_reload_perl() { 3803sub do_reload_perl() {
3644 # can/must only be called in main 3804 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3646 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3647 return; 3807 return;
3648 } 3808 }
3649 3809
3650 return if $RELOAD++; 3810 return if $RELOAD++;
3651 3811
3652 my $t1 = EV::time; 3812 my $t1 = AE::time;
3653 3813
3654 while ($RELOAD) { 3814 while ($RELOAD) {
3655 warn "reloading..."; 3815 warn "reloading...";
3656 3816
3657 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3728 3888
3729 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3730 3890
3731 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3732 require cf; 3892 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3734 3894
3735 warn "loading config and database again"; 3895 warn "loading config and database again";
3736 cf::reload_config; 3896 cf::reload_config;
3737 3897
3738 warn "loading extensions"; 3898 warn "loading extensions";
… …
3760 3920
3761 warn "reloaded"; 3921 warn "reloaded";
3762 --$RELOAD; 3922 --$RELOAD;
3763 } 3923 }
3764 3924
3765 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3767}; 3927};
3768 3928
3769our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3770 3930
… …
3773 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3774 3934
3775 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3777 3937
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 3939 do_reload_perl;
3780 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3781 }; 3941 };
3782 }; 3942 };
3783} 3943}
… …
3800 3960
3801our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3803 3963
3804sub wait_for_tick { 3964sub wait_for_tick {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3806 3966
3807 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3808 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait; 3969 $signal->wait;
3810} 3970}
3811 3971
3812sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3814 3974
3815 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 3977 $signal->wait;
3818} 3978}
… …
3823 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3824 return; 3984 return;
3825 } 3985 }
3826 3986
3827 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#
3828 3990
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $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.;
3831 Coro::async_pool { 3993 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3855} 4017}
3856 4018
3857{ 4019{
3858 # configure BDB 4020 # configure BDB
3859 4021
3860 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3863 4025
3864 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
… …
3946 } 4108 }
3947} 4109}
3948 4110
3949# load additional modules 4111# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3951 4114
3952END { cf::emergency_save } 4115END { cf::emergency_save }
3953 4116
39541 41171
3955 4118

Diff Legend

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