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.499 by root, Sun Jan 10 17:43:46 2010 UTC vs.
Revision 1.528 by root, Fri Apr 23 04:42:12 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.
… …
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
… …
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
… …
1642 \@logins 1700 \@logins
1643} 1701}
1644 1702
1645=item $player->maps 1703=item $player->maps
1646 1704
1705=item cf::player::maps $login
1706
1647Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1648player. May block. 1708player. May block.
1649 1709
1650=cut 1710=cut
1651 1711
… …
1713=cut 1773=cut
1714 1774
1715sub find_by_path($) { 1775sub find_by_path($) {
1716 my ($path) = @_; 1776 my ($path) = @_;
1717 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1718 my ($match, $specificity); 1780 my ($match, $specificity);
1719 1781
1720 for my $region (list) { 1782 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1816
1755 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1818 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1847
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1849}
1788 1850
1789# also paths starting with '/' 1851# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1853
1792sub thawer_merge { 1854sub thawer_merge {
1793 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1794 1856
1795 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
2009 2071
2010 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
2011 } 2073 }
2012} 2074}
2013 2075
2014sub pre_load { } 2076sub pre_load { }
2015sub post_load { } 2077#sub post_load { } # XS
2016 2078
2017sub load { 2079sub load {
2018 my ($self) = @_; 2080 my ($self) = @_;
2019 2081
2020 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2139 }
2078 2140
2079 $self->post_load; 2141 $self->post_load;
2080} 2142}
2081 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2082sub customise_for { 2147sub customise_for {
2083 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2084 2149
2085 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2151 if $self->per_player;
… …
2102 or next; 2167 or next;
2103 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2104 or next; 2169 or next;
2105 $neigh->load; 2170 $neigh->load;
2106 2171
2172 # now find the diagonal neighbours
2107 push @neigh, 2173 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2176 }
2111 2177
… …
2163 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2164 2230
2165 () 2231 ()
2166} 2232}
2167 2233
2234# common code, used by both ->save and ->swapout
2168sub save { 2235sub _save {
2169 my ($self) = @_; 2236 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2237
2173 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2174 2239
2175 return unless $self->dirty; 2240 return unless $self->dirty;
2176 2241
… …
2196 } else { 2261 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2263 }
2199} 2264}
2200 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2201sub swap_out { 2274sub swap_out {
2202 my ($self) = @_; 2275 my ($self) = @_;
2203 2276
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2278
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2212 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2214 2333
2215 $self->deactivate; 2334 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2336 $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 2337
2263 $self->unlink_save; 2338 $self->unlink_save;
2264 $self->destroy; 2339 $self->destroy;
2265} 2340}
2266 2341
… …
2274 2349
2275 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2276 2351
2277 $self->unlink_save; 2352 $self->unlink_save;
2278 2353
2279 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2359
… …
2514 2589
2515Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2516 2591
2517The player should be reasonably safe there for short amounts of time (e.g. 2592The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2594though, as the player cannot control the character while it is on the link
2520map. 2595map.
2521 2596
2522Will never block. 2597Will never block.
2523 2598
2524=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2546 my ($self) = @_; 2621 my ($self) = @_;
2547 2622
2548 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2549 2624
2625 ++$self->{_link_recursion};
2626
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2628
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2554 2631
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2633}
2557 2634
2558sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2560 2637
… …
2585 $map->load_neighbours; 2662 $map->load_neighbours;
2586 2663
2587 return unless $self->contr->active; 2664 return unless $self->contr->active;
2588 2665
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2591 2668 # entering was successful
2669 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2671 $self->activate_recursive;
2594} 2672 }
2595 2673
2674}
2675
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2677
2598Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
… …
2608 2688
2609our $GOTOGEN; 2689our $GOTOGEN;
2610 2690
2611sub cf::object::player::goto { 2691sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2613 2699
2614 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2702
2617 $self->enter_link; 2703 $self->enter_link;
… …
2641 my $map = eval { 2727 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2643 2729
2644 if ($map) { 2730 if ($map) {
2645 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2733 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2735 }
2650 2736
2651 $map 2737 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2662 } 2748 }
2663 2749
2664 $done->() if $done; 2750 $done->($self) if $done;
2665 })->prio (1); 2751 })->prio (1);
2666} 2752}
2667 2753
2668=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2669 2755
… …
3115 3201
3116 $coro 3202 $coro
3117} 3203}
3118 3204
3119cf::client->attach ( 3205cf::client->attach (
3120 on_destroy => sub { 3206 on_client_destroy => sub {
3121 my ($ns) = @_; 3207 my ($ns) = @_;
3122 3208
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3210 },
3125); 3211);
… …
3251=cut 3337=cut
3252 3338
3253sub register_script_function { 3339sub register_script_function {
3254 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3255 3341
3256 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3258} 3344}
3259 3345
3260=back 3346=back
3261 3347
3262=cut 3348=cut
… …
3283 3369
3284 $facedata->{version} == 2 3370 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3372
3287 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3288 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3289 type => FT_RSRC, 3376 type => FT_RSRC,
3290 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3291 }; 3379 };
3292 cf::cede_to_tick; 3380 cf::cede_to_tick;
3293 3381
3294 { 3382 {
3295 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
… …
3440 or return; 3528 or return;
3441 3529
3442 local $/; 3530 local $/;
3443 *CFG = YAML::XS::Load scalar <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3444 3532
3445 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3446 3534
3447 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3448 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3449 3537
3450 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3491 3579
3492 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3493 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3494 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3495 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3496
3497 cf::init_experience;
3498 cf::init_anim;
3499 cf::init_attackmess;
3500 cf::init_dynamic;
3501 3584
3502 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3503 3586
3504 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3505 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3511 }; 3594 };
3512 3595
3513 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3514 3597
3515 cf::sync_job { 3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3516 cf::load_settings; 3604 cf::load_settings;
3517 cf::load_materials; 3605 cf::load_materials;
3518 3606
3519 reload_resources; 3607 reload_resources;
3520 reload_config; 3608 reload_config;
3521 db_init; 3609 db_init;
3522 3610
3523 cf::init_uuid; 3611 cf::init_uuid;
3524 cf::init_signals; 3612 cf::init_signals;
3525 cf::init_commands;
3526 cf::init_skills; 3613 cf::init_skills;
3527 3614
3528 cf::init_beforeplay; 3615 cf::init_beforeplay;
3529 3616
3530 atomic; 3617 atomic;
… …
3537 use POSIX (); 3624 use POSIX ();
3538 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3539 3626
3540 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3541 }; 3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3542 3632
3543 main_loop; 3633 main_loop;
3544} 3634}
3545 3635
3546############################################################################# 3636#############################################################################
… …
3548 3638
3549# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3550BEGIN { 3640BEGIN {
3551 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3552 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3553 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3554 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3555 }; 3645 };
3556 } 3646 }
3557} 3647}
3558 3648
3559sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3560 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3561 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3562 3654
3563 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3564 3656
3565 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3566 3658
3567 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3568 or return; 3660 or return;
3569 3661
3570 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3571 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3572 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
… …
3585 or return; 3677 or return;
3586 3678
3587 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3588 and return; 3680 and return;
3589 3681
3590 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3591 3683
3592 1 3684 1
3593} 3685}
3594 3686
3595our $uuid_lock; 3687our $uuid_lock;
… …
3721 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3722 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3723 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3724# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3725 } 3817 }
3726 warn "cleared package $pkg\n";#d#
3727} 3818}
3728 3819
3729sub do_reload_perl() { 3820sub do_reload_perl() {
3730 # can/must only be called in main 3821 # can/must only be called in main
3731 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3732 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3733 return; 3824 return;
3734 } 3825 }
3735 3826
3736 return if $RELOAD++; 3827 return if $RELOAD++;
3737 3828
3738 my $t1 = EV::time; 3829 my $t1 = AE::time;
3739 3830
3740 while ($RELOAD) { 3831 while ($RELOAD) {
3741 warn "reloading..."; 3832 warn "reloading...";
3742 3833
3743 warn "entering sync_job"; 3834 warn "entering sync_job";
… …
3846 3937
3847 warn "reloaded"; 3938 warn "reloaded";
3848 --$RELOAD; 3939 --$RELOAD;
3849 } 3940 }
3850 3941
3851 $t1 = EV::time - $t1; 3942 $t1 = AE::time - $t1;
3852 warn "reload completed in ${t1}s\n"; 3943 warn "reload completed in ${t1}s\n";
3853}; 3944};
3854 3945
3855our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3856 3947
… …
3859 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3860 3951
3861 $RELOAD_WATCHER ||= cf::async { 3952 $RELOAD_WATCHER ||= cf::async {
3862 Coro::AIO::aio_wait cache_extensions; 3953 Coro::AIO::aio_wait cache_extensions;
3863 3954
3864 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3865 do_reload_perl; 3956 do_reload_perl;
3866 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3867 }; 3958 };
3868 }; 3959 };
3869} 3960}
… …
3909 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3910 return; 4001 return;
3911 } 4002 }
3912 4003
3913 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3914 4007
3915 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3916 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3917 Coro::async_pool { 4010 Coro::async_pool {
3918 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
… …
3941} 4034}
3942 4035
3943{ 4036{
3944 # configure BDB 4037 # configure BDB
3945 4038
3946 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3947 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3948 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3949 4042
3950 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3951 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;

Diff Legend

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