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.500 by root, Sat Jan 16 00:08:33 2010 UTC vs.
Revision 1.530 by root, Wed Apr 28 21:05:33 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.
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
260 270
261 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
262 272
263 if ($Coro::current == $Coro::main) {#d# 273 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 275 return;#d#
266 }#d# 276 }#d#
267 277
268 # kill coroutine otherwise 278 # kill coroutine otherwise
… …
396} 406}
397 407
398=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
399 409
400Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 411get spread over time.
402 412
403=cut 413=cut
404 414
405sub periodic($$) { 415sub periodic($$) {
406 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
423 433
424=cut 434=cut
425 435
426our @SLOT_QUEUE; 436our @SLOT_QUEUE;
427our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
428 439
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
432 443
433 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
434 446
435 while () { 447 while () {
436 next_job: 448 next_job:
449
437 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 451
439 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 456 $job->[2]->send;
443 Coro::cede; 457 Coro::cede;
444 goto next_job; 458 goto next_job;
445 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 461 }
447 } 462 }
448 463
449 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 467 $signal->wait;
453 } else { 468 } else {
469 $busy = 0;
454 Coro::schedule; 470 Coro::schedule;
455 } 471 }
456 } 472 }
457}; 473};
458 474
459sub get_slot($;$$) { 475sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
461 477
462 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
463 479
464 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
465 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
466 483
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
496 513
497sub sync_job(&) { 514sub sync_job(&) {
498 my ($job) = @_; 515 my ($job) = @_;
499 516
500 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 518 my $time = AE::time;
502 519
503 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
505 522
506 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 540 } else {
524 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
525 } 542 }
526 } 543 }
527 544
528 my $time = EV::time - $time; 545 my $time = AE::time - $time;
529 546
530 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
531 548
532 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
533 } else { 550 } else {
… …
577 reset_signals; 594 reset_signals;
578 &$cb 595 &$cb
579 }, @args; 596 }, @args;
580 597
581 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
582} 610}
583 611
584=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
585 613
586=cut 614=cut
… …
1167 1195
1168 sync_job { 1196 sync_job {
1169 if (length $$rdata) { 1197 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1173 1202
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1234 $av = $st->{objs}; 1263 $av = $st->{objs};
1235 } 1264 }
1236 1265
1237 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1240 1270
1241 ($data, $av) 1271 ($data, $av)
1242} 1272}
1243 1273
1244=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1303} 1333}
1304 1334
1305use File::Glob (); 1335use File::Glob ();
1306 1336
1307cf::player->attach ( 1337cf::player->attach (
1308 on_command => sub { 1338 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1310 1340
1311 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1312 or return; 1342 or return;
1313 1343
… …
1392 . "\n};\n1"; 1422 . "\n};\n1";
1393 1423
1394 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1395 } 1425 }
1396 1426
1427 my $pass = 0;
1397 my %done; 1428 my %done;
1398 while (%todo) { 1429 while (%todo) {
1399 my $progress; 1430 my $progress;
1400 1431
1432 ++$pass;
1433
1434 ext:
1401 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1437 next ext
1404 unless exists $done{$_}; 1438 unless exists $done{$_};
1405 } 1439 }
1406 1440
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1442
1409 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1447
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1449 if exists $v->{meta}{mandatory};
1417 1450
1418 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1419 } 1460 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1461 }
1425 1462
1426 skip: 1463 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1429 } 1471 }
1430 }; 1472 };
1431} 1473}
1432 1474
1433############################################################################# 1475#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1518 } 1560 }
1519 } 1561 }
1520} 1562}
1521 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1522sub save($) { 1577sub save($) {
1523 my ($pl) = @_; 1578 my ($pl) = @_;
1524 1579
1525 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1526 1581
… …
1531 1586
1532 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1534 1589
1535 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1594
1537 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1596 cf::cede_to_tick;
1539} 1597}
1540 1598
… …
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1636
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580 $pl->deactivate; 1638 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1584 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1585 1642
1586 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1642 \@logins 1699 \@logins
1643} 1700}
1644 1701
1645=item $player->maps 1702=item $player->maps
1646 1703
1704=item cf::player::maps $login
1705
1647Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1648player. May block. 1707player. May block.
1649 1708
1650=cut 1709=cut
1651 1710
… …
1713=cut 1772=cut
1714 1773
1715sub find_by_path($) { 1774sub find_by_path($) {
1716 my ($path) = @_; 1775 my ($path) = @_;
1717 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1718 my ($match, $specificity); 1779 my ($match, $specificity);
1719 1780
1720 for my $region (list) { 1781 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1815
1755 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1817 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1846
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1848}
1788 1849
1789# also paths starting with '/' 1850# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1852
1792sub thawer_merge { 1853sub thawer_merge {
1793 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1794 1855
1795 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
2077 } 2138 }
2078 2139
2079 $self->post_load; 2140 $self->post_load;
2080} 2141}
2081 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2082sub customise_for { 2146sub customise_for {
2083 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2084 2148
2085 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2150 if $self->per_player;
… …
2102 or next; 2166 or next;
2103 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2104 or next; 2168 or next;
2105 $neigh->load; 2169 $neigh->load;
2106 2170
2171 # now find the diagonal neighbours
2107 push @neigh, 2172 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2175 }
2111 2176
… …
2163 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2164 2229
2165 () 2230 ()
2166} 2231}
2167 2232
2233# common code, used by both ->save and ->swapout
2168sub save { 2234sub _save {
2169 my ($self) = @_; 2235 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2236
2173 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2174 2238
2175 return unless $self->dirty; 2239 return unless $self->dirty;
2176 2240
… …
2196 } else { 2260 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2262 }
2199} 2263}
2200 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2201sub swap_out { 2273sub swap_out {
2202 my ($self) = @_; 2274 my ($self) = @_;
2203 2275
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2277
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2212 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2214 2332
2215 $self->deactivate; 2333 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2335 $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 2336
2263 $self->unlink_save; 2337 $self->unlink_save;
2264 $self->destroy; 2338 $self->destroy;
2265} 2339}
2266 2340
… …
2274 2348
2275 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2276 2350
2277 $self->unlink_save; 2351 $self->unlink_save;
2278 2352
2279 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2358
… …
2514 2588
2515Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2516 2590
2517The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2520map. 2594map.
2521 2595
2522Will never block. 2596Will never block.
2523 2597
2524=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2546 my ($self) = @_; 2620 my ($self) = @_;
2547 2621
2548 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2549 2623
2624 ++$self->{_link_recursion};
2625
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2627
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2554 2630
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2632}
2557 2633
2558sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2560 2636
… …
2585 $map->load_neighbours; 2661 $map->load_neighbours;
2586 2662
2587 return unless $self->contr->active; 2663 return unless $self->contr->active;
2588 2664
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2591 2667 # entering was successful
2668 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2670 $self->activate_recursive;
2594} 2671 }
2595 2672
2673}
2674
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2676
2598Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
… …
2608 2687
2609our $GOTOGEN; 2688our $GOTOGEN;
2610 2689
2611sub cf::object::player::goto { 2690sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2613 2698
2614 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2701
2617 $self->enter_link; 2702 $self->enter_link;
… …
2641 my $map = eval { 2726 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2643 2728
2644 if ($map) { 2729 if ($map) {
2645 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2732 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2734 }
2650 2735
2651 $map 2736 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2662 } 2747 }
2663 2748
2664 $done->() if $done; 2749 $done->($self) if $done;
2665 })->prio (1); 2750 })->prio (1);
2666} 2751}
2667 2752
2668=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2669 2754
… …
3115 3200
3116 $coro 3201 $coro
3117} 3202}
3118 3203
3119cf::client->attach ( 3204cf::client->attach (
3120 on_destroy => sub { 3205 on_client_destroy => sub {
3121 my ($ns) = @_; 3206 my ($ns) = @_;
3122 3207
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3209 },
3125); 3210);
… …
3251=cut 3336=cut
3252 3337
3253sub register_script_function { 3338sub register_script_function {
3254 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3255 3340
3256 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3258} 3343}
3259 3344
3260=back 3345=back
3261 3346
3262=cut 3347=cut
… …
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3429
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3347 } else { 3432 } else {
3348 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3349 } 3434 }
3350 3435
3351 cf::cede_to_tick; 3436 cf::cede_to_tick;
3352 } 3437 }
3353 } 3438 }
3354 3439
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3441
3357 1 3442 1
3358} 3443}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3444
3380register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3382 3447
3383 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
… …
3422sub reload_treasures { 3487sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3425} 3490}
3426 3491
3492sub reload_sound {
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3494 or die "$DATADIR/sound $!";
3495
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3497
3498 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499 my $sound = $soundconf->{compat}[$_]
3500 or next;
3501
3502 my $face = cf::face::find "sound/$sound->[1]";
3503 cf::sound::set $sound->[0] => $face;
3504 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3505 }
3506
3507 while (my ($k, $v) = each %{$soundconf->{event}}) {
3508 my $face = cf::face::find "sound/$v";
3509 cf::sound::set $k => $face;
3510 }
3511}
3512
3427sub reload_resources { 3513sub reload_resources {
3428 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3429 3515
3430 reload_facedata; 3516 reload_facedata;
3517 reload_sound;
3431 reload_archetypes; 3518 reload_archetypes;
3432 reload_regions; 3519 reload_regions;
3433 reload_treasures; 3520 reload_treasures;
3434 3521
3435 warn "finished reloading resource files\n"; 3522 warn "finished reloading resource files\n";
… …
3442 or return; 3529 or return;
3443 3530
3444 local $/; 3531 local $/;
3445 *CFG = YAML::XS::Load scalar <$fh>; 3532 *CFG = YAML::XS::Load scalar <$fh>;
3446 3533
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3535
3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3536 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3537 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3451 3538
3452 if (exists $CFG{mlockall}) { 3539 if (exists $CFG{mlockall}) {
… …
3493 3580
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3582 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503 3585
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3586 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505 3587
3506 # we must not ever block the main coroutine 3588 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3589 local $Coro::idle = sub {
… …
3513 }; 3595 };
3514 3596
3515 evthread_start IO::AIO::poll_fileno; 3597 evthread_start IO::AIO::poll_fileno;
3516 3598
3517 cf::sync_job { 3599 cf::sync_job {
3600 cf::init_experience;
3601 cf::init_anim;
3602 cf::init_attackmess;
3603 cf::init_dynamic;
3604
3518 cf::load_settings; 3605 cf::load_settings;
3519 cf::load_materials; 3606 cf::load_materials;
3520 3607
3521 reload_resources; 3608 reload_resources;
3522 reload_config; 3609 reload_config;
3523 db_init; 3610 db_init;
3524 3611
3525 cf::init_uuid; 3612 cf::init_uuid;
3526 cf::init_signals; 3613 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3614 cf::init_skills;
3529 3615
3530 cf::init_beforeplay; 3616 cf::init_beforeplay;
3531 3617
3532 atomic; 3618 atomic;
… …
3539 use POSIX (); 3625 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3626 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541 3627
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3628 (pop @POST_INIT)->(0) while @POST_INIT;
3543 }; 3629 };
3630
3631 cf::object::thawer::errors_are_fatal 0;
3632 warn "parse errors in files are no longer fatal from this point on.\n";
3544 3633
3545 main_loop; 3634 main_loop;
3546} 3635}
3547 3636
3548############################################################################# 3637#############################################################################
… …
3550 3639
3551# install some emergency cleanup handlers 3640# install some emergency cleanup handlers
3552BEGIN { 3641BEGIN {
3553 our %SIGWATCHER = (); 3642 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 3643 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3644 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 3645 cf::cleanup "SIG$signal";
3557 }; 3646 };
3558 } 3647 }
3559} 3648}
3560 3649
3561sub write_runtime_sync { 3650sub write_runtime_sync {
3651 my $t0 = AE::time;
3652
3562 # first touch the runtime file to show we are still running: 3653 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3654 # the fsync below can take a very very long time.
3564 3655
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3656 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3657
3567 my $guard = cf::lock_acquire "write_runtime"; 3658 my $guard = cf::lock_acquire "write_runtime";
3568 3659
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3661 or return;
3571 3662
3572 my $value = $cf::RUNTIME + 90 + 10; 3663 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3664 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3665 # 60 allows for the watchdog to kill the server.
… …
3587 or return; 3678 or return;
3588 3679
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3681 and return;
3591 3682
3592 warn "runtime file written.\n"; 3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 3684
3594 1 3685 1
3595} 3686}
3596 3687
3597our $uuid_lock; 3688our $uuid_lock;
… …
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3814 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 3815 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 3816 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3817# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 3818 }
3728 warn "cleared package $pkg\n";#d#
3729} 3819}
3730 3820
3731sub do_reload_perl() { 3821sub do_reload_perl() {
3732 # can/must only be called in main 3822 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 3823 if (in_main) {
3734 warn "can only reload from main coroutine"; 3824 warn "can only reload from main coroutine";
3735 return; 3825 return;
3736 } 3826 }
3737 3827
3738 return if $RELOAD++; 3828 return if $RELOAD++;
3739 3829
3740 my $t1 = EV::time; 3830 my $t1 = AE::time;
3741 3831
3742 while ($RELOAD) { 3832 while ($RELOAD) {
3743 warn "reloading..."; 3833 warn "reloading...";
3744 3834
3745 warn "entering sync_job"; 3835 warn "entering sync_job";
… …
3848 3938
3849 warn "reloaded"; 3939 warn "reloaded";
3850 --$RELOAD; 3940 --$RELOAD;
3851 } 3941 }
3852 3942
3853 $t1 = EV::time - $t1; 3943 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 3944 warn "reload completed in ${t1}s\n";
3855}; 3945};
3856 3946
3857our $RELOAD_WATCHER; # used only during reload 3947our $RELOAD_WATCHER; # used only during reload
3858 3948
… …
3861 # coro crashes during coro_state_free->destroy here. 3951 # coro crashes during coro_state_free->destroy here.
3862 3952
3863 $RELOAD_WATCHER ||= cf::async { 3953 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 3954 Coro::AIO::aio_wait cache_extensions;
3865 3955
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3956 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 3957 do_reload_perl;
3868 undef $RELOAD_WATCHER; 3958 undef $RELOAD_WATCHER;
3869 }; 3959 };
3870 }; 3960 };
3871} 3961}
… …
3911 unless ++$bug_warning > 10; 4001 unless ++$bug_warning > 10;
3912 return; 4002 return;
3913 } 4003 }
3914 4004
3915 cf::server_tick; # one server iteration 4005 cf::server_tick; # one server iteration
4006
4007 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3916 4008
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4009 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4010 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3919 Coro::async_pool { 4011 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4012 $Coro::current->{desc} = "runtime saver";
… …
3943} 4035}
3944 4036
3945{ 4037{
3946 # configure BDB 4038 # configure BDB
3947 4039
3948 BDB::min_parallel 8; 4040 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4041 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4042 $AnyEvent::BDB::WATCHER->priority (1);
3951 4043
3952 unless ($DB_ENV) { 4044 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4045 $DB_ENV = BDB::db_env_create;

Diff Legend

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