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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.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.
… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE;
113 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 118our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
118 120
… …
163 165
164our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
165 167
166sub cf::map::normalise; 168sub cf::map::normalise;
167 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
168############################################################################# 174#############################################################################
169 175
170%REFLECT = (); 176%REFLECT = ();
171for (@REFLECT) { 177for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
… …
259$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
261 267
262 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
263 269
264 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 272 return;#d#
267 }#d# 273 }#d#
268 274
269 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
397} 403}
398 404
399=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
400 406
401Like 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
402get spread over timer. 408get spread over time.
403 409
404=cut 410=cut
405 411
406sub periodic($$) { 412sub periodic($$) {
407 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
424 430
425=cut 431=cut
426 432
427our @SLOT_QUEUE; 433our @SLOT_QUEUE;
428our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
429 436
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
433 440
434 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
435 443
436 while () { 444 while () {
437 next_job: 445 next_job:
446
438 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 448
440 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 453 $job->[2]->send;
444 Coro::cede; 454 Coro::cede;
445 goto next_job; 455 goto next_job;
446 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 458 }
448 } 459 }
449 460
450 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 464 $signal->wait;
454 } else { 465 } else {
466 $busy = 0;
455 Coro::schedule; 467 Coro::schedule;
456 } 468 }
457 } 469 }
458}; 470};
459 471
460sub get_slot($;$$) { 472sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
462 474
463 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
464 476
465 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
466 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
467 480
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
497 510
498sub sync_job(&) { 511sub sync_job(&) {
499 my ($job) = @_; 512 my ($job) = @_;
500 513
501 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 515 my $time = AE::time;
503 516
504 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
506 519
507 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
524 } else { 537 } else {
525 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
526 } 539 }
527 } 540 }
528 541
529 my $time = EV::time - $time; 542 my $time = AE::time - $time;
530 543
531 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
532 545
533 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
534 } else { 547 } else {
… …
578 reset_signals; 591 reset_signals;
579 &$cb 592 &$cb
580 }, @args; 593 }, @args;
581 594
582 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 )
583} 607}
584 608
585=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
586 610
587=cut 611=cut
… …
1304} 1328}
1305 1329
1306use File::Glob (); 1330use File::Glob ();
1307 1331
1308cf::player->attach ( 1332cf::player->attach (
1309 on_command => sub { 1333 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1311 1335
1312 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1313 or return; 1337 or return;
1314 1338
… …
1393 . "\n};\n1"; 1417 . "\n};\n1";
1394 1418
1395 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1396 } 1420 }
1397 1421
1422 my $pass = 0;
1398 my %done; 1423 my %done;
1399 while (%todo) { 1424 while (%todo) {
1400 my $progress; 1425 my $progress;
1401 1426
1427 ++$pass;
1428
1429 ext:
1402 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1432 next ext
1405 unless exists $done{$_}; 1433 unless exists $done{$_};
1406 } 1434 }
1407 1435
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1437
1410 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1442
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1444 if exists $v->{meta}{mandatory};
1418 1445
1419 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;
1420 } 1455 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1456 }
1426 1457
1427 skip: 1458 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 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 }
1430 } 1466 }
1431 }; 1467 };
1432} 1468}
1433 1469
1434############################################################################# 1470#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1519 } 1555 }
1520 } 1556 }
1521} 1557}
1522 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
1523sub save($) { 1572sub save($) {
1524 my ($pl) = @_; 1573 my ($pl) = @_;
1525 1574
1526 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1527 1576
… …
1532 1581
1533 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1535 1584
1536 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];
1537 1589
1538 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1591 cf::cede_to_tick;
1540} 1592}
1541 1593
… …
1643 \@logins 1695 \@logins
1644} 1696}
1645 1697
1646=item $player->maps 1698=item $player->maps
1647 1699
1700=item cf::player::maps $login
1701
1648Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1649player. May block. 1703player. May block.
1650 1704
1651=cut 1705=cut
1652 1706
… …
1714=cut 1768=cut
1715 1769
1716sub find_by_path($) { 1770sub find_by_path($) {
1717 my ($path) = @_; 1771 my ($path) = @_;
1718 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1719 my ($match, $specificity); 1775 my ($match, $specificity);
1720 1776
1721 for my $region (list) { 1777 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1754 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
1755 1811
1756 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1813 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1786 1842
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1844}
1789 1845
1790# also paths starting with '/' 1846# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1848
1793sub thawer_merge { 1849sub thawer_merge {
1794 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1795 1851
1796 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
2010 2066
2011 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2012 } 2068 }
2013} 2069}
2014 2070
2015sub pre_load { } 2071sub pre_load { }
2016sub post_load { } 2072#sub post_load { } # XS
2017 2073
2018sub load { 2074sub load {
2019 my ($self) = @_; 2075 my ($self) = @_;
2020 2076
2021 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2078 } 2134 }
2079 2135
2080 $self->post_load; 2136 $self->post_load;
2081} 2137}
2082 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
2083sub customise_for { 2142sub customise_for {
2084 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2085 2144
2086 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2146 if $self->per_player;
… …
2164 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2165 2224
2166 () 2225 ()
2167} 2226}
2168 2227
2228# common code, used by both ->save and ->swapout
2169sub save { 2229sub _save {
2170 my ($self) = @_; 2230 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2231
2174 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2175 2233
2176 return unless $self->dirty; 2234 return unless $self->dirty;
2177 2235
… …
2197 } else { 2255 } else {
2198 $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);
2199 } 2257 }
2200} 2258}
2201 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2202sub swap_out { 2268sub swap_out {
2203 my ($self) = @_; 2269 my ($self) = @_;
2204 2270
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2272
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2213 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2214 $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};
2215 2327
2216 $self->deactivate; 2328 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2330 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2331
2264 $self->unlink_save; 2332 $self->unlink_save;
2265 $self->destroy; 2333 $self->destroy;
2266} 2334}
2267 2335
… …
2275 2343
2276 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2277 2345
2278 $self->unlink_save; 2346 $self->unlink_save;
2279 2347
2280 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2353
… …
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2620
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2555 2623
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2625}
2558 2626
2559sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2561 2629
… …
3116 3184
3117 $coro 3185 $coro
3118} 3186}
3119 3187
3120cf::client->attach ( 3188cf::client->attach (
3121 on_destroy => sub { 3189 on_client_destroy => sub {
3122 my ($ns) = @_; 3190 my ($ns) = @_;
3123 3191
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3193 },
3126); 3194);
… …
3142our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3143 3211
3144$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3145 3213
3146$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3149 sort time 3217 sort time
3150)); 3218));
3151 3219
3152# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3206 3274
3207 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3208 3276
3277 my @res;
3209 local $_; 3278 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3279
3212 my $eval = 3280 my $eval =
3213 "do {\n" 3281 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3284 . $code
3217 . "\n}" 3285 . "\n}"
3218 ; 3286 ;
3219 3287
3288 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3223 3297
3224 if ($@) { 3298 if ($@) {
3225 warn "$@"; 3299 warn "$@";
3226 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3246=cut 3320=cut
3247 3321
3248sub register_script_function { 3322sub register_script_function {
3249 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3250 3324
3251 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3253} 3327}
3254 3328
3255=back 3329=back
3256 3330
3257=cut 3331=cut
… …
3278 3352
3279 $facedata->{version} == 2 3353 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3355
3282 # 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]);
3283 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3359 type => FT_RSRC,
3285 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),
3286 }; 3362 };
3287 cf::cede_to_tick; 3363 cf::cede_to_tick;
3288 3364
3289 { 3365 {
3290 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3370
3295 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3375
3300 cf::cede_to_tick; 3376 cf::cede_to_tick;
3301 } 3377 }
3302 3378
3303 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3327 3403
3328 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3329 } 3405 }
3330 3406
3331 { 3407 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3335 3409
3336 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3413
3341 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3356 } else { 3416 } else {
3357 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3358 } 3418 }
3359 3419
… …
3502 3562
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 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.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3567
3513 $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
3514 3569
3515 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3522 }; 3577 };
3523 3578
3524 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3525 3580
3526 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3527 reload_resources; 3590 reload_resources;
3528 reload_config; 3591 reload_config;
3529 db_init; 3592 db_init;
3530 3593
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3594 cf::init_uuid;
3534 cf::init_signals; 3595 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3596 cf::init_skills;
3537 3597
3538 cf::init_beforeplay; 3598 cf::init_beforeplay;
3539 3599
3540 atomic; 3600 atomic;
… …
3547 use POSIX (); 3607 use POSIX ();
3548 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};
3549 3609
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 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";
3552 3615
3553 main_loop; 3616 main_loop;
3554} 3617}
3555 3618
3556############################################################################# 3619#############################################################################
… …
3558 3621
3559# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3560BEGIN { 3623BEGIN {
3561 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3565 }; 3628 };
3566 } 3629 }
3567} 3630}
3568 3631
3569sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3570 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3572 3637
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3639
3575 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3576 3641
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3643 or return;
3579 3644
3580 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3660 or return;
3596 3661
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3663 and return;
3599 3664
3600 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3666
3602 1 3667 1
3603} 3668}
3604 3669
3605our $uuid_lock; 3670our $uuid_lock;
… …
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3800 }
3736 warn "cleared package $pkg\n";#d#
3737} 3801}
3738 3802
3739sub do_reload_perl() { 3803sub do_reload_perl() {
3740 # can/must only be called in main 3804 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3742 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3743 return; 3807 return;
3744 } 3808 }
3745 3809
3746 return if $RELOAD++; 3810 return if $RELOAD++;
3747 3811
3748 my $t1 = EV::time; 3812 my $t1 = AE::time;
3749 3813
3750 while ($RELOAD) { 3814 while ($RELOAD) {
3751 warn "reloading..."; 3815 warn "reloading...";
3752 3816
3753 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3856 3920
3857 warn "reloaded"; 3921 warn "reloaded";
3858 --$RELOAD; 3922 --$RELOAD;
3859 } 3923 }
3860 3924
3861 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3863}; 3927};
3864 3928
3865our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3866 3930
… …
3869 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3870 3934
3871 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3873 3937
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 3939 do_reload_perl;
3876 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3877 }; 3941 };
3878 }; 3942 };
3879} 3943}
… …
3896 3960
3897our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3899 3963
3900sub wait_for_tick { 3964sub wait_for_tick {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 3966
3903 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 3969 $signal->wait;
3906} 3970}
3907 3971
3908sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 3974
3911 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 3977 $signal->wait;
3914} 3978}
… …
3919 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3920 return; 3984 return;
3921 } 3985 }
3922 3986
3923 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#
3924 3990
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $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.;
3927 Coro::async_pool { 3993 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3951} 4017}
3952 4018
3953{ 4019{
3954 # configure BDB 4020 # configure BDB
3955 4021
3956 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3959 4025
3960 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;

Diff Legend

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