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.478 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
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";
… …
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
109 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
… …
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
227$Coro::State::WARNHOOK = sub { 257$Coro::State::WARNHOOK = sub {
… …
238$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
240 270
241 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
242 272
243 if ($Coro::current == $Coro::main) {#d# 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
… …
269)) { 299)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 301}
272 302
273$EV::DIED = sub { 303$EV::DIED = sub {
274 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
275}; 305};
276 306
277############################################################################# 307#############################################################################
278 308
279=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
376} 406}
377 407
378=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
379 409
380Like 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
381get spread over timer. 411get spread over time.
382 412
383=cut 413=cut
384 414
385sub periodic($$) { 415sub periodic($$) {
386 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
403 433
404=cut 434=cut
405 435
406our @SLOT_QUEUE; 436our @SLOT_QUEUE;
407our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
408 439
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
412 443
413 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
414 446
415 while () { 447 while () {
416 next_job: 448 next_job:
449
417 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 451
419 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 456 $job->[2]->send;
423 Coro::cede; 457 Coro::cede;
424 goto next_job; 458 goto next_job;
425 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 461 }
427 } 462 }
428 463
429 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
430 # 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
431 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 467 $signal->wait;
433 } else { 468 } else {
469 $busy = 0;
434 Coro::schedule; 470 Coro::schedule;
435 } 471 }
436 } 472 }
437}; 473};
438 474
439sub get_slot($;$$) { 475sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
441 477
442 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
443 479
444 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
445 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
446 483
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
476 513
477sub sync_job(&) { 514sub sync_job(&) {
478 my ($job) = @_; 515 my ($job) = @_;
479 516
480 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
481 my $time = EV::time; 518 my $time = AE::time;
482 519
483 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
485 522
486 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
503 } else { 540 } else {
504 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
505 } 542 }
506 } 543 }
507 544
508 my $time = EV::time - $time; 545 my $time = AE::time - $time;
509 546
510 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
511 548
512 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
513 } else { 550 } else {
… …
557 reset_signals; 594 reset_signals;
558 &$cb 595 &$cb
559 }, @args; 596 }, @args;
560 597
561 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 )
562} 610}
563 611
564=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
565 613
566=cut 614=cut
… …
1147 1195
1148 sync_job { 1196 sync_job {
1149 if (length $$rdata) { 1197 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1153 1202
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1214 $av = $st->{objs}; 1263 $av = $st->{objs};
1215 } 1264 }
1216 1265
1217 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1220 1270
1221 ($data, $av) 1271 ($data, $av)
1222} 1272}
1223 1273
1224=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1283} 1333}
1284 1334
1285use File::Glob (); 1335use File::Glob ();
1286 1336
1287cf::player->attach ( 1337cf::player->attach (
1288 on_command => sub { 1338 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1290 1340
1291 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1292 or return; 1342 or return;
1293 1343
… …
1372 . "\n};\n1"; 1422 . "\n};\n1";
1373 1423
1374 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1375 } 1425 }
1376 1426
1427 my $pass = 0;
1377 my %done; 1428 my %done;
1378 while (%todo) { 1429 while (%todo) {
1379 my $progress; 1430 my $progress;
1380 1431
1432 ++$pass;
1433
1434 ext:
1381 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1437 next ext
1384 unless exists $done{$_}; 1438 unless exists $done{$_};
1385 } 1439 }
1386 1440
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1442
1389 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1447
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1449 if exists $v->{meta}{mandatory};
1397 1450
1398 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;
1399 } 1460 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1461 }
1405 1462
1406 skip: 1463 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 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 }
1409 } 1471 }
1410 }; 1472 };
1411} 1473}
1412 1474
1413############################################################################# 1475#############################################################################
… …
1497 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1498 } 1560 }
1499 } 1561 }
1500} 1562}
1501 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
1502sub save($) { 1577sub save($) {
1503 my ($pl) = @_; 1578 my ($pl) = @_;
1504 1579
1505 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1506 1581
… …
1511 1586
1512 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1514 1589
1515 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];
1516 1594
1517 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1596 cf::cede_to_tick;
1519} 1597}
1520 1598
… …
1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1558 1636
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1560 $pl->deactivate; 1638 $pl->deactivate;
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1564 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1565 1642
1566 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1622 \@logins 1699 \@logins
1623} 1700}
1624 1701
1625=item $player->maps 1702=item $player->maps
1626 1703
1704=item cf::player::maps $login
1705
1627Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1628player. May block. 1707player. May block.
1629 1708
1630=cut 1709=cut
1631 1710
… …
1693=cut 1772=cut
1694 1773
1695sub find_by_path($) { 1774sub find_by_path($) {
1696 my ($path) = @_; 1775 my ($path) = @_;
1697 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1698 my ($match, $specificity); 1779 my ($match, $specificity);
1699 1780
1700 for my $region (list) { 1781 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734 1815
1735 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1817 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1765 1846
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1848}
1768 1849
1769# also paths starting with '/' 1850# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1852
1772sub thawer_merge { 1853sub thawer_merge {
1773 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1774 1855
1775 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
1989 2070
1990 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1991 } 2072 }
1992} 2073}
1993 2074
1994sub pre_load { } 2075sub pre_load { }
1995sub post_load { } 2076#sub post_load { } # XS
1996 2077
1997sub load { 2078sub load {
1998 my ($self) = @_; 2079 my ($self) = @_;
1999 2080
2000 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
… …
2057 } 2138 }
2058 2139
2059 $self->post_load; 2140 $self->post_load;
2060} 2141}
2061 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2062sub customise_for { 2146sub customise_for {
2063 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2064 2148
2065 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2150 if $self->per_player;
… …
2082 or next; 2166 or next;
2083 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2084 or next; 2168 or next;
2085 $neigh->load; 2169 $neigh->load;
2086 2170
2171 # now find the diagonal neighbours
2087 push @neigh, 2172 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2175 }
2091 2176
… …
2143 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2144 2229
2145 () 2230 ()
2146} 2231}
2147 2232
2233# common code, used by both ->save and ->swapout
2148sub save { 2234sub _save {
2149 my ($self) = @_; 2235 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2236
2153 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2154 2238
2155 return unless $self->dirty; 2239 return unless $self->dirty;
2156 2240
… …
2176 } else { 2260 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2262 }
2179} 2263}
2180 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2181sub swap_out { 2273sub swap_out {
2182 my ($self) = @_; 2274 my ($self) = @_;
2183 2275
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2277
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2192 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2194 2332
2195 $self->deactivate; 2333 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2335 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path, "\n";
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2336
2243 $self->unlink_save; 2337 $self->unlink_save;
2244 $self->destroy; 2338 $self->destroy;
2245} 2339}
2246 2340
… …
2254 2348
2255 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2256 2350
2257 $self->unlink_save; 2351 $self->unlink_save;
2258 2352
2259 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2358
… …
2321 : normalise $_ 2415 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2417 ]
2324} 2418}
2325 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2326=back 2452=back
2327 2453
2328=head3 cf::object 2454=head3 cf::object
2329 2455
2330=cut 2456=cut
… …
2462 2588
2463Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2464 2590
2465The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2468map. 2594map.
2469 2595
2470Will never block. 2596Will never block.
2471 2597
2472=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2493sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2494 my ($self) = @_; 2620 my ($self) = @_;
2495 2621
2496 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2497 2623
2624 ++$self->{_link_recursion};
2625
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2627
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2502 2630
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2632}
2505 2633
2506sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2508 2636
… …
2525 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2527 2655
2528 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2531 2659
2532 $map->load; 2660 $map->load;
2533 $map->load_neighbours; 2661 $map->load_neighbours;
2534 2662
2535 return unless $self->contr->active; 2663 return unless $self->contr->active;
2536 2664
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2539 2667 # entering was successful
2668 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2670 $self->activate_recursive;
2542} 2671 }
2543 2672
2673}
2674
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2676
2546Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2549the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
… …
2556 2687
2557our $GOTOGEN; 2688our $GOTOGEN;
2558 2689
2559sub cf::object::player::goto { 2690sub cf::object::player::goto {
2560 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2561 2698
2562 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2701
2565 $self->enter_link; 2702 $self->enter_link;
… …
2589 my $map = eval { 2726 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2591 2728
2592 if ($map) { 2729 if ($map) {
2593 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2732 } else {
2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2597 } 2734 }
2598 2735
2599 $map 2736 $map
… …
2607 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2610 } 2747 }
2611 2748
2612 $done->() if $done; 2749 $done->($self) if $done;
2613 })->prio (1); 2750 })->prio (1);
2614} 2751}
2615 2752
2616=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2617 2754
… …
2734 2871
2735 utf8::encode $text; 2872 utf8::encode $text;
2736 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2737} 2874}
2738 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2902
2741Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2742client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2743the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2745 2907
2746=cut 2908=cut
2747 2909
2748# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2750 "c/identify" => { 2918 "c/identify" => {
2751 id => "infobox", 2919 id => "infobox",
2752 title => "Identify", 2920 title => "Identify",
2753 reply => undef, 2921 reply => undef,
2754 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
… …
2756 "c/examine" => { 2924 "c/examine" => {
2757 id => "infobox", 2925 id => "infobox",
2758 title => "Examine", 2926 title => "Examine",
2759 reply => undef, 2927 reply => undef,
2760 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2761 }, 2935 },
2762 "c/book" => { 2936 "c/book" => {
2763 id => "infobox", 2937 id => "infobox",
2764 title => "Book", 2938 title => "Book",
2765 reply => undef, 2939 reply => undef,
… …
2881 my $pkt = "msg " 3055 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3058 );
2885 3059
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2897} 3061}
2898 3062
2899=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2900 3064
2901Sends an ext event to the client. 3065Sends an ext event to the client.
… …
2904 3068
2905sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2907 3071
2908 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3077 }
2914} 3078}
2915 3079
2916=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2917 3081
… …
2921 3085
2922sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2924 3088
2925 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3092 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3095 }
2932} 3096}
2933 3097
2934=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2935 3099
… …
3036 3200
3037 $coro 3201 $coro
3038} 3202}
3039 3203
3040cf::client->attach ( 3204cf::client->attach (
3041 on_destroy => sub { 3205 on_client_destroy => sub {
3042 my ($ns) = @_; 3206 my ($ns) = @_;
3043 3207
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3209 },
3046); 3210);
… …
3062our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3063 3227
3064$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3065 3229
3066$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3069 sort time 3233 sort time
3070)); 3234));
3071 3235
3072# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
… …
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3126 3290
3127 %vars = (_dummy => 0) unless %vars; 3291 %vars = (_dummy => 0) unless %vars;
3128 3292
3293 my @res;
3129 local $_; 3294 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3295
3132 my $eval = 3296 my $eval =
3133 "do {\n" 3297 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3300 . $code
3137 . "\n}" 3301 . "\n}"
3138 ; 3302 ;
3139 3303
3304 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3143 3313
3144 if ($@) { 3314 if ($@) {
3145 warn "$@"; 3315 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
… …
3166=cut 3336=cut
3167 3337
3168sub register_script_function { 3338sub register_script_function {
3169 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3170 3340
3171 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3173} 3343}
3174 3344
3175=back 3345=back
3176 3346
3177=cut 3347=cut
… …
3198 3368
3199 $facedata->{version} == 2 3369 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3371
3202 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3375 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3378 };
3207 cf::cede_to_tick; 3379 cf::cede_to_tick;
3208 3380
3209 { 3381 {
3210 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3386
3215 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3391
3220 cf::cede_to_tick; 3392 cf::cede_to_tick;
3221 } 3393 }
3222 3394
3223 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
… …
3247 3419
3248 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3249 } 3421 }
3250 3422
3251 { 3423 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3255 3425
3256 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3429
3261 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3276 } else { 3432 } else {
3277 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3278 } 3434 }
3279 3435
3280 cf::cede_to_tick; 3436 cf::cede_to_tick;
3281 } 3437 }
3282 } 3438 }
3283 3439
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3441
3286 1 3442 1
3287} 3443}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3444
3309register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3311 3447
3312 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
… …
3351sub reload_treasures { 3487sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3354} 3490}
3355 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3356sub reload_resources { 3515sub reload_resources {
3357 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3358 3517
3359 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3360 reload_archetypes; 3520 reload_archetypes;
3361 reload_regions; 3521 reload_regions;
3362 reload_treasures; 3522 reload_treasures;
3363 3523
3364 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3365} 3525}
3366 3526
3367sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3531 or return;
3370 3532
3371 local $/; 3533 local $/;
3372 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3373 3535
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3537
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3540
3379 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
… …
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3545 };
3384 warn $@ if $@; 3546 warn $@ if $@;
3385 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3386} 3550}
3387 3551
3388sub pidfile() { 3552sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3554 or die "$PIDFILE: $!";
… …
3418 3582
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3587
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430 3589
3431 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
… …
3438 }; 3597 };
3439 3598
3440 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3441 3600
3442 cf::sync_job { 3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3443 reload_resources; 3610 reload_resources;
3444 reload_config; 3611 reload_config;
3445 db_init; 3612 db_init;
3446 3613
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3614 cf::init_uuid;
3450 cf::init_signals; 3615 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3616 cf::init_skills;
3453 3617
3454 cf::init_beforeplay; 3618 cf::init_beforeplay;
3455 3619
3456 atomic; 3620 atomic;
… …
3463 use POSIX (); 3627 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465 3629
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 3631 };
3632
3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3468 3635
3469 main_loop; 3636 main_loop;
3470} 3637}
3471 3638
3472############################################################################# 3639#############################################################################
… …
3474 3641
3475# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3476BEGIN { 3643BEGIN {
3477 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3481 }; 3648 };
3482 } 3649 }
3483} 3650}
3484 3651
3485sub write_runtime_sync { 3652sub write_runtime_sync {
3653 my $t0 = AE::time;
3654
3486 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3488 3657
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3659
3491 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3492 3661
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3663 or return;
3495 3664
3496 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
… …
3511 or return; 3680 or return;
3512 3681
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3683 and return;
3515 3684
3516 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3686
3518 1 3687 1
3519} 3688}
3520 3689
3521our $uuid_lock; 3690our $uuid_lock;
… …
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3820 }
3652 warn "cleared package $pkg\n";#d#
3653} 3821}
3654 3822
3655sub do_reload_perl() { 3823sub do_reload_perl() {
3656 # can/must only be called in main 3824 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3658 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3659 return; 3827 return;
3660 } 3828 }
3661 3829
3662 return if $RELOAD++; 3830 return if $RELOAD++;
3663 3831
3664 my $t1 = EV::time; 3832 my $t1 = AE::time;
3665 3833
3666 while ($RELOAD) { 3834 while ($RELOAD) {
3667 warn "reloading..."; 3835 warn "reloading...";
3668 3836
3669 warn "entering sync_job"; 3837 warn "entering sync_job";
… …
3740 3908
3741 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3742 3910
3743 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3744 require cf; 3912 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3746 3914
3747 warn "loading config and database again"; 3915 warn "loading config and database again";
3748 cf::reload_config; 3916 cf::reload_config;
3749 3917
3750 warn "loading extensions"; 3918 warn "loading extensions";
… …
3772 3940
3773 warn "reloaded"; 3941 warn "reloaded";
3774 --$RELOAD; 3942 --$RELOAD;
3775 } 3943 }
3776 3944
3777 $t1 = EV::time - $t1; 3945 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 3946 warn "reload completed in ${t1}s\n";
3779}; 3947};
3780 3948
3781our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3782 3950
… …
3785 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3786 3954
3787 $RELOAD_WATCHER ||= cf::async { 3955 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 3956 Coro::AIO::aio_wait cache_extensions;
3789 3957
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 3959 do_reload_perl;
3792 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3793 }; 3961 };
3794 }; 3962 };
3795} 3963}
… …
3812 3980
3813our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3815 3983
3816sub wait_for_tick { 3984sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 3986
3819 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 3989 $signal->wait;
3822} 3990}
3823 3991
3824sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 3994
3827 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 3997 $signal->wait;
3830} 3998}
… …
3835 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3836 return; 4004 return;
3837 } 4005 }
3838 4006
3839 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3840 4010
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3843 Coro::async_pool { 4013 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
… …
3867} 4037}
3868 4038
3869{ 4039{
3870 # configure BDB 4040 # configure BDB
3871 4041
3872 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3875 4045
3876 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
… …
3958 } 4128 }
3959} 4129}
3960 4130
3961# load additional modules 4131# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3963 4134
3964END { cf::emergency_save } 4135END { cf::emergency_save }
3965 4136
39661 41371
3967 4138

Diff Legend

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