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.502 by root, Sat Jan 23 20:24:50 2010 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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 = 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
… …
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) = @_;
… …
503 510
504sub sync_job(&) { 511sub sync_job(&) {
505 my ($job) = @_; 512 my ($job) = @_;
506 513
507 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
508 my $time = EV::time; 515 my $time = AE::time;
509 516
510 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
512 519
513 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
530 } else { 537 } else {
531 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
532 } 539 }
533 } 540 }
534 541
535 my $time = EV::time - $time; 542 my $time = AE::time - $time;
536 543
537 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
538 545
539 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
540 } else { 547 } else {
… …
584 reset_signals; 591 reset_signals;
585 &$cb 592 &$cb
586 }, @args; 593 }, @args;
587 594
588 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 )
589} 607}
590 608
591=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
592 610
593=cut 611=cut
… …
1310} 1328}
1311 1329
1312use File::Glob (); 1330use File::Glob ();
1313 1331
1314cf::player->attach ( 1332cf::player->attach (
1315 on_command => sub { 1333 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1317 1335
1318 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1319 or return; 1337 or return;
1320 1338
… …
1399 . "\n};\n1"; 1417 . "\n};\n1";
1400 1418
1401 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1402 } 1420 }
1403 1421
1422 my $pass = 0;
1404 my %done; 1423 my %done;
1405 while (%todo) { 1424 while (%todo) {
1406 my $progress; 1425 my $progress;
1407 1426
1427 ++$pass;
1428
1429 ext:
1408 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1432 next ext
1411 unless exists $done{$_}; 1433 unless exists $done{$_};
1412 } 1434 }
1413 1435
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1437
1416 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1442
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1444 if exists $v->{meta}{mandatory};
1424 1445
1425 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;
1426 } 1455 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1456 }
1432 1457
1433 skip: 1458 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 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 }
1436 } 1466 }
1437 }; 1467 };
1438} 1468}
1439 1469
1440############################################################################# 1470#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1525 } 1555 }
1526 } 1556 }
1527} 1557}
1528 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
1529sub save($) { 1572sub save($) {
1530 my ($pl) = @_; 1573 my ($pl) = @_;
1531 1574
1532 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1533 1576
… …
1538 1581
1539 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1541 1584
1542 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];
1543 1589
1544 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1591 cf::cede_to_tick;
1546} 1592}
1547 1593
… …
1649 \@logins 1695 \@logins
1650} 1696}
1651 1697
1652=item $player->maps 1698=item $player->maps
1653 1699
1700=item cf::player::maps $login
1701
1654Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1655player. May block. 1703player. May block.
1656 1704
1657=cut 1705=cut
1658 1706
… …
1720=cut 1768=cut
1721 1769
1722sub find_by_path($) { 1770sub find_by_path($) {
1723 my ($path) = @_; 1771 my ($path) = @_;
1724 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1725 my ($match, $specificity); 1775 my ($match, $specificity);
1726 1776
1727 for my $region (list) { 1777 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1760 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
1761 1811
1762 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1813 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2084 } 2134 }
2085 2135
2086 $self->post_load; 2136 $self->post_load;
2087} 2137}
2088 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
2089sub customise_for { 2142sub customise_for {
2090 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2091 2144
2092 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2146 if $self->per_player;
… …
2170 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2171 2224
2172 () 2225 ()
2173} 2226}
2174 2227
2228# common code, used by both ->save and ->swapout
2175sub save { 2229sub _save {
2176 my ($self) = @_; 2230 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2231
2180 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2181 2233
2182 return unless $self->dirty; 2234 return unless $self->dirty;
2183 2235
… …
2203 } else { 2255 } else {
2204 $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);
2205 } 2257 }
2206} 2258}
2207 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2208sub swap_out { 2268sub swap_out {
2209 my ($self) = @_; 2269 my ($self) = @_;
2210 2270
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2272
2216 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2219 2276
2220 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2221
2222 $self->deactivate; 2278 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2224 $self->clear; 2286 $self->clear;
2225} 2287}
2226 2288
2227sub reset_at { 2289sub reset_at {
2228 my ($self) = @_; 2290 my ($self) = @_;
… …
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2620
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2561 2623
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2625}
2564 2626
2565sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2567 2629
… …
3122 3184
3123 $coro 3185 $coro
3124} 3186}
3125 3187
3126cf::client->attach ( 3188cf::client->attach (
3127 on_destroy => sub { 3189 on_client_destroy => sub {
3128 my ($ns) = @_; 3190 my ($ns) = @_;
3129 3191
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3193 },
3132); 3194);
… …
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505 3567
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3569
3513 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
… …
3520 }; 3577 };
3521 3578
3522 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3523 3580
3524 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3525 cf::load_settings; 3587 cf::load_settings;
3526 cf::load_materials; 3588 cf::load_materials;
3527 3589
3528 reload_resources; 3590 reload_resources;
3529 reload_config; 3591 reload_config;
3530 db_init; 3592 db_init;
3531 3593
3532 cf::init_uuid; 3594 cf::init_uuid;
3533 cf::init_signals; 3595 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3596 cf::init_skills;
3536 3597
3537 cf::init_beforeplay; 3598 cf::init_beforeplay;
3538 3599
3539 atomic; 3600 atomic;
… …
3546 use POSIX (); 3607 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548 3609
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3550 }; 3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3551 3615
3552 main_loop; 3616 main_loop;
3553} 3617}
3554 3618
3555############################################################################# 3619#############################################################################
… …
3557 3621
3558# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3559BEGIN { 3623BEGIN {
3560 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3564 }; 3628 };
3565 } 3629 }
3566} 3630}
3567 3631
3568sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3569 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3571 3637
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3639
3574 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3575 3641
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3643 or return;
3578 3644
3579 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3660 or return;
3595 3661
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3663 and return;
3598 3664
3599 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3666
3601 1 3667 1
3602} 3668}
3603 3669
3604our $uuid_lock; 3670our $uuid_lock;
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3800 }
3735 warn "cleared package $pkg\n";#d#
3736} 3801}
3737 3802
3738sub do_reload_perl() { 3803sub do_reload_perl() {
3739 # can/must only be called in main 3804 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3741 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3742 return; 3807 return;
3743 } 3808 }
3744 3809
3745 return if $RELOAD++; 3810 return if $RELOAD++;
3746 3811
3747 my $t1 = EV::time; 3812 my $t1 = AE::time;
3748 3813
3749 while ($RELOAD) { 3814 while ($RELOAD) {
3750 warn "reloading..."; 3815 warn "reloading...";
3751 3816
3752 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3855 3920
3856 warn "reloaded"; 3921 warn "reloaded";
3857 --$RELOAD; 3922 --$RELOAD;
3858 } 3923 }
3859 3924
3860 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3862}; 3927};
3863 3928
3864our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3865 3930
… …
3868 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3869 3934
3870 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3872 3937
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 3939 do_reload_perl;
3875 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3876 }; 3941 };
3877 }; 3942 };
3878} 3943}
… …
3919 return; 3984 return;
3920 } 3985 }
3921 3986
3922 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3923 3988
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 3990
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928 Coro::async_pool { 3993 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3952} 4017}
3953 4018
3954{ 4019{
3955 # configure BDB 4020 # configure BDB
3956 4021
3957 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3960 4025
3961 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;

Diff Legend

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