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.489 by root, Fri Oct 23 03:08:35 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
32use EV; 32use EV;
33use Opcode; 33use Opcode;
34use Safe; 34use Safe;
35use Safe::Hole; 35use Safe::Hole;
36use Storable (); 36use Storable ();
37use Carp ();
37 38
38use Guard (); 39use Guard ();
39use Coro (); 40use Coro ();
40use Coro::State; 41use Coro::State;
41use Coro::Handle; 42use Coro::Handle;
… …
52use Coro::Util (); 53use Coro::Util ();
53 54
54use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
55use BDB (); 56use BDB ();
56use Data::Dumper; 57use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 58use Fcntl;
59use YAML::XS (); 59use YAML::XS ();
60use IO::AIO (); 60use IO::AIO ();
61use Time::HiRes; 61use Time::HiRes;
62use Compress::LZF; 62use Compress::LZF;
… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 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
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
117 123
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
260 270
261 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
262 272
263 if ($Coro::current == $Coro::main) {#d# 273 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 275 return;#d#
266 }#d# 276 }#d#
267 277
268 # kill coroutine otherwise 278 # kill coroutine otherwise
… …
289)) { 299)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 301}
292 302
293$EV::DIED = sub { 303$EV::DIED = sub {
294 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
295}; 305};
296 306
297############################################################################# 307#############################################################################
298 308
299=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
396} 406}
397 407
398=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
399 409
400Like 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
401get spread over timer. 411get spread over time.
402 412
403=cut 413=cut
404 414
405sub periodic($$) { 415sub periodic($$) {
406 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
423 433
424=cut 434=cut
425 435
426our @SLOT_QUEUE; 436our @SLOT_QUEUE;
427our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
428 439
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
432 443
433 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
434 446
435 while () { 447 while () {
436 next_job: 448 next_job:
449
437 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 451
439 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 456 $job->[2]->send;
443 Coro::cede; 457 Coro::cede;
444 goto next_job; 458 goto next_job;
445 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 461 }
447 } 462 }
448 463
449 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 467 $signal->wait;
453 } else { 468 } else {
469 $busy = 0;
454 Coro::schedule; 470 Coro::schedule;
455 } 471 }
456 } 472 }
457}; 473};
458 474
459sub get_slot($;$$) { 475sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
461 477
462 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
463 479
464 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
465 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
466 483
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
496 513
497sub sync_job(&) { 514sub sync_job(&) {
498 my ($job) = @_; 515 my ($job) = @_;
499 516
500 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 518 my $time = AE::time;
502 519
503 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
505 522
506 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 540 } else {
524 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
525 } 542 }
526 } 543 }
527 544
528 my $time = EV::time - $time; 545 my $time = AE::time - $time;
529 546
530 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
531 548
532 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
533 } else { 550 } else {
… …
577 reset_signals; 594 reset_signals;
578 &$cb 595 &$cb
579 }, @args; 596 }, @args;
580 597
581 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 )
582} 610}
583 611
584=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
585 613
586=cut 614=cut
… …
1167 1195
1168 sync_job { 1196 sync_job {
1169 if (length $$rdata) { 1197 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1173 1202
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1234 $av = $st->{objs}; 1263 $av = $st->{objs};
1235 } 1264 }
1236 1265
1237 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1240 1270
1241 ($data, $av) 1271 ($data, $av)
1242} 1272}
1243 1273
1244=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1303} 1333}
1304 1334
1305use File::Glob (); 1335use File::Glob ();
1306 1336
1307cf::player->attach ( 1337cf::player->attach (
1308 on_command => sub { 1338 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1310 1340
1311 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1312 or return; 1342 or return;
1313 1343
… …
1392 . "\n};\n1"; 1422 . "\n};\n1";
1393 1423
1394 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1395 } 1425 }
1396 1426
1427 my $pass = 0;
1397 my %done; 1428 my %done;
1398 while (%todo) { 1429 while (%todo) {
1399 my $progress; 1430 my $progress;
1400 1431
1432 ++$pass;
1433
1434 ext:
1401 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1437 next ext
1404 unless exists $done{$_}; 1438 unless exists $done{$_};
1405 } 1439 }
1406 1440
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1442
1409 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1447
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1449 if exists $v->{meta}{mandatory};
1417 1450
1418 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;
1419 } 1460 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1461 }
1425 1462
1426 skip: 1463 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 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 }
1429 } 1471 }
1430 }; 1472 };
1431} 1473}
1432 1474
1433############################################################################# 1475#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1518 } 1560 }
1519 } 1561 }
1520} 1562}
1521 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
1522sub save($) { 1577sub save($) {
1523 my ($pl) = @_; 1578 my ($pl) = @_;
1524 1579
1525 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1526 1581
… …
1531 1586
1532 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1534 1589
1535 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];
1536 1594
1537 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1596 cf::cede_to_tick;
1539} 1597}
1540 1598
… …
1577 $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
1578 1636
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580 $pl->deactivate; 1638 $pl->deactivate;
1581 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;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1584 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1585 1642
1586 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1642 \@logins 1699 \@logins
1643} 1700}
1644 1701
1645=item $player->maps 1702=item $player->maps
1646 1703
1704=item cf::player::maps $login
1705
1647Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1648player. May block. 1707player. May block.
1649 1708
1650=cut 1709=cut
1651 1710
… …
1713=cut 1772=cut
1714 1773
1715sub find_by_path($) { 1774sub find_by_path($) {
1716 my ($path) = @_; 1775 my ($path) = @_;
1717 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1718 my ($match, $specificity); 1779 my ($match, $specificity);
1719 1780
1720 for my $region (list) { 1781 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1753 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
1754 1815
1755 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1817 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1846
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1848}
1788 1849
1789# also paths starting with '/' 1850# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1852
1792sub thawer_merge { 1853sub thawer_merge {
1793 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1794 1855
1795 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
2009 2070
2010 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2011 } 2072 }
2012} 2073}
2013 2074
2014sub pre_load { } 2075sub pre_load { }
2015sub post_load { } 2076#sub post_load { } # XS
2016 2077
2017sub load { 2078sub load {
2018 my ($self) = @_; 2079 my ($self) = @_;
2019 2080
2020 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2138 }
2078 2139
2079 $self->post_load; 2140 $self->post_load;
2080} 2141}
2081 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
2082sub customise_for { 2146sub customise_for {
2083 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2084 2148
2085 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2150 if $self->per_player;
… …
2102 or next; 2166 or next;
2103 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2104 or next; 2168 or next;
2105 $neigh->load; 2169 $neigh->load;
2106 2170
2171 # now find the diagonal neighbours
2107 push @neigh, 2172 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2175 }
2111 2176
… …
2163 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2164 2229
2165 () 2230 ()
2166} 2231}
2167 2232
2233# common code, used by both ->save and ->swapout
2168sub save { 2234sub _save {
2169 my ($self) = @_; 2235 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2236
2173 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2174 2238
2175 return unless $self->dirty; 2239 return unless $self->dirty;
2176 2240
… …
2196 } else { 2260 } else {
2197 $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);
2198 } 2262 }
2199} 2263}
2200 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2201sub swap_out { 2273sub swap_out {
2202 my ($self) = @_; 2274 my ($self) = @_;
2203 2275
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2277
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2212 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2213 $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};
2214 2332
2215 $self->deactivate; 2333 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2335 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2336
2263 $self->unlink_save; 2337 $self->unlink_save;
2264 $self->destroy; 2338 $self->destroy;
2265} 2339}
2266 2340
… …
2274 2348
2275 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2276 2350
2277 $self->unlink_save; 2351 $self->unlink_save;
2278 2352
2279 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2358
… …
2344} 2418}
2345 2419
2346=item cf::map::static_maps 2420=item cf::map::static_maps
2347 2421
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map> 2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory). May block. 2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2350 2425
2351=cut 2426=cut
2352 2427
2353sub static_maps() { 2428sub static_maps() {
2354 my @dirs = ""; 2429 my @dirs = "";
2355 my @maps; 2430 my @maps;
2356 2431
2357 while (@dirs) { 2432 while (@dirs) {
2358 my $dir = shift @dirs; 2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2359 2436
2360 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2361 or return; 2438 or return;
2362 2439
2363 for (@$files) { 2440 for (@$files) {
… …
2511 2588
2512Freezes 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}>).
2513 2590
2514The 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.
2515for 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,
2516though, 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
2517map. 2594map.
2518 2595
2519Will never block. 2596Will never block.
2520 2597
2521=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2542sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2543 my ($self) = @_; 2620 my ($self) = @_;
2544 2621
2545 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2546 2623
2624 ++$self->{_link_recursion};
2625
2547 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2548 2627
2549 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2550 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2551 2630
2552 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2553} 2632}
2554 2633
2555sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2556 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2557 2636
… …
2574 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2575 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2576 2655
2577 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2578 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2579 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2580 2659
2581 $map->load; 2660 $map->load;
2582 $map->load_neighbours; 2661 $map->load_neighbours;
2583 2662
2584 return unless $self->contr->active; 2663 return unless $self->contr->active;
2585 2664
2586 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2587 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2588 2667 # entering was successful
2668 delete $self->{_link_recursion};
2589 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2590 $self->activate_recursive; 2670 $self->activate_recursive;
2591} 2671 }
2592 2672
2673}
2674
2593=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)]])
2594 2676
2595Moves 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
2596her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2597that 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
2598the 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
… …
2605 2687
2606our $GOTOGEN; 2688our $GOTOGEN;
2607 2689
2608sub cf::object::player::goto { 2690sub cf::object::player::goto {
2609 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 }
2610 2698
2611 # 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
2612 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2613 2701
2614 $self->enter_link; 2702 $self->enter_link;
… …
2638 my $map = eval { 2726 my $map = eval {
2639 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2640 2728
2641 if ($map) { 2729 if ($map) {
2642 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2643 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2644 } else { 2732 } else {
2645 $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);
2646 } 2734 }
2647 2735
2648 $map 2736 $map
… …
2656 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2657 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2658 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2659 } 2747 }
2660 2748
2661 $done->() if $done; 2749 $done->($self) if $done;
2662 })->prio (1); 2750 })->prio (1);
2663} 2751}
2664 2752
2665=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2666 2754
… …
2781sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2782 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2783 2871
2784 utf8::encode $text; 2872 utf8::encode $text;
2785 $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);
2874}
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);
2786} 2899}
2787 2900
2788=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2789 2902
2790Send 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
… …
2942 my $pkt = "msg " 3055 my $pkt = "msg "
2943 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2944 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2945 ); 3058 );
2946 3059
2947 # try lzf for large packets
2948 $pkt = "lzf " . Compress::LZF::compress $pkt
2949 if 1024 <= length $pkt and $self->{can_lzf};
2950
2951 # split very large packets
2952 if (8192 < length $pkt and $self->{can_lzf}) {
2953 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2954 $pkt = "frag";
2955 }
2956
2957 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2958} 3061}
2959 3062
2960=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2961 3064
2962Sends an ext event to the client. 3065Sends an ext event to the client.
… …
2965 3068
2966sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2967 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2968 3071
2969 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2971 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2972 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2974 } 3077 }
2975} 3078}
2976 3079
2977=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2978 3081
… …
2982 3085
2983sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2984 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2985 3088
2986 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2987 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2988 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2989 #TODO: version 1, remove 3092 #TODO: version 1, remove
2990 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2991 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992 } 3095 }
2993} 3096}
2994 3097
2995=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2996 3099
… …
3097 3200
3098 $coro 3201 $coro
3099} 3202}
3100 3203
3101cf::client->attach ( 3204cf::client->attach (
3102 on_destroy => sub { 3205 on_client_destroy => sub {
3103 my ($ns) = @_; 3206 my ($ns) = @_;
3104 3207
3105 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3106 }, 3209 },
3107); 3210);
… …
3123our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3124 3227
3125$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3126 3229
3127$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3128 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3129 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3130 sort time 3233 sort time
3131)); 3234));
3132 3235
3133# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
… …
3185 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3186 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3187 3290
3188 %vars = (_dummy => 0) unless %vars; 3291 %vars = (_dummy => 0) unless %vars;
3189 3292
3293 my @res;
3190 local $_; 3294 local $_;
3191 local @safe::cf::_safe_eval_args = values %vars;
3192 3295
3193 my $eval = 3296 my $eval =
3194 "do {\n" 3297 "do {\n"
3195 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3196 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3197 . $code 3300 . $code
3198 . "\n}" 3301 . "\n}"
3199 ; 3302 ;
3200 3303
3304 if ($CFG{safe_eval}) {
3201 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3202 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3203 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 }
3204 3313
3205 if ($@) { 3314 if ($@) {
3206 warn "$@"; 3315 warn "$@";
3207 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3208 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
… …
3227=cut 3336=cut
3228 3337
3229sub register_script_function { 3338sub register_script_function {
3230 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3231 3340
3232 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3233 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3234} 3343}
3235 3344
3236=back 3345=back
3237 3346
3238=cut 3347=cut
… …
3259 3368
3260 $facedata->{version} == 2 3369 $facedata->{version} == 2
3261 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3262 3371
3263 # 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]);
3264 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3265 type => FT_RSRC, 3375 type => FT_RSRC,
3266 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),
3267 }; 3378 };
3268 cf::cede_to_tick; 3379 cf::cede_to_tick;
3269 3380
3270 { 3381 {
3271 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
… …
3273 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3274 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3275 3386
3276 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3277 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3278 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3279 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3280 3391
3281 cf::cede_to_tick; 3392 cf::cede_to_tick;
3282 } 3393 }
3283 3394
3284 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
… …
3308 3419
3309 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3310 } 3421 }
3311 3422
3312 { 3423 {
3313 # TODO: for gcfclient pleasure, we should give resources
3314 # that gcfclient doesn't grok a >10000 face index.
3315 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3316 3425
3317 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3318 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3319 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3320 my $data;
3321 3429
3322 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3323 # prepend meta info
3324
3325 my $meta = $enc->encode ({
3326 name => $name,
3327 %{ $info->{meta} || {} },
3328 });
3329
3330 $data = pack "(w/a*)*", $meta, $info->{data};
3331 } else {
3332 $data = $info->{data};
3333 }
3334
3335 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3336 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3337 } else { 3432 } else {
3338 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3339 } 3434 }
3340 3435
… …
3432 or return; 3527 or return;
3433 3528
3434 local $/; 3529 local $/;
3435 *CFG = YAML::XS::Load scalar <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3436 3531
3437 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3438 3533
3439 $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};
3440 $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};
3441 3536
3442 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
… …
3483 3578
3484 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3485 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.";
3486 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3487 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3488
3489 cf::init_experience;
3490 cf::init_anim;
3491 cf::init_attackmess;
3492 cf::init_dynamic;
3493 3583
3494 $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
3495 3585
3496 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3497 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
… …
3503 }; 3593 };
3504 3594
3505 evthread_start IO::AIO::poll_fileno; 3595 evthread_start IO::AIO::poll_fileno;
3506 3596
3507 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
3508 reload_resources; 3606 reload_resources;
3509 reload_config; 3607 reload_config;
3510 db_init; 3608 db_init;
3511 3609
3512 cf::load_settings;
3513 cf::load_materials;
3514 cf::init_uuid; 3610 cf::init_uuid;
3515 cf::init_signals; 3611 cf::init_signals;
3516 cf::init_commands;
3517 cf::init_skills; 3612 cf::init_skills;
3518 3613
3519 cf::init_beforeplay; 3614 cf::init_beforeplay;
3520 3615
3521 atomic; 3616 atomic;
… …
3528 use POSIX (); 3623 use POSIX ();
3529 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};
3530 3625
3531 (pop @POST_INIT)->(0) while @POST_INIT; 3626 (pop @POST_INIT)->(0) while @POST_INIT;
3532 }; 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";
3533 3631
3534 main_loop; 3632 main_loop;
3535} 3633}
3536 3634
3537############################################################################# 3635#############################################################################
… …
3539 3637
3540# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3541BEGIN { 3639BEGIN {
3542 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3543 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3544 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3545 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3546 }; 3644 };
3547 } 3645 }
3548} 3646}
3549 3647
3550sub write_runtime_sync { 3648sub write_runtime_sync {
3649 my $t0 = AE::time;
3650
3551 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3552 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3553 3653
3554 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3555 3655
3556 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3557 3657
3558 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3559 or return; 3659 or return;
3560 3660
3561 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3562 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3563 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
… …
3576 or return; 3676 or return;
3577 3677
3578 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3579 and return; 3679 and return;
3580 3680
3581 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3582 3682
3583 1 3683 1
3584} 3684}
3585 3685
3586our $uuid_lock; 3686our $uuid_lock;
… …
3712 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3713 for my $name (keys %$leaf_symtab) { 3813 for my $name (keys %$leaf_symtab) {
3714 _gv_clear *{"$pkg$name"}; 3814 _gv_clear *{"$pkg$name"};
3715# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3716 } 3816 }
3717 warn "cleared package $pkg\n";#d#
3718} 3817}
3719 3818
3720sub do_reload_perl() { 3819sub do_reload_perl() {
3721 # can/must only be called in main 3820 # can/must only be called in main
3722 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3723 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3724 return; 3823 return;
3725 } 3824 }
3726 3825
3727 return if $RELOAD++; 3826 return if $RELOAD++;
3728 3827
3729 my $t1 = EV::time; 3828 my $t1 = AE::time;
3730 3829
3731 while ($RELOAD) { 3830 while ($RELOAD) {
3732 warn "reloading..."; 3831 warn "reloading...";
3733 3832
3734 warn "entering sync_job"; 3833 warn "entering sync_job";
… …
3837 3936
3838 warn "reloaded"; 3937 warn "reloaded";
3839 --$RELOAD; 3938 --$RELOAD;
3840 } 3939 }
3841 3940
3842 $t1 = EV::time - $t1; 3941 $t1 = AE::time - $t1;
3843 warn "reload completed in ${t1}s\n"; 3942 warn "reload completed in ${t1}s\n";
3844}; 3943};
3845 3944
3846our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3847 3946
… …
3850 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3851 3950
3852 $RELOAD_WATCHER ||= cf::async { 3951 $RELOAD_WATCHER ||= cf::async {
3853 Coro::AIO::aio_wait cache_extensions; 3952 Coro::AIO::aio_wait cache_extensions;
3854 3953
3855 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3856 do_reload_perl; 3955 do_reload_perl;
3857 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3858 }; 3957 };
3859 }; 3958 };
3860} 3959}
… …
3877 3976
3878our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3879our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3880 3979
3881sub wait_for_tick { 3980sub wait_for_tick {
3882 return if tick_inhibit || $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3883 3982
3884 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3885 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3886 $signal->wait; 3985 $signal->wait;
3887} 3986}
3888 3987
3889sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3890 return if tick_inhibit || $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3891 3990
3892 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3893 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3894 $signal->wait; 3993 $signal->wait;
3895} 3994}
… …
3900 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3901 return; 4000 return;
3902 } 4001 }
3903 4002
3904 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#
3905 4006
3906 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3907 $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.;
3908 Coro::async_pool { 4009 Coro::async_pool {
3909 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
… …
3932} 4033}
3933 4034
3934{ 4035{
3935 # configure BDB 4036 # configure BDB
3936 4037
3937 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3938 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3939 $AnyEvent::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3940 4041
3941 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3942 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;

Diff Legend

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