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.527 by root, Fri Apr 23 04:32:47 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 = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
114 123
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
… …
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
… …
214returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 240
217=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
218 242
219This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 245that call.
222 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
223=back 253=back
224 254
225=cut 255=cut
226 256
227BEGIN { 257$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 258 my $msg = join "", @_;
230 259
231 $msg .= "\n" 260 $msg .= "\n"
232 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
233 262
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 264
236 LOG llevError, $msg; 265 LOG llevError, $msg;
237 }; 266};
238}
239 267
240$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
242 270
243 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 275 return;#d#
246 }#d# 276 }#d#
247 277
248 # kill coroutine otherwise 278 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 279 Coro::terminate
251}; 280};
252
253$SIG{__DIE__} = sub { }; #d#?
254 281
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 299)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 301}
275 302
276$EV::DIED = sub { 303$EV::DIED = sub {
277 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
278}; 305};
279 306
280############################################################################# 307#############################################################################
281 308
282=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
379} 406}
380 407
381=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
382 409
383Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 411get spread over time.
385 412
386=cut 413=cut
387 414
388sub periodic($$) { 415sub periodic($$) {
389 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
406 433
407=cut 434=cut
408 435
409our @SLOT_QUEUE; 436our @SLOT_QUEUE;
410our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
411 439
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
415 443
416 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
417 446
418 while () { 447 while () {
419 next_job: 448 next_job:
449
420 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 451
422 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 456 $job->[2]->send;
426 Coro::cede; 457 Coro::cede;
427 goto next_job; 458 goto next_job;
428 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 461 }
430 } 462 }
431 463
432 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 467 $signal->wait;
436 } else { 468 } else {
469 $busy = 0;
437 Coro::schedule; 470 Coro::schedule;
438 } 471 }
439 } 472 }
440}; 473};
441 474
442sub get_slot($;$$) { 475sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
444 477
445 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
446 479
447 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
448 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
449 483
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
479 513
480sub sync_job(&) { 514sub sync_job(&) {
481 my ($job) = @_; 515 my ($job) = @_;
482 516
483 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
484 my $time = EV::time; 518 my $time = AE::time;
485 519
486 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
488 522
489 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
506 } else { 540 } else {
507 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
508 } 542 }
509 } 543 }
510 544
511 my $time = EV::time - $time; 545 my $time = AE::time - $time;
512 546
513 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
514 548
515 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
516 } else { 550 } else {
… …
560 reset_signals; 594 reset_signals;
561 &$cb 595 &$cb
562 }, @args; 596 }, @args;
563 597
564 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
565} 610}
566 611
567=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
568 613
569=cut 614=cut
… …
1150 1195
1151 sync_job { 1196 sync_job {
1152 if (length $$rdata) { 1197 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1156 1202
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1217 $av = $st->{objs}; 1263 $av = $st->{objs};
1218 } 1264 }
1219 1265
1220 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1223 1270
1224 ($data, $av) 1271 ($data, $av)
1225} 1272}
1226 1273
1227=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1286} 1333}
1287 1334
1288use File::Glob (); 1335use File::Glob ();
1289 1336
1290cf::player->attach ( 1337cf::player->attach (
1291 on_command => sub { 1338 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1293 1340
1294 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1295 or return; 1342 or return;
1296 1343
… …
1375 . "\n};\n1"; 1422 . "\n};\n1";
1376 1423
1377 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1378 } 1425 }
1379 1426
1427 my $pass = 0;
1380 my %done; 1428 my %done;
1381 while (%todo) { 1429 while (%todo) {
1382 my $progress; 1430 my $progress;
1383 1431
1432 ++$pass;
1433
1434 ext:
1384 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1437 next ext
1387 unless exists $done{$_}; 1438 unless exists $done{$_};
1388 } 1439 }
1389 1440
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1442
1392 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1447
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1449 if exists $v->{meta}{mandatory};
1400 1450
1401 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1402 } 1460 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1461 }
1408 1462
1409 skip: 1463 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1412 } 1471 }
1413 }; 1472 };
1414} 1473}
1415 1474
1416############################################################################# 1475#############################################################################
… …
1500 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1501 } 1560 }
1502 } 1561 }
1503} 1562}
1504 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1505sub save($) { 1577sub save($) {
1506 my ($pl) = @_; 1578 my ($pl) = @_;
1507 1579
1508 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1509 1581
… …
1514 1586
1515 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1517 1589
1518 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1594
1520 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1596 cf::cede_to_tick;
1522} 1597}
1523 1598
… …
1625 \@logins 1700 \@logins
1626} 1701}
1627 1702
1628=item $player->maps 1703=item $player->maps
1629 1704
1705=item cf::player::maps $login
1706
1630Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1631player. May block. 1708player. May block.
1632 1709
1633=cut 1710=cut
1634 1711
… …
1696=cut 1773=cut
1697 1774
1698sub find_by_path($) { 1775sub find_by_path($) {
1699 my ($path) = @_; 1776 my ($path) = @_;
1700 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1701 my ($match, $specificity); 1780 my ($match, $specificity);
1702 1781
1703 for my $region (list) { 1782 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
… …
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1816
1738 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1818 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1768 1847
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1849}
1771 1850
1772# also paths starting with '/' 1851# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1853
1775sub thawer_merge { 1854sub thawer_merge {
1776 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1777 1856
1778 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
1992 2071
1993 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1994 } 2073 }
1995} 2074}
1996 2075
1997sub pre_load { } 2076sub pre_load { }
1998sub post_load { } 2077#sub post_load { } # XS
1999 2078
2000sub load { 2079sub load {
2001 my ($self) = @_; 2080 my ($self) = @_;
2002 2081
2003 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
… …
2060 } 2139 }
2061 2140
2062 $self->post_load; 2141 $self->post_load;
2063} 2142}
2064 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2065sub customise_for { 2147sub customise_for {
2066 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2067 2149
2068 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2151 if $self->per_player;
… …
2085 or next; 2167 or next;
2086 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2087 or next; 2169 or next;
2088 $neigh->load; 2170 $neigh->load;
2089 2171
2172 # now find the diagonal neighbours
2090 push @neigh, 2173 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 } 2176 }
2094 2177
… …
2146 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2147 2230
2148 () 2231 ()
2149} 2232}
2150 2233
2234# common code, used by both ->save and ->swapout
2151sub save { 2235sub _save {
2152 my ($self) = @_; 2236 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2237
2156 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2157 2239
2158 return unless $self->dirty; 2240 return unless $self->dirty;
2159 2241
… …
2179 } else { 2261 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2263 }
2182} 2264}
2183 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2184sub swap_out { 2274sub swap_out {
2185 my ($self) = @_; 2275 my ($self) = @_;
2186 2276
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2278
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2195 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2197 2333
2198 $self->deactivate; 2334 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2336 $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 2337
2246 $self->unlink_save; 2338 $self->unlink_save;
2247 $self->destroy; 2339 $self->destroy;
2248} 2340}
2249 2341
… …
2257 2349
2258 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2259 2351
2260 $self->unlink_save; 2352 $self->unlink_save;
2261 2353
2262 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2359
… …
2324 : normalise $_ 2416 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2418 ]
2327} 2419}
2328 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2329=back 2453=back
2330 2454
2331=head3 cf::object 2455=head3 cf::object
2332 2456
2333=cut 2457=cut
… …
2465 2589
2466Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2467 2591
2468The player should be reasonably safe there for short amounts of time (e.g. 2592The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2594though, as the player cannot control the character while it is on the link
2471map. 2595map.
2472 2596
2473Will never block. 2597Will never block.
2474 2598
2475=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2496sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2497 my ($self) = @_; 2621 my ($self) = @_;
2498 2622
2499 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2500 2624
2625 ++$self->{_link_recursion};
2626
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2628
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2505 2631
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2633}
2508 2634
2509sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2511 2637
… …
2528 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2530 2656
2531 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2534 2660
2535 $map->load; 2661 $map->load;
2536 $map->load_neighbours; 2662 $map->load_neighbours;
2537 2663
2538 return unless $self->contr->active; 2664 return unless $self->contr->active;
2539 2665
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2542 2668 # entering was successful
2669 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2671 $self->activate_recursive;
2545} 2672 }
2546 2673
2674}
2675
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2677
2549Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
… …
2559 2688
2560our $GOTOGEN; 2689our $GOTOGEN;
2561 2690
2562sub cf::object::player::goto { 2691sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2564 2699
2565 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2702
2568 $self->enter_link; 2703 $self->enter_link;
… …
2592 my $map = eval { 2727 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2594 2729
2595 if ($map) { 2730 if ($map) {
2596 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2733 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2735 }
2601 2736
2602 $map 2737 $map
… …
2610 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2613 } 2748 }
2614 2749
2615 $done->() if $done; 2750 $done->($self) if $done;
2616 })->prio (1); 2751 })->prio (1);
2617} 2752}
2618 2753
2619=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2620 2755
… …
2737 2872
2738 utf8::encode $text; 2873 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2875}
2741 2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
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 ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2900}
2901
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2903
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send 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 2905client 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 2906the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2908
2749=cut 2909=cut
2750 2910
2751# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2753 "c/identify" => { 2919 "c/identify" => {
2754 id => "infobox", 2920 id => "infobox",
2755 title => "Identify", 2921 title => "Identify",
2756 reply => undef, 2922 reply => undef,
2757 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2925 "c/examine" => {
2760 id => "infobox", 2926 id => "infobox",
2761 title => "Examine", 2927 title => "Examine",
2762 reply => undef, 2928 reply => undef,
2763 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2936 },
2765 "c/book" => { 2937 "c/book" => {
2766 id => "infobox", 2938 id => "infobox",
2767 title => "Book", 2939 title => "Book",
2768 reply => undef, 2940 reply => undef,
… …
2884 my $pkt = "msg " 3056 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3059 );
2888 3060
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); 3061 $self->send_big_packet ($pkt);
2900} 3062}
2901 3063
2902=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2903 3065
2904Sends an ext event to the client. 3066Sends an ext event to the client.
… …
2907 3069
2908sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2910 3072
2911 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3078 }
2917} 3079}
2918 3080
2919=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2920 3082
… …
2924 3086
2925sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2927 3089
2928 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3093 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3096 }
2935} 3097}
2936 3098
2937=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2938 3100
… …
3039 3201
3040 $coro 3202 $coro
3041} 3203}
3042 3204
3043cf::client->attach ( 3205cf::client->attach (
3044 on_destroy => sub { 3206 on_client_destroy => sub {
3045 my ($ns) = @_; 3207 my ($ns) = @_;
3046 3208
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3210 },
3049); 3211);
… …
3065our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3066 3228
3067$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3068 3230
3069$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3072 sort time 3234 sort time
3073)); 3235));
3074 3236
3075# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
… …
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3129 3291
3130 %vars = (_dummy => 0) unless %vars; 3292 %vars = (_dummy => 0) unless %vars;
3131 3293
3294 my @res;
3132 local $_; 3295 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3296
3135 my $eval = 3297 my $eval =
3136 "do {\n" 3298 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3301 . $code
3140 . "\n}" 3302 . "\n}"
3141 ; 3303 ;
3142 3304
3305 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3146 3314
3147 if ($@) { 3315 if ($@) {
3148 warn "$@"; 3316 warn "$@";
3149 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
… …
3169=cut 3337=cut
3170 3338
3171sub register_script_function { 3339sub register_script_function {
3172 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3173 3341
3174 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3176} 3344}
3177 3345
3178=back 3346=back
3179 3347
3180=cut 3348=cut
… …
3201 3369
3202 $facedata->{version} == 2 3370 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3372
3205 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3376 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3379 };
3210 cf::cede_to_tick; 3380 cf::cede_to_tick;
3211 3381
3212 { 3382 {
3213 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
… …
3215 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3387
3218 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3392
3223 cf::cede_to_tick; 3393 cf::cede_to_tick;
3224 } 3394 }
3225 3395
3226 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
… …
3250 3420
3251 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3252 } 3422 }
3253 3423
3254 { 3424 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3258 3426
3259 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3430
3264 if ($info->{type} & 1) { 3431 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}; 3432 cf::face::set_type $idx, $info->{type};
3279 } else { 3433 } else {
3280 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3281 } 3435 }
3282 3436
… …
3366 3520
3367 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3368} 3522}
3369 3523
3370sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3528 or return;
3373 3529
3374 local $/; 3530 local $/;
3375 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3376 3532
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3534
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $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}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3537
3382 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3542 };
3387 warn $@ if $@; 3543 warn $@ if $@;
3388 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3389} 3547}
3390 3548
3391sub pidfile() { 3549sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!"; 3551 or die "$PIDFILE: $!";
… …
3421 3579
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 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 3584
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3586
3434 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3441 }; 3594 };
3442 3595
3443 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3444 3597
3445 cf::sync_job { 3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3446 reload_resources; 3607 reload_resources;
3447 reload_config; 3608 reload_config;
3448 db_init; 3609 db_init;
3449 3610
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3611 cf::init_uuid;
3453 cf::init_signals; 3612 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3613 cf::init_skills;
3456 3614
3457 cf::init_beforeplay; 3615 cf::init_beforeplay;
3458 3616
3459 atomic; 3617 atomic;
… …
3466 use POSIX (); 3624 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3626
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3470 }; 3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3471 3632
3472 main_loop; 3633 main_loop;
3473} 3634}
3474 3635
3475############################################################################# 3636#############################################################################
… …
3477 3638
3478# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3479BEGIN { 3640BEGIN {
3480 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3484 }; 3645 };
3485 } 3646 }
3486} 3647}
3487 3648
3488sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3489 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3491 3654
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3656
3494 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3495 3658
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3660 or return;
3498 3661
3499 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
… …
3514 or return; 3677 or return;
3515 3678
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3680 and return;
3518 3681
3519 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3683
3521 1 3684 1
3522} 3685}
3523 3686
3524our $uuid_lock; 3687our $uuid_lock;
… …
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 3817 }
3655 warn "cleared package $pkg\n";#d#
3656} 3818}
3657 3819
3658sub do_reload_perl() { 3820sub do_reload_perl() {
3659 # can/must only be called in main 3821 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3661 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3662 return; 3824 return;
3663 } 3825 }
3664 3826
3665 return if $RELOAD++; 3827 return if $RELOAD++;
3666 3828
3667 my $t1 = EV::time; 3829 my $t1 = AE::time;
3668 3830
3669 while ($RELOAD) { 3831 while ($RELOAD) {
3670 warn "reloading..."; 3832 warn "reloading...";
3671 3833
3672 warn "entering sync_job"; 3834 warn "entering sync_job";
… …
3743 3905
3744 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3745 3907
3746 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3747 require cf; 3909 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3749 3911
3750 warn "loading config and database again"; 3912 warn "loading config and database again";
3751 cf::reload_config; 3913 cf::reload_config;
3752 3914
3753 warn "loading extensions"; 3915 warn "loading extensions";
… …
3775 3937
3776 warn "reloaded"; 3938 warn "reloaded";
3777 --$RELOAD; 3939 --$RELOAD;
3778 } 3940 }
3779 3941
3780 $t1 = EV::time - $t1; 3942 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 3943 warn "reload completed in ${t1}s\n";
3782}; 3944};
3783 3945
3784our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3785 3947
… …
3788 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3789 3951
3790 $RELOAD_WATCHER ||= cf::async { 3952 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 3953 Coro::AIO::aio_wait cache_extensions;
3792 3954
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 3956 do_reload_perl;
3795 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3796 }; 3958 };
3797 }; 3959 };
3798} 3960}
… …
3815 3977
3816our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3818 3980
3819sub wait_for_tick { 3981sub wait_for_tick {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821 3983
3822 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3823 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait; 3986 $signal->wait;
3825} 3987}
3826 3988
3827sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829 3991
3830 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 3994 $signal->wait;
3833} 3995}
… …
3838 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3839 return; 4001 return;
3840 } 4002 }
3841 4003
3842 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 4007
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4010 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
… …
3870} 4034}
3871 4035
3872{ 4036{
3873 # configure BDB 4037 # configure BDB
3874 4038
3875 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3878 4042
3879 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
… …
3961 } 4125 }
3962} 4126}
3963 4127
3964# load additional modules 4128# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3966 4131
3967END { cf::emergency_save } 4132END { cf::emergency_save }
3968 4133
39691 41341
3970 4135

Diff Legend

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