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.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
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
… …
1622 \@logins 1700 \@logins
1623} 1701}
1624 1702
1625=item $player->maps 1703=item $player->maps
1626 1704
1705=item cf::player::maps $login
1706
1627Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1628player. May block. 1708player. May block.
1629 1709
1630=cut 1710=cut
1631 1711
… …
1693=cut 1773=cut
1694 1774
1695sub find_by_path($) { 1775sub find_by_path($) {
1696 my ($path) = @_; 1776 my ($path) = @_;
1697 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1698 my ($match, $specificity); 1780 my ($match, $specificity);
1699 1781
1700 for my $region (list) { 1782 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
… …
1733 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
1734 1816
1735 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1818 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1765 1847
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1849}
1768 1850
1769# also paths starting with '/' 1851# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1853
1772sub thawer_merge { 1854sub thawer_merge {
1773 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1774 1856
1775 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
1989 2071
1990 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1991 } 2073 }
1992} 2074}
1993 2075
1994sub pre_load { } 2076sub pre_load { }
1995sub post_load { } 2077#sub post_load { } # XS
1996 2078
1997sub load { 2079sub load {
1998 my ($self) = @_; 2080 my ($self) = @_;
1999 2081
2000 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
… …
2057 } 2139 }
2058 2140
2059 $self->post_load; 2141 $self->post_load;
2060} 2142}
2061 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
2062sub customise_for { 2147sub customise_for {
2063 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2064 2149
2065 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2151 if $self->per_player;
… …
2082 or next; 2167 or next;
2083 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2084 or next; 2169 or next;
2085 $neigh->load; 2170 $neigh->load;
2086 2171
2172 # now find the diagonal neighbours
2087 push @neigh, 2173 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2176 }
2091 2177
… …
2143 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2144 2230
2145 () 2231 ()
2146} 2232}
2147 2233
2234# common code, used by both ->save and ->swapout
2148sub save { 2235sub _save {
2149 my ($self) = @_; 2236 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2237
2153 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2154 2239
2155 return unless $self->dirty; 2240 return unless $self->dirty;
2156 2241
… …
2176 } else { 2261 } else {
2177 $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);
2178 } 2263 }
2179} 2264}
2180 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2181sub swap_out { 2274sub swap_out {
2182 my ($self) = @_; 2275 my ($self) = @_;
2183 2276
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2278
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2192 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2193 $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};
2194 2333
2195 $self->deactivate; 2334 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2336 $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 2337
2243 $self->unlink_save; 2338 $self->unlink_save;
2244 $self->destroy; 2339 $self->destroy;
2245} 2340}
2246 2341
… …
2254 2349
2255 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2256 2351
2257 $self->unlink_save; 2352 $self->unlink_save;
2258 2353
2259 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2359
… …
2321 : normalise $_ 2416 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2418 ]
2324} 2419}
2325 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
2326=back 2453=back
2327 2454
2328=head3 cf::object 2455=head3 cf::object
2329 2456
2330=cut 2457=cut
… …
2462 2589
2463Freezes 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}>).
2464 2591
2465The 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.
2466for 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,
2467though, 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
2468map. 2595map.
2469 2596
2470Will never block. 2597Will never block.
2471 2598
2472=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2493sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2494 my ($self) = @_; 2621 my ($self) = @_;
2495 2622
2496 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2497 2624
2625 ++$self->{_link_recursion};
2626
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2628
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2502 2631
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2633}
2505 2634
2506sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2508 2637
… …
2525 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2527 2656
2528 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2531 2660
2532 $map->load; 2661 $map->load;
2533 $map->load_neighbours; 2662 $map->load_neighbours;
2534 2663
2535 return unless $self->contr->active; 2664 return unless $self->contr->active;
2536 2665
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2539 2668 # entering was successful
2669 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2671 $self->activate_recursive;
2542} 2672 }
2543 2673
2674}
2675
2544=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)]])
2545 2677
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
… …
2556 2688
2557our $GOTOGEN; 2689our $GOTOGEN;
2558 2690
2559sub cf::object::player::goto { 2691sub cf::object::player::goto {
2560 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 }
2561 2699
2562 # 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
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2702
2565 $self->enter_link; 2703 $self->enter_link;
… …
2589 my $map = eval { 2727 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2591 2729
2592 if ($map) { 2730 if ($map) {
2593 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2733 } else {
2596 $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);
2597 } 2735 }
2598 2736
2599 $map 2737 $map
… …
2607 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2610 } 2748 }
2611 2749
2612 $done->() if $done; 2750 $done->($self) if $done;
2613 })->prio (1); 2751 })->prio (1);
2614} 2752}
2615 2753
2616=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2617 2755
… …
2734 2872
2735 utf8::encode $text; 2873 utf8::encode $text;
2736 $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);
2737} 2875}
2738 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
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2903
2741Send 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
2742client 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
2743the 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
… …
2745 2908
2746=cut 2909=cut
2747 2910
2748# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2750 "c/identify" => { 2919 "c/identify" => {
2751 id => "infobox", 2920 id => "infobox",
2752 title => "Identify", 2921 title => "Identify",
2753 reply => undef, 2922 reply => undef,
2754 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
… …
2756 "c/examine" => { 2925 "c/examine" => {
2757 id => "infobox", 2926 id => "infobox",
2758 title => "Examine", 2927 title => "Examine",
2759 reply => undef, 2928 reply => undef,
2760 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",
2761 }, 2936 },
2762 "c/book" => { 2937 "c/book" => {
2763 id => "infobox", 2938 id => "infobox",
2764 title => "Book", 2939 title => "Book",
2765 reply => undef, 2940 reply => undef,
… …
2881 my $pkt = "msg " 3056 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3059 );
2885 3060
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); 3061 $self->send_big_packet ($pkt);
2897} 3062}
2898 3063
2899=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2900 3065
2901Sends an ext event to the client. 3066Sends an ext event to the client.
… …
2904 3069
2905sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2907 3072
2908 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3078 }
2914} 3079}
2915 3080
2916=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2917 3082
… …
2921 3086
2922sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2924 3089
2925 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3093 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3096 }
2932} 3097}
2933 3098
2934=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2935 3100
… …
3036 3201
3037 $coro 3202 $coro
3038} 3203}
3039 3204
3040cf::client->attach ( 3205cf::client->attach (
3041 on_destroy => sub { 3206 on_client_destroy => sub {
3042 my ($ns) = @_; 3207 my ($ns) = @_;
3043 3208
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3210 },
3046); 3211);
… …
3062our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3063 3228
3064$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3065 3230
3066$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3069 sort time 3234 sort time
3070)); 3235));
3071 3236
3072# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
… …
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3126 3291
3127 %vars = (_dummy => 0) unless %vars; 3292 %vars = (_dummy => 0) unless %vars;
3128 3293
3294 my @res;
3129 local $_; 3295 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3296
3132 my $eval = 3297 my $eval =
3133 "do {\n" 3298 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3301 . $code
3137 . "\n}" 3302 . "\n}"
3138 ; 3303 ;
3139 3304
3305 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3314
3144 if ($@) { 3315 if ($@) {
3145 warn "$@"; 3316 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
… …
3166=cut 3337=cut
3167 3338
3168sub register_script_function { 3339sub register_script_function {
3169 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3170 3341
3171 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3173} 3344}
3174 3345
3175=back 3346=back
3176 3347
3177=cut 3348=cut
… …
3198 3369
3199 $facedata->{version} == 2 3370 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3372
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3376 type => FT_RSRC,
3205 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),
3206 }; 3379 };
3207 cf::cede_to_tick; 3380 cf::cede_to_tick;
3208 3381
3209 { 3382 {
3210 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3387
3215 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3392
3220 cf::cede_to_tick; 3393 cf::cede_to_tick;
3221 } 3394 }
3222 3395
3223 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
… …
3247 3420
3248 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3249 } 3422 }
3250 3423
3251 { 3424 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3255 3426
3256 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3430
3261 if ($info->{type} & 1) { 3431 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}; 3432 cf::face::set_type $idx, $info->{type};
3276 } else { 3433 } else {
3277 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3278 } 3435 }
3279 3436
… …
3363 3520
3364 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3365} 3522}
3366 3523
3367sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3528 or return;
3370 3529
3371 local $/; 3530 local $/;
3372 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3373 3532
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3534
3376 $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};
3377 $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};
3378 3537
3379 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3542 };
3384 warn $@ if $@; 3543 warn $@ if $@;
3385 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3386} 3547}
3387 3548
3388sub pidfile() { 3549sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3551 or die "$PIDFILE: $!";
… …
3418 3579
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 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.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 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 3584
3429 $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
3430 3586
3431 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3438 }; 3594 };
3439 3595
3440 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3441 3597
3442 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
3443 reload_resources; 3607 reload_resources;
3444 reload_config; 3608 reload_config;
3445 db_init; 3609 db_init;
3446 3610
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3611 cf::init_uuid;
3450 cf::init_signals; 3612 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3613 cf::init_skills;
3453 3614
3454 cf::init_beforeplay; 3615 cf::init_beforeplay;
3455 3616
3456 atomic; 3617 atomic;
… …
3463 use POSIX (); 3624 use POSIX ();
3464 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};
3465 3626
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 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";
3468 3632
3469 main_loop; 3633 main_loop;
3470} 3634}
3471 3635
3472############################################################################# 3636#############################################################################
… …
3474 3638
3475# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3476BEGIN { 3640BEGIN {
3477 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3481 }; 3645 };
3482 } 3646 }
3483} 3647}
3484 3648
3485sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3486 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3488 3654
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3656
3491 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3492 3658
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3660 or return;
3495 3661
3496 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
… …
3511 or return; 3677 or return;
3512 3678
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3680 and return;
3515 3681
3516 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3683
3518 1 3684 1
3519} 3685}
3520 3686
3521our $uuid_lock; 3687our $uuid_lock;
… …
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3817 }
3652 warn "cleared package $pkg\n";#d#
3653} 3818}
3654 3819
3655sub do_reload_perl() { 3820sub do_reload_perl() {
3656 # can/must only be called in main 3821 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3658 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3659 return; 3824 return;
3660 } 3825 }
3661 3826
3662 return if $RELOAD++; 3827 return if $RELOAD++;
3663 3828
3664 my $t1 = EV::time; 3829 my $t1 = AE::time;
3665 3830
3666 while ($RELOAD) { 3831 while ($RELOAD) {
3667 warn "reloading..."; 3832 warn "reloading...";
3668 3833
3669 warn "entering sync_job"; 3834 warn "entering sync_job";
… …
3740 3905
3741 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3742 3907
3743 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3744 require cf; 3909 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3746 3911
3747 warn "loading config and database again"; 3912 warn "loading config and database again";
3748 cf::reload_config; 3913 cf::reload_config;
3749 3914
3750 warn "loading extensions"; 3915 warn "loading extensions";
… …
3772 3937
3773 warn "reloaded"; 3938 warn "reloaded";
3774 --$RELOAD; 3939 --$RELOAD;
3775 } 3940 }
3776 3941
3777 $t1 = EV::time - $t1; 3942 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 3943 warn "reload completed in ${t1}s\n";
3779}; 3944};
3780 3945
3781our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3782 3947
… …
3785 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3786 3951
3787 $RELOAD_WATCHER ||= cf::async { 3952 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 3953 Coro::AIO::aio_wait cache_extensions;
3789 3954
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 3956 do_reload_perl;
3792 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3793 }; 3958 };
3794 }; 3959 };
3795} 3960}
… …
3812 3977
3813our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3815 3980
3816sub wait_for_tick { 3981sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 3983
3819 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 3986 $signal->wait;
3822} 3987}
3823 3988
3824sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 3991
3827 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 3994 $signal->wait;
3830} 3995}
… …
3835 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3836 return; 4001 return;
3837 } 4002 }
3838 4003
3839 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#
3840 4007
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $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.;
3843 Coro::async_pool { 4010 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
… …
3867} 4034}
3868 4035
3869{ 4036{
3870 # configure BDB 4037 # configure BDB
3871 4038
3872 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3875 4042
3876 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
… …
3958 } 4125 }
3959} 4126}
3960 4127
3961# load additional modules 4128# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3963 4131
3964END { cf::emergency_save } 4132END { cf::emergency_save }
3965 4133
39661 41341
3967 4135

Diff Legend

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