ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.499 by root, Sun Jan 10 17:43:46 2010 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 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) = @_;
… …
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
… …
3115 3184
3116 $coro 3185 $coro
3117} 3186}
3118 3187
3119cf::client->attach ( 3188cf::client->attach (
3120 on_destroy => sub { 3189 on_client_destroy => sub {
3121 my ($ns) = @_; 3190 my ($ns) = @_;
3122 3191
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3193 },
3125); 3194);
… …
3251=cut 3320=cut
3252 3321
3253sub register_script_function { 3322sub register_script_function {
3254 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3255 3324
3256 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3258} 3327}
3259 3328
3260=back 3329=back
3261 3330
3262=cut 3331=cut
… …
3283 3352
3284 $facedata->{version} == 2 3353 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3355
3287 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3288 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3289 type => FT_RSRC, 3359 type => FT_RSRC,
3290 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3291 }; 3362 };
3292 cf::cede_to_tick; 3363 cf::cede_to_tick;
3293 3364
3294 { 3365 {
3295 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3491 3562
3492 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3493 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.";
3494 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3495 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3496
3497 cf::init_experience;
3498 cf::init_anim;
3499 cf::init_attackmess;
3500 cf::init_dynamic;
3501 3567
3502 $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
3503 3569
3504 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3505 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3511 }; 3577 };
3512 3578
3513 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3514 3580
3515 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3516 cf::load_settings; 3587 cf::load_settings;
3517 cf::load_materials; 3588 cf::load_materials;
3518 3589
3519 reload_resources; 3590 reload_resources;
3520 reload_config; 3591 reload_config;
3521 db_init; 3592 db_init;
3522 3593
3523 cf::init_uuid; 3594 cf::init_uuid;
3524 cf::init_signals; 3595 cf::init_signals;
3525 cf::init_commands;
3526 cf::init_skills; 3596 cf::init_skills;
3527 3597
3528 cf::init_beforeplay; 3598 cf::init_beforeplay;
3529 3599
3530 atomic; 3600 atomic;
… …
3537 use POSIX (); 3607 use POSIX ();
3538 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};
3539 3609
3540 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3541 }; 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";
3542 3615
3543 main_loop; 3616 main_loop;
3544} 3617}
3545 3618
3546############################################################################# 3619#############################################################################
… …
3548 3621
3549# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3550BEGIN { 3623BEGIN {
3551 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3552 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3553 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3554 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3555 }; 3628 };
3556 } 3629 }
3557} 3630}
3558 3631
3559sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3560 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3561 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3562 3637
3563 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3564 3639
3565 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3566 3641
3567 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3568 or return; 3643 or return;
3569 3644
3570 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3571 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3572 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3585 or return; 3660 or return;
3586 3661
3587 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3588 and return; 3663 and return;
3589 3664
3590 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3591 3666
3592 1 3667 1
3593} 3668}
3594 3669
3595our $uuid_lock; 3670our $uuid_lock;
… …
3721 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3722 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3723 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3724# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3725 } 3800 }
3726 warn "cleared package $pkg\n";#d#
3727} 3801}
3728 3802
3729sub do_reload_perl() { 3803sub do_reload_perl() {
3730 # can/must only be called in main 3804 # can/must only be called in main
3731 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3732 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3733 return; 3807 return;
3734 } 3808 }
3735 3809
3736 return if $RELOAD++; 3810 return if $RELOAD++;
3737 3811
3738 my $t1 = EV::time; 3812 my $t1 = AE::time;
3739 3813
3740 while ($RELOAD) { 3814 while ($RELOAD) {
3741 warn "reloading..."; 3815 warn "reloading...";
3742 3816
3743 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3846 3920
3847 warn "reloaded"; 3921 warn "reloaded";
3848 --$RELOAD; 3922 --$RELOAD;
3849 } 3923 }
3850 3924
3851 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3852 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3853}; 3927};
3854 3928
3855our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3856 3930
… …
3859 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3860 3934
3861 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3862 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3863 3937
3864 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3865 do_reload_perl; 3939 do_reload_perl;
3866 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3867 }; 3941 };
3868 }; 3942 };
3869} 3943}
… …
3909 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3910 return; 3984 return;
3911 } 3985 }
3912 3986
3913 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3914 3990
3915 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3916 $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.;
3917 Coro::async_pool { 3993 Coro::async_pool {
3918 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3941} 4017}
3942 4018
3943{ 4019{
3944 # configure BDB 4020 # configure BDB
3945 4021
3946 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3947 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3948 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3949 4025
3950 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3951 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;

Diff Legend

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