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.525 by root, Wed Apr 21 03:34:26 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},
… …
1792 1842
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1844}
1795 1845
1796# also paths starting with '/' 1846# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1848
1799sub thawer_merge { 1849sub thawer_merge {
1800 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1801 1851
1802 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
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
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2220 $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};
2221 2327
2222 $self->deactivate; 2328 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2330 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2331
2270 $self->unlink_save; 2332 $self->unlink_save;
2271 $self->destroy; 2333 $self->destroy;
2272} 2334}
2273 2335
… …
2281 2343
2282 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2283 2345
2284 $self->unlink_save; 2346 $self->unlink_save;
2285 2347
2286 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2353
… …
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
… …
2595 2657
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2598 2660
2599 # only activate afterwards, to support waiting in hooks 2661 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2662 $self->activate_recursive
2663 unless exists $self->{_link_pos}; # maybe we re in-flight again
2601} 2664}
2602 2665
2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2604 2667
2605Moves 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
… …
3122 3185
3123 $coro 3186 $coro
3124} 3187}
3125 3188
3126cf::client->attach ( 3189cf::client->attach (
3127 on_destroy => sub { 3190 on_client_destroy => sub {
3128 my ($ns) = @_; 3191 my ($ns) = @_;
3129 3192
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3194 },
3132); 3195);
… …
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 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.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505 3568
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 3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512 3570
3513 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
… …
3520 }; 3578 };
3521 3579
3522 evthread_start IO::AIO::poll_fileno; 3580 evthread_start IO::AIO::poll_fileno;
3523 3581
3524 cf::sync_job { 3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3525 cf::load_settings; 3588 cf::load_settings;
3526 cf::load_materials; 3589 cf::load_materials;
3527 3590
3528 reload_resources; 3591 reload_resources;
3529 reload_config; 3592 reload_config;
3530 db_init; 3593 db_init;
3531 3594
3532 cf::init_uuid; 3595 cf::init_uuid;
3533 cf::init_signals; 3596 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3597 cf::init_skills;
3536 3598
3537 cf::init_beforeplay; 3599 cf::init_beforeplay;
3538 3600
3539 atomic; 3601 atomic;
… …
3546 use POSIX (); 3608 use POSIX ();
3547 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};
3548 3610
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3611 (pop @POST_INIT)->(0) while @POST_INIT;
3550 }; 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";
3551 3616
3552 main_loop; 3617 main_loop;
3553} 3618}
3554 3619
3555############################################################################# 3620#############################################################################
… …
3557 3622
3558# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3559BEGIN { 3624BEGIN {
3560 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3564 }; 3629 };
3565 } 3630 }
3566} 3631}
3567 3632
3568sub write_runtime_sync { 3633sub write_runtime_sync {
3634 my $t0 = AE::time;
3635
3569 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3571 3638
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3640
3574 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3575 3642
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3644 or return;
3578 3645
3579 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3661 or return;
3595 3662
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3664 and return;
3598 3665
3599 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3667
3601 1 3668 1
3602} 3669}
3603 3670
3604our $uuid_lock; 3671our $uuid_lock;
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3798 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3799 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3801 }
3735 warn "cleared package $pkg\n";#d#
3736} 3802}
3737 3803
3738sub do_reload_perl() { 3804sub do_reload_perl() {
3739 # can/must only be called in main 3805 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3741 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3742 return; 3808 return;
3743 } 3809 }
3744 3810
3745 return if $RELOAD++; 3811 return if $RELOAD++;
3746 3812
3747 my $t1 = EV::time; 3813 my $t1 = AE::time;
3748 3814
3749 while ($RELOAD) { 3815 while ($RELOAD) {
3750 warn "reloading..."; 3816 warn "reloading...";
3751 3817
3752 warn "entering sync_job"; 3818 warn "entering sync_job";
… …
3855 3921
3856 warn "reloaded"; 3922 warn "reloaded";
3857 --$RELOAD; 3923 --$RELOAD;
3858 } 3924 }
3859 3925
3860 $t1 = EV::time - $t1; 3926 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 3927 warn "reload completed in ${t1}s\n";
3862}; 3928};
3863 3929
3864our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3865 3931
… …
3868 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3869 3935
3870 $RELOAD_WATCHER ||= cf::async { 3936 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 3937 Coro::AIO::aio_wait cache_extensions;
3872 3938
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 3940 do_reload_perl;
3875 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3876 }; 3942 };
3877 }; 3943 };
3878} 3944}
… …
3919 return; 3985 return;
3920 } 3986 }
3921 3987
3922 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3923 3989
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 3991
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $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.;
3928 Coro::async_pool { 3994 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
… …
3952} 4018}
3953 4019
3954{ 4020{
3955 # configure BDB 4021 # configure BDB
3956 4022
3957 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3958 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3959 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3960 4026
3961 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3962 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;

Diff Legend

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