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.510 by root, Tue Apr 6 22:59:28 2010 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 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
… …
1422 if (length $@) { 1445 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1446 warn "$v->{path}: $@\n";
1424 1447
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1449 if exists $v->{meta}{mandatory};
1450
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1427 } else { 1453 } else {
1428 $done{$k} = delete $todo{$k}; 1454 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1455 push @EXTS, $v->{pkg};
1430 $progress = 1; 1456 $progress = 1;
1431 1457
… …
1533 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1534 } 1560 }
1535 } 1561 }
1536} 1562}
1537 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
1538sub save($) { 1577sub save($) {
1539 my ($pl) = @_; 1578 my ($pl) = @_;
1540 1579
1541 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1542 1581
… …
1547 1586
1548 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1550 1589
1551 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];
1552 1594
1553 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1596 cf::cede_to_tick;
1555} 1597}
1556 1598
… …
1593 $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
1594 1636
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1596 $pl->deactivate; 1638 $pl->deactivate;
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1600 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1601 1642
1602 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1658 \@logins 1699 \@logins
1659} 1700}
1660 1701
1661=item $player->maps 1702=item $player->maps
1662 1703
1704=item cf::player::maps $login
1705
1663Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1664player. May block. 1707player. May block.
1665 1708
1666=cut 1709=cut
1667 1710
… …
1728 1771
1729=cut 1772=cut
1730 1773
1731sub find_by_path($) { 1774sub find_by_path($) {
1732 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1733 1778
1734 my ($match, $specificity); 1779 my ($match, $specificity);
1735 1780
1736 for my $region (list) { 1781 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
… …
1801 1846
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1848}
1804 1849
1805# also paths starting with '/' 1850# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1852
1808sub thawer_merge { 1853sub thawer_merge {
1809 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1810 1855
1811 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
2121 or next; 2166 or next;
2122 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2123 or next; 2168 or next;
2124 $neigh->load; 2169 $neigh->load;
2125 2170
2171 # now find the diagonal neighbours
2126 push @neigh, 2172 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2175 }
2130 2176
… …
2182 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2183 2229
2184 () 2230 ()
2185} 2231}
2186 2232
2233# common code, used by both ->save and ->swapout
2187sub save { 2234sub _save {
2188 my ($self) = @_; 2235 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2236
2192 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2193 2238
2194 return unless $self->dirty; 2239 return unless $self->dirty;
2195 2240
… …
2215 } else { 2260 } else {
2216 $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);
2217 } 2262 }
2218} 2263}
2219 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2220sub swap_out { 2273sub swap_out {
2221 my ($self) = @_; 2274 my ($self) = @_;
2222 2275
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2277
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2231 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2232 $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};
2233 2332
2234 $self->deactivate; 2333 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2335 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2336
2282 $self->unlink_save; 2337 $self->unlink_save;
2283 $self->destroy; 2338 $self->destroy;
2284} 2339}
2285 2340
… …
2293 2348
2294 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2295 2350
2296 $self->unlink_save; 2351 $self->unlink_save;
2297 2352
2298 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2358
… …
2533 2588
2534Freezes 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}>).
2535 2590
2536The 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.
2537for 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,
2538though, 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
2539map. 2594map.
2540 2595
2541Will never block. 2596Will never block.
2542 2597
2543=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2565 my ($self) = @_; 2620 my ($self) = @_;
2566 2621
2567 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2568 2623
2624 ++$self->{_link_recursion};
2625
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2627
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2573 2630
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2632}
2576 2633
2577sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2579 2636
… …
2604 $map->load_neighbours; 2661 $map->load_neighbours;
2605 2662
2606 return unless $self->contr->active; 2663 return unless $self->contr->active;
2607 2664
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2610 2667 # entering was successful
2668 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2669 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2670 $self->activate_recursive;
2613} 2671 }
2614 2672
2673}
2674
2615=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)]])
2616 2676
2617Moves 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
2618her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2619that 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
2620the 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
… …
2627 2687
2628our $GOTOGEN; 2688our $GOTOGEN;
2629 2689
2630sub cf::object::player::goto { 2690sub cf::object::player::goto {
2631 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 }
2632 2698
2633 # 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
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2701
2636 $self->enter_link; 2702 $self->enter_link;
… …
2660 my $map = eval { 2726 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2662 2728
2663 if ($map) { 2729 if ($map) {
2664 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2732 } else {
2667 $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);
2668 } 2734 }
2669 2735
2670 $map 2736 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2681 } 2747 }
2682 2748
2683 $done->() if $done; 2749 $done->($self) if $done;
2684 })->prio (1); 2750 })->prio (1);
2685} 2751}
2686 2752
2687=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2688 2754
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3429
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3366 } else { 3432 } else {
3367 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3368 } 3434 }
3369 3435
3370 cf::cede_to_tick; 3436 cf::cede_to_tick;
3371 } 3437 }
3372 } 3438 }
3373 3439
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3441
3376 1 3442 1
3377} 3443}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3444
3399register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3401 3447
3402 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3487sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3444} 3490}
3445 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3446sub reload_resources { 3515sub reload_resources {
3447 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3448 3517
3449 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3450 reload_archetypes; 3520 reload_archetypes;
3451 reload_regions; 3521 reload_regions;
3452 reload_treasures; 3522 reload_treasures;
3453 3523
3454 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
… …
3461 or return; 3531 or return;
3462 3532
3463 local $/; 3533 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3465 3535
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3537
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3540
3471 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
… …
3512 3582
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3587
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3589
3525 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
… …
3532 }; 3597 };
3533 3598
3534 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3535 3600
3536 cf::sync_job { 3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3537 cf::load_settings; 3607 cf::load_settings;
3538 cf::load_materials; 3608 cf::load_materials;
3539 3609
3540 reload_resources; 3610 reload_resources;
3541 reload_config; 3611 reload_config;
… …
3557 use POSIX (); 3627 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559 3629
3560 (pop @POST_INIT)->(0) while @POST_INIT; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3561 }; 3631 };
3632
3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3562 3635
3563 main_loop; 3636 main_loop;
3564} 3637}
3565 3638
3566############################################################################# 3639#############################################################################
… …
3568 3641
3569# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3570BEGIN { 3643BEGIN {
3571 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3572 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3573 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3574 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3575 }; 3648 };
3576 } 3649 }
3577} 3650}
3578 3651
3579sub write_runtime_sync { 3652sub write_runtime_sync {
3580 my $t0 = EV::time; 3653 my $t0 = AE::time;
3581 3654
3582 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3583 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3584 3657
3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3607 or return; 3680 or return;
3608 3681
3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3610 and return; 3683 and return;
3611 3684
3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3613 3686
3614 1 3687 1
3615} 3688}
3616 3689
3617our $uuid_lock; 3690our $uuid_lock;
… …
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 } 3820 }
3748 warn "cleared package $pkg\n";#d#
3749} 3821}
3750 3822
3751sub do_reload_perl() { 3823sub do_reload_perl() {
3752 # can/must only be called in main 3824 # can/must only be called in main
3753 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3754 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3755 return; 3827 return;
3756 } 3828 }
3757 3829
3758 return if $RELOAD++; 3830 return if $RELOAD++;
3759 3831
3760 my $t1 = EV::time; 3832 my $t1 = AE::time;
3761 3833
3762 while ($RELOAD) { 3834 while ($RELOAD) {
3763 warn "reloading..."; 3835 warn "reloading...";
3764 3836
3765 warn "entering sync_job"; 3837 warn "entering sync_job";
… …
3868 3940
3869 warn "reloaded"; 3941 warn "reloaded";
3870 --$RELOAD; 3942 --$RELOAD;
3871 } 3943 }
3872 3944
3873 $t1 = EV::time - $t1; 3945 $t1 = AE::time - $t1;
3874 warn "reload completed in ${t1}s\n"; 3946 warn "reload completed in ${t1}s\n";
3875}; 3947};
3876 3948
3877our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3878 3950
… …
3881 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3882 3954
3883 $RELOAD_WATCHER ||= cf::async { 3955 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions; 3956 Coro::AIO::aio_wait cache_extensions;
3885 3957
3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3887 do_reload_perl; 3959 do_reload_perl;
3888 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3889 }; 3961 };
3890 }; 3962 };
3891} 3963}
… …
3932 return; 4004 return;
3933 } 4005 }
3934 4006
3935 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
3936 4008
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3938 4010
3939 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3941 Coro::async_pool { 4013 Coro::async_pool {
3942 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";

Diff Legend

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