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.492 by root, Mon Oct 26 01:22:34 2009 UTC vs.
Revision 1.526 by root, Wed Apr 21 05:48:35 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 = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 118our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
117 120
… …
162 165
163our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
164 167
165sub cf::map::normalise; 168sub cf::map::normalise;
166 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
167############################################################################# 174#############################################################################
168 175
169%REFLECT = (); 176%REFLECT = ();
170for (@REFLECT) { 177for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
260 267
261 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
262 269
263 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 272 return;#d#
266 }#d# 273 }#d#
267 274
268 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
289)) { 296)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 298}
292 299
293$EV::DIED = sub { 300$EV::DIED = sub {
294 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
295}; 302};
296 303
297############################################################################# 304#############################################################################
298 305
299=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
396} 403}
397 404
398=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
399 406
400Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 408get spread over time.
402 409
403=cut 410=cut
404 411
405sub periodic($$) { 412sub periodic($$) {
406 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
423 430
424=cut 431=cut
425 432
426our @SLOT_QUEUE; 433our @SLOT_QUEUE;
427our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
428 436
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
432 440
433 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
434 443
435 while () { 444 while () {
436 next_job: 445 next_job:
446
437 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 448
439 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 453 $job->[2]->send;
443 Coro::cede; 454 Coro::cede;
444 goto next_job; 455 goto next_job;
445 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 458 }
447 } 459 }
448 460
449 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 464 $signal->wait;
453 } else { 465 } else {
466 $busy = 0;
454 Coro::schedule; 467 Coro::schedule;
455 } 468 }
456 } 469 }
457}; 470};
458 471
459sub get_slot($;$$) { 472sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
461 474
462 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
463 476
464 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
465 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
466 480
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
496 510
497sub sync_job(&) { 511sub sync_job(&) {
498 my ($job) = @_; 512 my ($job) = @_;
499 513
500 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 515 my $time = AE::time;
502 516
503 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
505 519
506 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 537 } else {
524 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
525 } 539 }
526 } 540 }
527 541
528 my $time = EV::time - $time; 542 my $time = AE::time - $time;
529 543
530 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
531 545
532 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
533 } else { 547 } else {
… …
577 reset_signals; 591 reset_signals;
578 &$cb 592 &$cb
579 }, @args; 593 }, @args;
580 594
581 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
582} 607}
583 608
584=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
585 610
586=cut 611=cut
… …
1303} 1328}
1304 1329
1305use File::Glob (); 1330use File::Glob ();
1306 1331
1307cf::player->attach ( 1332cf::player->attach (
1308 on_command => sub { 1333 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1310 1335
1311 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1312 or return; 1337 or return;
1313 1338
… …
1392 . "\n};\n1"; 1417 . "\n};\n1";
1393 1418
1394 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1395 } 1420 }
1396 1421
1422 my $pass = 0;
1397 my %done; 1423 my %done;
1398 while (%todo) { 1424 while (%todo) {
1399 my $progress; 1425 my $progress;
1400 1426
1427 ++$pass;
1428
1429 ext:
1401 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1432 next ext
1404 unless exists $done{$_}; 1433 unless exists $done{$_};
1405 } 1434 }
1406 1435
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1437
1409 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1442
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1444 if exists $v->{meta}{mandatory};
1417 1445
1418 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1419 } 1455 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1456 }
1425 1457
1426 skip: 1458 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1429 } 1466 }
1430 }; 1467 };
1431} 1468}
1432 1469
1433############################################################################# 1470#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1518 } 1555 }
1519 } 1556 }
1520} 1557}
1521 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1522sub save($) { 1572sub save($) {
1523 my ($pl) = @_; 1573 my ($pl) = @_;
1524 1574
1525 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1526 1576
… …
1531 1581
1532 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1534 1584
1535 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1589
1537 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1591 cf::cede_to_tick;
1539} 1592}
1540 1593
… …
1642 \@logins 1695 \@logins
1643} 1696}
1644 1697
1645=item $player->maps 1698=item $player->maps
1646 1699
1700=item cf::player::maps $login
1701
1647Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1648player. May block. 1703player. May block.
1649 1704
1650=cut 1705=cut
1651 1706
… …
1713=cut 1768=cut
1714 1769
1715sub find_by_path($) { 1770sub find_by_path($) {
1716 my ($path) = @_; 1771 my ($path) = @_;
1717 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1718 my ($match, $specificity); 1775 my ($match, $specificity);
1719 1776
1720 for my $region (list) { 1777 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1811
1755 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1813 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1842
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1844}
1788 1845
1789# also paths starting with '/' 1846# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1848
1792sub thawer_merge { 1849sub thawer_merge {
1793 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1794 1851
1795 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
2009 2066
2010 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2011 } 2068 }
2012} 2069}
2013 2070
2014sub pre_load { } 2071sub pre_load { }
2015sub post_load { } 2072#sub post_load { } # XS
2016 2073
2017sub load { 2074sub load {
2018 my ($self) = @_; 2075 my ($self) = @_;
2019 2076
2020 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2134 }
2078 2135
2079 $self->post_load; 2136 $self->post_load;
2080} 2137}
2081 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2082sub customise_for { 2142sub customise_for {
2083 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2084 2144
2085 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2146 if $self->per_player;
… …
2163 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2164 2224
2165 () 2225 ()
2166} 2226}
2167 2227
2228# common code, used by both ->save and ->swapout
2168sub save { 2229sub _save {
2169 my ($self) = @_; 2230 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2231
2173 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2174 2233
2175 return unless $self->dirty; 2234 return unless $self->dirty;
2176 2235
… …
2196 } else { 2255 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2257 }
2199} 2258}
2200 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2201sub swap_out { 2268sub swap_out {
2202 my ($self) = @_; 2269 my ($self) = @_;
2203 2270
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2272
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2212 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2214 2327
2215 $self->deactivate; 2328 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2330 $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 2331
2263 $self->unlink_save; 2332 $self->unlink_save;
2264 $self->destroy; 2333 $self->destroy;
2265} 2334}
2266 2335
… …
2274 2343
2275 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2276 2345
2277 $self->unlink_save; 2346 $self->unlink_save;
2278 2347
2279 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2353
… …
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2620
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2554 2623
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2625}
2557 2626
2558sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2560 2629
… …
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2591 2660
2592 # only activate afterwards, to support waiting in hooks 2661 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2662 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again
2594} 2664}
2595 2665
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2597 2667
2598Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
… …
2784sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2785 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2786 2856
2787 utf8::encode $text; 2857 utf8::encode $text;
2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2859}
2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2789} 2884}
2790 2885
2791=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2792 2887
2793Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2945 my $pkt = "msg " 3040 my $pkt = "msg "
2946 . $self->{json_coder}->encode ( 3041 . $self->{json_coder}->encode (
2947 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2948 ); 3043 );
2949 3044
2950 # try lzf for large packets
2951 $pkt = "lzf " . Compress::LZF::compress $pkt
2952 if 1024 <= length $pkt and $self->{can_lzf};
2953
2954 # split very large packets
2955 if (8192 < length $pkt and $self->{can_lzf}) {
2956 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2957 $pkt = "frag";
2958 }
2959
2960 $self->send_packet ($pkt); 3045 $self->send_big_packet ($pkt);
2961} 3046}
2962 3047
2963=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2964 3049
2965Sends an ext event to the client. 3050Sends an ext event to the client.
… …
2968 3053
2969sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2970 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2971 3056
2972 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2974 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2975 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2976 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2977 } 3062 }
2978} 3063}
2979 3064
2980=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2981 3066
… …
2985 3070
2986sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2987 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2988 3073
2989 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2990 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2991 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2992 #TODO: version 1, remove 3077 #TODO: version 1, remove
2993 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2994 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2995 } 3080 }
2996} 3081}
2997 3082
2998=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2999 3084
… …
3100 3185
3101 $coro 3186 $coro
3102} 3187}
3103 3188
3104cf::client->attach ( 3189cf::client->attach (
3105 on_destroy => sub { 3190 on_client_destroy => sub {
3106 my ($ns) = @_; 3191 my ($ns) = @_;
3107 3192
3108 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3109 }, 3194 },
3110); 3195);
… …
3126our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3127 3212
3128$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3129 3214
3130$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3131 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3132 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3133 sort time 3218 sort time
3134)); 3219));
3135 3220
3136# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
… …
3188 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3189 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3190 3275
3191 %vars = (_dummy => 0) unless %vars; 3276 %vars = (_dummy => 0) unless %vars;
3192 3277
3278 my @res;
3193 local $_; 3279 local $_;
3194 local @safe::cf::_safe_eval_args = values %vars;
3195 3280
3196 my $eval = 3281 my $eval =
3197 "do {\n" 3282 "do {\n"
3198 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3199 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3200 . $code 3285 . $code
3201 . "\n}" 3286 . "\n}"
3202 ; 3287 ;
3203 3288
3289 if ($CFG{safe_eval}) {
3204 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3205 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3206 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
3207 3298
3208 if ($@) { 3299 if ($@) {
3209 warn "$@"; 3300 warn "$@";
3210 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3211 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
… …
3230=cut 3321=cut
3231 3322
3232sub register_script_function { 3323sub register_script_function {
3233 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3234 3325
3235 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3236 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3237} 3328}
3238 3329
3239=back 3330=back
3240 3331
3241=cut 3332=cut
… …
3262 3353
3263 $facedata->{version} == 2 3354 $facedata->{version} == 2
3264 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3265 3356
3266 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3267 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3268 type => FT_RSRC, 3360 type => FT_RSRC,
3269 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3270 }; 3363 };
3271 cf::cede_to_tick; 3364 cf::cede_to_tick;
3272 3365
3273 { 3366 {
3274 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
… …
3276 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3277 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3278 3371
3279 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3280 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3281 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3282 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3283 3376
3284 cf::cede_to_tick; 3377 cf::cede_to_tick;
3285 } 3378 }
3286 3379
3287 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
… …
3311 3404
3312 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3313 } 3406 }
3314 3407
3315 { 3408 {
3316 # TODO: for gcfclient pleasure, we should give resources
3317 # that gcfclient doesn't grok a >10000 face index.
3318 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3319 3410
3320 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3321 if (defined $info->{type}) { 3412 if (defined $info->{type}) {
3322 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3323 my $data;
3324 3414
3325 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3326 # prepend meta info
3327
3328 my $meta = $enc->encode ({
3329 name => $name,
3330 %{ $info->{meta} || {} },
3331 });
3332
3333 $data = pack "(w/a*)*", $meta, $info->{data};
3334 } else {
3335 $data = $info->{data};
3336 }
3337
3338 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3339 cf::face::set_type $idx, $info->{type}; 3416 cf::face::set_type $idx, $info->{type};
3340 } else { 3417 } else {
3341 $RESOURCE{$name} = $info; 3418 $RESOURCE{$name} = $info;
3342 } 3419 }
3343 3420
… …
3486 3563
3487 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3488 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3489 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3490 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3491
3492 cf::init_experience;
3493 cf::init_anim;
3494 cf::init_attackmess;
3495 cf::init_dynamic;
3496 3568
3497 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3498 3570
3499 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3500 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
… …
3506 }; 3578 };
3507 3579
3508 evthread_start IO::AIO::poll_fileno; 3580 evthread_start IO::AIO::poll_fileno;
3509 3581
3510 cf::sync_job { 3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3511 reload_resources; 3591 reload_resources;
3512 reload_config; 3592 reload_config;
3513 db_init; 3593 db_init;
3514 3594
3515 cf::load_settings;
3516 cf::load_materials;
3517 cf::init_uuid; 3595 cf::init_uuid;
3518 cf::init_signals; 3596 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3597 cf::init_skills;
3521 3598
3522 cf::init_beforeplay; 3599 cf::init_beforeplay;
3523 3600
3524 atomic; 3601 atomic;
… …
3531 use POSIX (); 3608 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533 3610
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3611 (pop @POST_INIT)->(0) while @POST_INIT;
3535 }; 3612 };
3613
3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3536 3616
3537 main_loop; 3617 main_loop;
3538} 3618}
3539 3619
3540############################################################################# 3620#############################################################################
… …
3542 3622
3543# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3544BEGIN { 3624BEGIN {
3545 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3549 }; 3629 };
3550 } 3630 }
3551} 3631}
3552 3632
3553sub write_runtime_sync { 3633sub write_runtime_sync {
3634 my $t0 = AE::time;
3635
3554 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3556 3638
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3640
3559 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3560 3642
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3644 or return;
3563 3645
3564 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3661 or return;
3580 3662
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3664 and return;
3583 3665
3584 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3667
3586 1 3668 1
3587} 3669}
3588 3670
3589our $uuid_lock; 3671our $uuid_lock;
… …
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) { 3798 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"}; 3799 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 } 3801 }
3720 warn "cleared package $pkg\n";#d#
3721} 3802}
3722 3803
3723sub do_reload_perl() { 3804sub do_reload_perl() {
3724 # can/must only be called in main 3805 # can/must only be called in main
3725 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3726 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3727 return; 3808 return;
3728 } 3809 }
3729 3810
3730 return if $RELOAD++; 3811 return if $RELOAD++;
3731 3812
3732 my $t1 = EV::time; 3813 my $t1 = AE::time;
3733 3814
3734 while ($RELOAD) { 3815 while ($RELOAD) {
3735 warn "reloading..."; 3816 warn "reloading...";
3736 3817
3737 warn "entering sync_job"; 3818 warn "entering sync_job";
… …
3840 3921
3841 warn "reloaded"; 3922 warn "reloaded";
3842 --$RELOAD; 3923 --$RELOAD;
3843 } 3924 }
3844 3925
3845 $t1 = EV::time - $t1; 3926 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 3927 warn "reload completed in ${t1}s\n";
3847}; 3928};
3848 3929
3849our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3850 3931
… …
3853 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3854 3935
3855 $RELOAD_WATCHER ||= cf::async { 3936 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 3937 Coro::AIO::aio_wait cache_extensions;
3857 3938
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 3940 do_reload_perl;
3860 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3861 }; 3942 };
3862 }; 3943 };
3863} 3944}
… …
3880 3961
3881our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3883 3964
3884sub wait_for_tick { 3965sub wait_for_tick {
3885 return if tick_inhibit || $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886 3967
3887 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3888 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait; 3970 $signal->wait;
3890} 3971}
3891 3972
3892sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3893 return if tick_inhibit || $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 3975
3895 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 3978 $signal->wait;
3898} 3979}
… …
3903 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3904 return; 3985 return;
3905 } 3986 }
3906 3987
3907 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3989
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3908 3991
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 3994 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
… …
3935} 4018}
3936 4019
3937{ 4020{
3938 # configure BDB 4021 # configure BDB
3939 4022
3940 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3943 4026
3944 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;

Diff Legend

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