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.508 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 UTC

… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
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
117 123
… …
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
… …
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
… …
1658 \@logins 1700 \@logins
1659} 1701}
1660 1702
1661=item $player->maps 1703=item $player->maps
1662 1704
1705=item cf::player::maps $login
1706
1663Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1664player. May block. 1708player. May block.
1665 1709
1666=cut 1710=cut
1667 1711
… …
1728 1772
1729=cut 1773=cut
1730 1774
1731sub find_by_path($) { 1775sub find_by_path($) {
1732 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1733 1779
1734 my ($match, $specificity); 1780 my ($match, $specificity);
1735 1781
1736 for my $region (list) { 1782 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
… …
1801 1847
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1849}
1804 1850
1805# also paths starting with '/' 1851# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1853
1808sub thawer_merge { 1854sub thawer_merge {
1809 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1810 1856
1811 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
2121 or next; 2167 or next;
2122 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2123 or next; 2169 or next;
2124 $neigh->load; 2170 $neigh->load;
2125 2171
2172 # now find the diagonal neighbours
2126 push @neigh, 2173 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2176 }
2130 2177
… …
2182 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2183 2230
2184 () 2231 ()
2185} 2232}
2186 2233
2234# common code, used by both ->save and ->swapout
2187sub save { 2235sub _save {
2188 my ($self) = @_; 2236 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2237
2192 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2193 2239
2194 return unless $self->dirty; 2240 return unless $self->dirty;
2195 2241
… …
2215 } else { 2261 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2263 }
2218} 2264}
2219 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2220sub swap_out { 2274sub swap_out {
2221 my ($self) = @_; 2275 my ($self) = @_;
2222 2276
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2278
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2231 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2233 2333
2234 $self->deactivate; 2334 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2336 $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 2337
2282 $self->unlink_save; 2338 $self->unlink_save;
2283 $self->destroy; 2339 $self->destroy;
2284} 2340}
2285 2341
… …
2293 2349
2294 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2295 2351
2296 $self->unlink_save; 2352 $self->unlink_save;
2297 2353
2298 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2359
… …
2533 2589
2534Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2535 2591
2536The player should be reasonably safe there for short amounts of time (e.g. 2592The 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, 2593for 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 2594though, as the player cannot control the character while it is on the link
2539map. 2595map.
2540 2596
2541Will never block. 2597Will never block.
2542 2598
2543=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2565 my ($self) = @_; 2621 my ($self) = @_;
2566 2622
2567 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2568 2624
2625 ++$self->{_link_recursion};
2626
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2628
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2573 2631
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2633}
2576 2634
2577sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2579 2637
… …
2604 $map->load_neighbours; 2662 $map->load_neighbours;
2605 2663
2606 return unless $self->contr->active; 2664 return unless $self->contr->active;
2607 2665
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2610 2668 # entering was successful
2669 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2670 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2671 $self->activate_recursive;
2613} 2672 }
2614 2673
2674}
2675
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2677
2617Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2680that 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 2681the new (success) or old (failed) map position. In either case, $done will
… …
2627 2688
2628our $GOTOGEN; 2689our $GOTOGEN;
2629 2690
2630sub cf::object::player::goto { 2691sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2632 2699
2633 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2702
2636 $self->enter_link; 2703 $self->enter_link;
… …
2660 my $map = eval { 2727 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2662 2729
2663 if ($map) { 2730 if ($map) {
2664 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2733 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2735 }
2669 2736
2670 $map 2737 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2681 } 2748 }
2682 2749
2683 $done->() if $done; 2750 $done->($self) if $done;
2684 })->prio (1); 2751 })->prio (1);
2685} 2752}
2686 2753
2687=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2688 2755
… …
3134 3201
3135 $coro 3202 $coro
3136} 3203}
3137 3204
3138cf::client->attach ( 3205cf::client->attach (
3139 on_destroy => sub { 3206 on_client_destroy => sub {
3140 my ($ns) = @_; 3207 my ($ns) = @_;
3141 3208
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3210 },
3144); 3211);
… …
3461 or return; 3528 or return;
3462 3529
3463 local $/; 3530 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3465 3532
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3534
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $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}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3537
3471 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3512 3579
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 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 3584
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3586
3525 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3532 }; 3594 };
3533 3595
3534 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3535 3597
3536 cf::sync_job { 3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3537 cf::load_settings; 3604 cf::load_settings;
3538 cf::load_materials; 3605 cf::load_materials;
3539 3606
3540 reload_resources; 3607 reload_resources;
3541 reload_config; 3608 reload_config;
3542 db_init; 3609 db_init;
3543 3610
3544 cf::init_uuid; 3611 cf::init_uuid;
3545 cf::init_signals; 3612 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3613 cf::init_skills;
3548 3614
3549 cf::init_beforeplay; 3615 cf::init_beforeplay;
3550 3616
3551 atomic; 3617 atomic;
… …
3558 use POSIX (); 3624 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3626
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3562 }; 3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3563 3632
3564 main_loop; 3633 main_loop;
3565} 3634}
3566 3635
3567############################################################################# 3636#############################################################################
… …
3569 3638
3570# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3571BEGIN { 3640BEGIN {
3572 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3576 }; 3645 };
3577 } 3646 }
3578} 3647}
3579 3648
3580sub write_runtime_sync { 3649sub write_runtime_sync {
3581 my $t0 = EV::time; 3650 my $t0 = AE::time;
3582 3651
3583 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3585 3654
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3677 or return;
3609 3678
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3680 and return;
3612 3681
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3683
3615 1 3684 1
3616} 3685}
3617 3686
3618our $uuid_lock; 3687our $uuid_lock;
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3817 }
3749 warn "cleared package $pkg\n";#d#
3750} 3818}
3751 3819
3752sub do_reload_perl() { 3820sub do_reload_perl() {
3753 # can/must only be called in main 3821 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3755 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3756 return; 3824 return;
3757 } 3825 }
3758 3826
3759 return if $RELOAD++; 3827 return if $RELOAD++;
3760 3828
3761 my $t1 = EV::time; 3829 my $t1 = AE::time;
3762 3830
3763 while ($RELOAD) { 3831 while ($RELOAD) {
3764 warn "reloading..."; 3832 warn "reloading...";
3765 3833
3766 warn "entering sync_job"; 3834 warn "entering sync_job";
… …
3869 3937
3870 warn "reloaded"; 3938 warn "reloaded";
3871 --$RELOAD; 3939 --$RELOAD;
3872 } 3940 }
3873 3941
3874 $t1 = EV::time - $t1; 3942 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 3943 warn "reload completed in ${t1}s\n";
3876}; 3944};
3877 3945
3878our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3879 3947
… …
3882 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3883 3951
3884 $RELOAD_WATCHER ||= cf::async { 3952 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 3953 Coro::AIO::aio_wait cache_extensions;
3886 3954
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 3956 do_reload_perl;
3889 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3890 }; 3958 };
3891 }; 3959 };
3892} 3960}
… …
3933 return; 4001 return;
3934 } 4002 }
3935 4003
3936 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
3937 4005
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4007
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4010 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";

Diff Legend

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