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

Diff Legend

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