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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.530 by root, Wed Apr 28 21:05:33 2010 UTC

… …
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) = @_;
… …
503 513
504sub sync_job(&) { 514sub sync_job(&) {
505 my ($job) = @_; 515 my ($job) = @_;
506 516
507 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
508 my $time = EV::time; 518 my $time = AE::time;
509 519
510 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
512 522
513 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
530 } else { 540 } else {
531 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
532 } 542 }
533 } 543 }
534 544
535 my $time = EV::time - $time; 545 my $time = AE::time - $time;
536 546
537 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
538 548
539 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
540 } else { 550 } else {
… …
584 reset_signals; 594 reset_signals;
585 &$cb 595 &$cb
586 }, @args; 596 }, @args;
587 597
588 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 )
589} 610}
590 611
591=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
592 613
593=cut 614=cut
… …
1174 1195
1175 sync_job { 1196 sync_job {
1176 if (length $$rdata) { 1197 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1180 1202
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1241 $av = $st->{objs}; 1263 $av = $st->{objs};
1242 } 1264 }
1243 1265
1244 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1247 1270
1248 ($data, $av) 1271 ($data, $av)
1249} 1272}
1250 1273
1251=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1310} 1333}
1311 1334
1312use File::Glob (); 1335use File::Glob ();
1313 1336
1314cf::player->attach ( 1337cf::player->attach (
1315 on_command => sub { 1338 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1317 1340
1318 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1319 or return; 1342 or return;
1320 1343
… …
1399 . "\n};\n1"; 1422 . "\n};\n1";
1400 1423
1401 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1402 } 1425 }
1403 1426
1427 my $pass = 0;
1404 my %done; 1428 my %done;
1405 while (%todo) { 1429 while (%todo) {
1406 my $progress; 1430 my $progress;
1407 1431
1432 ++$pass;
1433
1434 ext:
1408 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1437 next ext
1411 unless exists $done{$_}; 1438 unless exists $done{$_};
1412 } 1439 }
1413 1440
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1442
1416 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1447
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1449 if exists $v->{meta}{mandatory};
1424 1450
1425 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;
1426 } 1460 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1461 }
1432 1462
1433 skip: 1463 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 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 }
1436 } 1471 }
1437 }; 1472 };
1438} 1473}
1439 1474
1440############################################################################# 1475#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1525 } 1560 }
1526 } 1561 }
1527} 1562}
1528 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
1529sub save($) { 1577sub save($) {
1530 my ($pl) = @_; 1578 my ($pl) = @_;
1531 1579
1532 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1533 1581
… …
1538 1586
1539 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1541 1589
1542 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];
1543 1594
1544 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1596 cf::cede_to_tick;
1546} 1597}
1547 1598
… …
1584 $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
1585 1636
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1587 $pl->deactivate; 1638 $pl->deactivate;
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1591 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1592 1642
1593 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1649 \@logins 1699 \@logins
1650} 1700}
1651 1701
1652=item $player->maps 1702=item $player->maps
1653 1703
1704=item cf::player::maps $login
1705
1654Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1655player. May block. 1707player. May block.
1656 1708
1657=cut 1709=cut
1658 1710
… …
1720=cut 1772=cut
1721 1773
1722sub find_by_path($) { 1774sub find_by_path($) {
1723 my ($path) = @_; 1775 my ($path) = @_;
1724 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1725 my ($match, $specificity); 1779 my ($match, $specificity);
1726 1780
1727 for my $region (list) { 1781 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1760 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
1761 1815
1762 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1817 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1792 1846
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1848}
1795 1849
1796# also paths starting with '/' 1850# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1852
1799sub thawer_merge { 1853sub thawer_merge {
1800 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1801 1855
1802 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
2084 } 2138 }
2085 2139
2086 $self->post_load; 2140 $self->post_load;
2087} 2141}
2088 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
2089sub customise_for { 2146sub customise_for {
2090 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2091 2148
2092 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2150 if $self->per_player;
… …
2109 or next; 2166 or next;
2110 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2111 or next; 2168 or next;
2112 $neigh->load; 2169 $neigh->load;
2113 2170
2171 # now find the diagonal neighbours
2114 push @neigh, 2172 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 } 2175 }
2118 2176
… …
2170 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2171 2229
2172 () 2230 ()
2173} 2231}
2174 2232
2233# common code, used by both ->save and ->swapout
2175sub save { 2234sub _save {
2176 my ($self) = @_; 2235 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2236
2180 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2181 2238
2182 return unless $self->dirty; 2239 return unless $self->dirty;
2183 2240
… …
2203 } else { 2260 } else {
2204 $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);
2205 } 2262 }
2206} 2263}
2207 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2208sub swap_out { 2273sub swap_out {
2209 my ($self) = @_; 2274 my ($self) = @_;
2210 2275
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2277
2216 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2219 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2220 $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};
2221 2332
2222 $self->deactivate; 2333 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2335 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2336
2270 $self->unlink_save; 2337 $self->unlink_save;
2271 $self->destroy; 2338 $self->destroy;
2272} 2339}
2273 2340
… …
2281 2348
2282 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2283 2350
2284 $self->unlink_save; 2351 $self->unlink_save;
2285 2352
2286 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2358
… …
2521 2588
2522Freezes 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}>).
2523 2590
2524The 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.
2525for 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,
2526though, 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
2527map. 2594map.
2528 2595
2529Will never block. 2596Will never block.
2530 2597
2531=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2553 my ($self) = @_; 2620 my ($self) = @_;
2554 2621
2555 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2556 2623
2624 ++$self->{_link_recursion};
2625
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2627
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2561 2630
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2632}
2564 2633
2565sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2567 2636
… …
2592 $map->load_neighbours; 2661 $map->load_neighbours;
2593 2662
2594 return unless $self->contr->active; 2663 return unless $self->contr->active;
2595 2664
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2598 2667 # entering was successful
2668 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2670 $self->activate_recursive;
2601} 2671 }
2602 2672
2673}
2674
2603=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)]])
2604 2676
2605Moves 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
2606her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2607that 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
2608the 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
… …
2615 2687
2616our $GOTOGEN; 2688our $GOTOGEN;
2617 2689
2618sub cf::object::player::goto { 2690sub cf::object::player::goto {
2619 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 }
2620 2698
2621 # 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
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2701
2624 $self->enter_link; 2702 $self->enter_link;
… …
2648 my $map = eval { 2726 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2650 2728
2651 if ($map) { 2729 if ($map) {
2652 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2732 } else {
2655 $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);
2656 } 2734 }
2657 2735
2658 $map 2736 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2669 } 2747 }
2670 2748
2671 $done->() if $done; 2749 $done->($self) if $done;
2672 })->prio (1); 2750 })->prio (1);
2673} 2751}
2674 2752
2675=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2676 2754
… …
3122 3200
3123 $coro 3201 $coro
3124} 3202}
3125 3203
3126cf::client->attach ( 3204cf::client->attach (
3127 on_destroy => sub { 3205 on_client_destroy => sub {
3128 my ($ns) = @_; 3206 my ($ns) = @_;
3129 3207
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3209 },
3132); 3210);
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3429
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3354 } else { 3432 } else {
3355 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3356 } 3434 }
3357 3435
3358 cf::cede_to_tick; 3436 cf::cede_to_tick;
3359 } 3437 }
3360 } 3438 }
3361 3439
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3441
3364 1 3442 1
3365} 3443}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3444
3387register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3389 3447
3390 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3487sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3432} 3490}
3433 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
3434sub reload_resources { 3513sub reload_resources {
3435 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3436 3515
3437 reload_facedata; 3516 reload_facedata;
3517 reload_sound;
3438 reload_archetypes; 3518 reload_archetypes;
3439 reload_regions; 3519 reload_regions;
3440 reload_treasures; 3520 reload_treasures;
3441 3521
3442 warn "finished reloading resource files\n"; 3522 warn "finished reloading resource files\n";
… …
3449 or return; 3529 or return;
3450 3530
3451 local $/; 3531 local $/;
3452 *CFG = YAML::XS::Load scalar <$fh>; 3532 *CFG = YAML::XS::Load scalar <$fh>;
3453 3533
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3535
3456 $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};
3457 $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};
3458 3538
3459 if (exists $CFG{mlockall}) { 3539 if (exists $CFG{mlockall}) {
… …
3500 3580
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 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.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3585
3511 $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
3512 3587
3513 # we must not ever block the main coroutine 3588 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3589 local $Coro::idle = sub {
… …
3520 }; 3595 };
3521 3596
3522 evthread_start IO::AIO::poll_fileno; 3597 evthread_start IO::AIO::poll_fileno;
3523 3598
3524 cf::sync_job { 3599 cf::sync_job {
3600 cf::init_experience;
3601 cf::init_anim;
3602 cf::init_attackmess;
3603 cf::init_dynamic;
3604
3525 cf::load_settings; 3605 cf::load_settings;
3526 cf::load_materials; 3606 cf::load_materials;
3527 3607
3528 reload_resources; 3608 reload_resources;
3529 reload_config; 3609 reload_config;
3530 db_init; 3610 db_init;
3531 3611
3532 cf::init_uuid; 3612 cf::init_uuid;
3533 cf::init_signals; 3613 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3614 cf::init_skills;
3536 3615
3537 cf::init_beforeplay; 3616 cf::init_beforeplay;
3538 3617
3539 atomic; 3618 atomic;
… …
3546 use POSIX (); 3625 use POSIX ();
3547 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};
3548 3627
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3628 (pop @POST_INIT)->(0) while @POST_INIT;
3550 }; 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";
3551 3633
3552 main_loop; 3634 main_loop;
3553} 3635}
3554 3636
3555############################################################################# 3637#############################################################################
… …
3557 3639
3558# install some emergency cleanup handlers 3640# install some emergency cleanup handlers
3559BEGIN { 3641BEGIN {
3560 our %SIGWATCHER = (); 3642 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3643 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3644 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3645 cf::cleanup "SIG$signal";
3564 }; 3646 };
3565 } 3647 }
3566} 3648}
3567 3649
3568sub write_runtime_sync { 3650sub write_runtime_sync {
3651 my $t0 = AE::time;
3652
3569 # first touch the runtime file to show we are still running: 3653 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3654 # the fsync below can take a very very long time.
3571 3655
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3656 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3657
3574 my $guard = cf::lock_acquire "write_runtime"; 3658 my $guard = cf::lock_acquire "write_runtime";
3575 3659
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3661 or return;
3578 3662
3579 my $value = $cf::RUNTIME + 90 + 10; 3663 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3664 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3665 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3678 or return;
3595 3679
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3681 and return;
3598 3682
3599 warn "runtime file written.\n"; 3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3684
3601 1 3685 1
3602} 3686}
3603 3687
3604our $uuid_lock; 3688our $uuid_lock;
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3814 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3815 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3816 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3817# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3818 }
3735 warn "cleared package $pkg\n";#d#
3736} 3819}
3737 3820
3738sub do_reload_perl() { 3821sub do_reload_perl() {
3739 # can/must only be called in main 3822 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3823 if (in_main) {
3741 warn "can only reload from main coroutine"; 3824 warn "can only reload from main coroutine";
3742 return; 3825 return;
3743 } 3826 }
3744 3827
3745 return if $RELOAD++; 3828 return if $RELOAD++;
3746 3829
3747 my $t1 = EV::time; 3830 my $t1 = AE::time;
3748 3831
3749 while ($RELOAD) { 3832 while ($RELOAD) {
3750 warn "reloading..."; 3833 warn "reloading...";
3751 3834
3752 warn "entering sync_job"; 3835 warn "entering sync_job";
… …
3855 3938
3856 warn "reloaded"; 3939 warn "reloaded";
3857 --$RELOAD; 3940 --$RELOAD;
3858 } 3941 }
3859 3942
3860 $t1 = EV::time - $t1; 3943 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 3944 warn "reload completed in ${t1}s\n";
3862}; 3945};
3863 3946
3864our $RELOAD_WATCHER; # used only during reload 3947our $RELOAD_WATCHER; # used only during reload
3865 3948
… …
3868 # coro crashes during coro_state_free->destroy here. 3951 # coro crashes during coro_state_free->destroy here.
3869 3952
3870 $RELOAD_WATCHER ||= cf::async { 3953 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 3954 Coro::AIO::aio_wait cache_extensions;
3872 3955
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3956 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 3957 do_reload_perl;
3875 undef $RELOAD_WATCHER; 3958 undef $RELOAD_WATCHER;
3876 }; 3959 };
3877 }; 3960 };
3878} 3961}
… …
3919 return; 4002 return;
3920 } 4003 }
3921 4004
3922 cf::server_tick; # one server iteration 4005 cf::server_tick; # one server iteration
3923 4006
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4007 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925 4008
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4009 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $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.;
3928 Coro::async_pool { 4011 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4012 $Coro::current->{desc} = "runtime saver";

Diff Legend

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