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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 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.
… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE;
113 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
118
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 121our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
118 123
… …
163 168
164our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
165 170
166sub cf::map::normalise; 171sub cf::map::normalise;
167 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
168############################################################################# 177#############################################################################
169 178
170%REFLECT = (); 179%REFLECT = ();
171for (@REFLECT) { 180for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
259$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
261 270
262 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
263 272
264 if ($Coro::current == $Coro::main) {#d# 273 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 275 return;#d#
267 }#d# 276 }#d#
268 277
269 # kill coroutine otherwise 278 # kill coroutine otherwise
… …
397} 406}
398 407
399=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
400 409
401Like 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
402get spread over timer. 411get spread over time.
403 412
404=cut 413=cut
405 414
406sub periodic($$) { 415sub periodic($$) {
407 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
424 433
425=cut 434=cut
426 435
427our @SLOT_QUEUE; 436our @SLOT_QUEUE;
428our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
429 439
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
433 443
434 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
435 446
436 while () { 447 while () {
437 next_job: 448 next_job:
449
438 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 451
440 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 456 $job->[2]->send;
444 Coro::cede; 457 Coro::cede;
445 goto next_job; 458 goto next_job;
446 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 461 }
448 } 462 }
449 463
450 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 467 $signal->wait;
454 } else { 468 } else {
469 $busy = 0;
455 Coro::schedule; 470 Coro::schedule;
456 } 471 }
457 } 472 }
458}; 473};
459 474
460sub get_slot($;$$) { 475sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
462 477
463 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
464 479
465 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
466 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
467 483
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
497 513
498sub sync_job(&) { 514sub sync_job(&) {
499 my ($job) = @_; 515 my ($job) = @_;
500 516
501 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 518 my $time = AE::time;
503 519
504 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
506 522
507 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
524 } else { 540 } else {
525 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
526 } 542 }
527 } 543 }
528 544
529 my $time = EV::time - $time; 545 my $time = AE::time - $time;
530 546
531 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
532 548
533 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
534 } else { 550 } else {
… …
578 reset_signals; 594 reset_signals;
579 &$cb 595 &$cb
580 }, @args; 596 }, @args;
581 597
582 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 )
583} 610}
584 611
585=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
586 613
587=cut 614=cut
… …
1168 1195
1169 sync_job { 1196 sync_job {
1170 if (length $$rdata) { 1197 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1174 1202
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1235 $av = $st->{objs}; 1263 $av = $st->{objs};
1236 } 1264 }
1237 1265
1238 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1241 1270
1242 ($data, $av) 1271 ($data, $av)
1243} 1272}
1244 1273
1245=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1304} 1333}
1305 1334
1306use File::Glob (); 1335use File::Glob ();
1307 1336
1308cf::player->attach ( 1337cf::player->attach (
1309 on_command => sub { 1338 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1311 1340
1312 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1313 or return; 1342 or return;
1314 1343
… …
1393 . "\n};\n1"; 1422 . "\n};\n1";
1394 1423
1395 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1396 } 1425 }
1397 1426
1427 my $pass = 0;
1398 my %done; 1428 my %done;
1399 while (%todo) { 1429 while (%todo) {
1400 my $progress; 1430 my $progress;
1401 1431
1432 ++$pass;
1433
1434 ext:
1402 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1437 next ext
1405 unless exists $done{$_}; 1438 unless exists $done{$_};
1406 } 1439 }
1407 1440
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1442
1410 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1447
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1449 if exists $v->{meta}{mandatory};
1418 1450
1419 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;
1420 } 1460 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1461 }
1426 1462
1427 skip: 1463 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 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 }
1430 } 1471 }
1431 }; 1472 };
1432} 1473}
1433 1474
1434############################################################################# 1475#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1519 } 1560 }
1520 } 1561 }
1521} 1562}
1522 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
1523sub save($) { 1577sub save($) {
1524 my ($pl) = @_; 1578 my ($pl) = @_;
1525 1579
1526 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1527 1581
… …
1532 1586
1533 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1535 1589
1536 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];
1537 1594
1538 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1596 cf::cede_to_tick;
1540} 1597}
1541 1598
… …
1643 \@logins 1700 \@logins
1644} 1701}
1645 1702
1646=item $player->maps 1703=item $player->maps
1647 1704
1705=item cf::player::maps $login
1706
1648Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1649player. May block. 1708player. May block.
1650 1709
1651=cut 1710=cut
1652 1711
… …
1714=cut 1773=cut
1715 1774
1716sub find_by_path($) { 1775sub find_by_path($) {
1717 my ($path) = @_; 1776 my ($path) = @_;
1718 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1719 my ($match, $specificity); 1780 my ($match, $specificity);
1720 1781
1721 for my $region (list) { 1782 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
… …
1754 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
1755 1816
1756 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1818 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1786 1847
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1849}
1789 1850
1790# also paths starting with '/' 1851# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1853
1793sub thawer_merge { 1854sub thawer_merge {
1794 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1795 1856
1796 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
2010 2071
2011 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
2012 } 2073 }
2013} 2074}
2014 2075
2015sub pre_load { } 2076sub pre_load { }
2016sub post_load { } 2077#sub post_load { } # XS
2017 2078
2018sub load { 2079sub load {
2019 my ($self) = @_; 2080 my ($self) = @_;
2020 2081
2021 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
… …
2078 } 2139 }
2079 2140
2080 $self->post_load; 2141 $self->post_load;
2081} 2142}
2082 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
2083sub customise_for { 2147sub customise_for {
2084 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2085 2149
2086 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2151 if $self->per_player;
… …
2103 or next; 2167 or next;
2104 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2105 or next; 2169 or next;
2106 $neigh->load; 2170 $neigh->load;
2107 2171
2172 # now find the diagonal neighbours
2108 push @neigh, 2173 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2176 }
2112 2177
… …
2164 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2165 2230
2166 () 2231 ()
2167} 2232}
2168 2233
2234# common code, used by both ->save and ->swapout
2169sub save { 2235sub _save {
2170 my ($self) = @_; 2236 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2237
2174 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2175 2239
2176 return unless $self->dirty; 2240 return unless $self->dirty;
2177 2241
… …
2197 } else { 2261 } else {
2198 $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);
2199 } 2263 }
2200} 2264}
2201 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2202sub swap_out { 2274sub swap_out {
2203 my ($self) = @_; 2275 my ($self) = @_;
2204 2276
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2278
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2213 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2214 $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};
2215 2333
2216 $self->deactivate; 2334 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2336 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2337
2264 $self->unlink_save; 2338 $self->unlink_save;
2265 $self->destroy; 2339 $self->destroy;
2266} 2340}
2267 2341
… …
2275 2349
2276 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2277 2351
2278 $self->unlink_save; 2352 $self->unlink_save;
2279 2353
2280 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2359
… …
2515 2589
2516Freezes 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}>).
2517 2591
2518The 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.
2519for 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,
2520though, 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
2521map. 2595map.
2522 2596
2523Will never block. 2597Will never block.
2524 2598
2525=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2547 my ($self) = @_; 2621 my ($self) = @_;
2548 2622
2549 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2550 2624
2625 ++$self->{_link_recursion};
2626
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2628
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2555 2631
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2633}
2558 2634
2559sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2561 2637
… …
2586 $map->load_neighbours; 2662 $map->load_neighbours;
2587 2663
2588 return unless $self->contr->active; 2664 return unless $self->contr->active;
2589 2665
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2592 2668 # entering was successful
2669 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2671 $self->activate_recursive;
2595} 2672 }
2596 2673
2674}
2675
2597=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)]])
2598 2677
2599Moves 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
2600her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2601that 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
2602the 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
… …
2609 2688
2610our $GOTOGEN; 2689our $GOTOGEN;
2611 2690
2612sub cf::object::player::goto { 2691sub cf::object::player::goto {
2613 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 }
2614 2699
2615 # 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
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2702
2618 $self->enter_link; 2703 $self->enter_link;
… …
2642 my $map = eval { 2727 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2644 2729
2645 if ($map) { 2730 if ($map) {
2646 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2733 } else {
2649 $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);
2650 } 2735 }
2651 2736
2652 $map 2737 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2663 } 2748 }
2664 2749
2665 $done->() if $done; 2750 $done->($self) if $done;
2666 })->prio (1); 2751 })->prio (1);
2667} 2752}
2668 2753
2669=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2670 2755
… …
3116 3201
3117 $coro 3202 $coro
3118} 3203}
3119 3204
3120cf::client->attach ( 3205cf::client->attach (
3121 on_destroy => sub { 3206 on_client_destroy => sub {
3122 my ($ns) = @_; 3207 my ($ns) = @_;
3123 3208
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3210 },
3126); 3211);
… …
3142our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3143 3228
3144$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3145 3230
3146$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3149 sort time 3234 sort time
3150)); 3235));
3151 3236
3152# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3206 3291
3207 %vars = (_dummy => 0) unless %vars; 3292 %vars = (_dummy => 0) unless %vars;
3208 3293
3294 my @res;
3209 local $_; 3295 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3296
3212 my $eval = 3297 my $eval =
3213 "do {\n" 3298 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3301 . $code
3217 . "\n}" 3302 . "\n}"
3218 ; 3303 ;
3219 3304
3305 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3223 3314
3224 if ($@) { 3315 if ($@) {
3225 warn "$@"; 3316 warn "$@";
3226 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
… …
3246=cut 3337=cut
3247 3338
3248sub register_script_function { 3339sub register_script_function {
3249 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3250 3341
3251 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3253} 3344}
3254 3345
3255=back 3346=back
3256 3347
3257=cut 3348=cut
… …
3278 3369
3279 $facedata->{version} == 2 3370 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3372
3282 # 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]);
3283 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3376 type => FT_RSRC,
3285 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),
3286 }; 3379 };
3287 cf::cede_to_tick; 3380 cf::cede_to_tick;
3288 3381
3289 { 3382 {
3290 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3387
3295 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3392
3300 cf::cede_to_tick; 3393 cf::cede_to_tick;
3301 } 3394 }
3302 3395
3303 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
… …
3327 3420
3328 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3329 } 3422 }
3330 3423
3331 { 3424 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3335 3426
3336 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3430
3341 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3356 } else { 3433 } else {
3357 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3358 } 3435 }
3359 3436
… …
3451 or return; 3528 or return;
3452 3529
3453 local $/; 3530 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3455 3532
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3534
3458 $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};
3459 $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};
3460 3537
3461 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3502 3579
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 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.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3584
3513 $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
3514 3586
3515 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3522 }; 3594 };
3523 3595
3524 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3525 3597
3526 cf::sync_job { 3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3527 reload_resources; 3607 reload_resources;
3528 reload_config; 3608 reload_config;
3529 db_init; 3609 db_init;
3530 3610
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3611 cf::init_uuid;
3534 cf::init_signals; 3612 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3613 cf::init_skills;
3537 3614
3538 cf::init_beforeplay; 3615 cf::init_beforeplay;
3539 3616
3540 atomic; 3617 atomic;
… …
3547 use POSIX (); 3624 use POSIX ();
3548 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};
3549 3626
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 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";
3552 3632
3553 main_loop; 3633 main_loop;
3554} 3634}
3555 3635
3556############################################################################# 3636#############################################################################
… …
3558 3638
3559# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3560BEGIN { 3640BEGIN {
3561 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3565 }; 3645 };
3566 } 3646 }
3567} 3647}
3568 3648
3569sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3570 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3572 3654
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3656
3575 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3576 3658
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3660 or return;
3579 3661
3580 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3677 or return;
3596 3678
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3680 and return;
3599 3681
3600 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3683
3602 1 3684 1
3603} 3685}
3604 3686
3605our $uuid_lock; 3687our $uuid_lock;
… …
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3817 }
3736 warn "cleared package $pkg\n";#d#
3737} 3818}
3738 3819
3739sub do_reload_perl() { 3820sub do_reload_perl() {
3740 # can/must only be called in main 3821 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3742 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3743 return; 3824 return;
3744 } 3825 }
3745 3826
3746 return if $RELOAD++; 3827 return if $RELOAD++;
3747 3828
3748 my $t1 = EV::time; 3829 my $t1 = AE::time;
3749 3830
3750 while ($RELOAD) { 3831 while ($RELOAD) {
3751 warn "reloading..."; 3832 warn "reloading...";
3752 3833
3753 warn "entering sync_job"; 3834 warn "entering sync_job";
… …
3856 3937
3857 warn "reloaded"; 3938 warn "reloaded";
3858 --$RELOAD; 3939 --$RELOAD;
3859 } 3940 }
3860 3941
3861 $t1 = EV::time - $t1; 3942 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 3943 warn "reload completed in ${t1}s\n";
3863}; 3944};
3864 3945
3865our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3866 3947
… …
3869 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3870 3951
3871 $RELOAD_WATCHER ||= cf::async { 3952 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 3953 Coro::AIO::aio_wait cache_extensions;
3873 3954
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 3956 do_reload_perl;
3876 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3877 }; 3958 };
3878 }; 3959 };
3879} 3960}
… …
3896 3977
3897our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3899 3980
3900sub wait_for_tick { 3981sub wait_for_tick {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 3983
3903 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 3986 $signal->wait;
3906} 3987}
3907 3988
3908sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 3991
3911 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 3994 $signal->wait;
3914} 3995}
… …
3919 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3920 return; 4001 return;
3921 } 4002 }
3922 4003
3923 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#
3924 4007
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $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.;
3927 Coro::async_pool { 4010 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
… …
3951} 4034}
3952 4035
3953{ 4036{
3954 # configure BDB 4037 # configure BDB
3955 4038
3956 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3959 4042
3960 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;

Diff Legend

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