… | |
… | |
93 | our @EVENT; |
93 | our @EVENT; |
94 | our @REFLECT; # set by XS |
94 | our @REFLECT; # set by XS |
95 | our %REFLECT; # set by us |
95 | our %REFLECT; # set by us |
96 | |
96 | |
97 | our $CONFDIR = confdir; |
97 | our $CONFDIR = confdir; |
|
|
98 | |
98 | our $DATADIR = datadir; |
99 | our $DATADIR = datadir; |
99 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $PODDIR = "$DATADIR/pod"; |
101 | our $PODDIR = "$DATADIR/pod"; |
101 | our $MAPDIR = "$DATADIR/" . mapdir; |
102 | our $MAPDIR = "$DATADIR/" . mapdir; |
|
|
103 | |
102 | our $LOCALDIR = localdir; |
104 | our $LOCALDIR = localdir; |
103 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
105 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
104 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
106 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
105 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
107 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
106 | our $RANDOMDIR = "$LOCALDIR/random"; |
108 | our $RANDOMDIR = "$LOCALDIR/random"; |
… | |
… | |
233 | from wherever your confdir points to. |
235 | from wherever your confdir points to. |
234 | |
236 | |
235 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
237 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
236 | |
238 | |
237 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
239 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
238 | returns directly I<after> the tick processing (and consequently, can only wake one process |
240 | returns directly I<after> the tick processing (and consequently, can only wake one thread |
239 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
241 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
242 | |
|
|
243 | =cut |
|
|
244 | |
|
|
245 | sub wait_for_tick(); |
|
|
246 | sub wait_for_tick_begin(); |
240 | |
247 | |
241 | =item @cf::INVOKE_RESULTS |
248 | =item @cf::INVOKE_RESULTS |
242 | |
249 | |
243 | This array contains the results of the last C<invoke ()> call. When |
250 | This array contains the results of the last C<invoke ()> call. When |
244 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
251 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
… | |
… | |
307 | } |
314 | } |
308 | |
315 | |
309 | $EV::DIED = sub { |
316 | $EV::DIED = sub { |
310 | Carp::cluck "error in event callback: @_"; |
317 | Carp::cluck "error in event callback: @_"; |
311 | }; |
318 | }; |
|
|
319 | |
|
|
320 | ############################################################################# |
|
|
321 | |
|
|
322 | sub fork_call(&@); |
|
|
323 | sub get_slot($;$$); |
312 | |
324 | |
313 | ############################################################################# |
325 | ############################################################################# |
314 | |
326 | |
315 | =head2 UTILITY FUNCTIONS |
327 | =head2 UTILITY FUNCTIONS |
316 | |
328 | |
… | |
… | |
337 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
349 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
338 | $d |
350 | $d |
339 | } || "[unable to dump $_[0]: '$@']"; |
351 | } || "[unable to dump $_[0]: '$@']"; |
340 | } |
352 | } |
341 | |
353 | |
|
|
354 | =item $scalar = load_file $path |
|
|
355 | |
|
|
356 | Loads the given file from path and returns its contents. Croaks on error |
|
|
357 | and can block. |
|
|
358 | |
|
|
359 | =cut |
|
|
360 | |
|
|
361 | sub load_file($) { |
|
|
362 | 0 <= aio_load $_[0], my $data |
|
|
363 | or Carp::croak "$_[0]: $!"; |
|
|
364 | |
|
|
365 | $data |
|
|
366 | } |
|
|
367 | |
342 | =item $ref = cf::decode_json $json |
368 | =item $ref = cf::decode_json $json |
343 | |
369 | |
344 | Converts a JSON string into the corresponding perl data structure. |
370 | Converts a JSON string into the corresponding perl data structure. |
345 | |
371 | |
346 | =item $json = cf::encode_json $ref |
372 | =item $json = cf::encode_json $ref |
… | |
… | |
352 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
378 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
353 | |
379 | |
354 | sub encode_json($) { $json_coder->encode ($_[0]) } |
380 | sub encode_json($) { $json_coder->encode ($_[0]) } |
355 | sub decode_json($) { $json_coder->decode ($_[0]) } |
381 | sub decode_json($) { $json_coder->decode ($_[0]) } |
356 | |
382 | |
|
|
383 | =item $ref = cf::decode_storable $scalar |
|
|
384 | |
|
|
385 | Same as Coro::Storable::thaw, so blocks. |
|
|
386 | |
|
|
387 | =cut |
|
|
388 | |
|
|
389 | BEGIN { *decode_storable = \&Coro::Storable::thaw } |
|
|
390 | |
|
|
391 | =item $ref = cf::decode_yaml $scalar |
|
|
392 | |
|
|
393 | Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). |
|
|
394 | |
|
|
395 | =cut |
|
|
396 | |
|
|
397 | sub decode_yaml($) { |
|
|
398 | fork_call { YAML::XS::Load $_[0] } @_ |
|
|
399 | } |
|
|
400 | |
|
|
401 | =item $scalar = cf::unlzf $scalar |
|
|
402 | |
|
|
403 | Same as Compress::LZF::compress, but takes server ticks into account, so |
|
|
404 | blocks. |
|
|
405 | |
|
|
406 | =cut |
|
|
407 | |
|
|
408 | sub unlzf($) { |
|
|
409 | # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine) |
|
|
410 | cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf"; |
|
|
411 | Compress::LZF::decompress $_[0] |
|
|
412 | } |
|
|
413 | |
357 | =item cf::post_init { BLOCK } |
414 | =item cf::post_init { BLOCK } |
358 | |
415 | |
359 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
416 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
360 | but I<before> the server starts ticking again. |
417 | but I<before> the server starts ticking again. |
361 | |
418 | |
362 | The cdoeblock will have a single boolean argument to indicate whether this |
419 | The codeblock will have a single boolean argument to indicate whether this |
363 | is a reload or not. |
420 | is a reload or not. |
364 | |
421 | |
365 | =cut |
422 | =cut |
366 | |
423 | |
367 | sub post_init(&) { |
424 | sub post_init(&) { |
368 | push @POST_INIT, shift; |
425 | push @POST_INIT, shift; |
|
|
426 | } |
|
|
427 | |
|
|
428 | sub _post_init { |
|
|
429 | trace "running post_init jobs"; |
|
|
430 | |
|
|
431 | # run them in parallel... |
|
|
432 | |
|
|
433 | my @join; |
|
|
434 | |
|
|
435 | while () { |
|
|
436 | push @join, map &Coro::async ($_, 0), @POST_INIT; |
|
|
437 | @POST_INIT = (); |
|
|
438 | |
|
|
439 | @join or last; |
|
|
440 | |
|
|
441 | (pop @join)->join; |
|
|
442 | } |
369 | } |
443 | } |
370 | |
444 | |
371 | =item cf::lock_wait $string |
445 | =item cf::lock_wait $string |
372 | |
446 | |
373 | Wait until the given lock is available. See cf::lock_acquire. |
447 | Wait until the given lock is available. See cf::lock_acquire. |
… | |
… | |
426 | EV::periodic $start, $interval, 0, $cb |
500 | EV::periodic $start, $interval, 0, $cb |
427 | } |
501 | } |
428 | |
502 | |
429 | =item cf::get_slot $time[, $priority[, $name]] |
503 | =item cf::get_slot $time[, $priority[, $name]] |
430 | |
504 | |
431 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
505 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
432 | This call blocks and returns only when you have at least C<$time> seconds |
506 | (default: 0): This call blocks and returns only when you have at least |
433 | of cpu time till the next tick. The slot is only valid till the next cede. |
507 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
|
|
508 | till the next cede. |
|
|
509 | |
|
|
510 | Background jobs should use a priority les than zero, interactive jobs |
|
|
511 | should use 100 or more. |
434 | |
512 | |
435 | The optional C<$name> can be used to identify the job to run. It might be |
513 | The optional C<$name> can be used to identify the job to run. It might be |
436 | used for statistical purposes and should identify the same time-class. |
514 | used for statistical purposes and should identify the same time-class. |
437 | |
515 | |
438 | Useful for short background jobs. |
516 | Useful for short background jobs. |
… | |
… | |
578 | $EXT_CORO{$coro+0} = $coro; |
656 | $EXT_CORO{$coro+0} = $coro; |
579 | |
657 | |
580 | $coro |
658 | $coro |
581 | } |
659 | } |
582 | |
660 | |
583 | =item fork_call { }, $args |
661 | =item fork_call { }, @args |
584 | |
662 | |
585 | Executes the given code block with the given arguments in a seperate |
663 | Executes the given code block with the given arguments in a seperate |
586 | process, returning the results. Everything must be serialisable with |
664 | process, returning the results. Everything must be serialisable with |
587 | Coro::Storable. May, of course, block. Note that the executed sub may |
665 | Coro::Storable. May, of course, block. Note that the executed sub may |
588 | never block itself or use any form of event handling. |
666 | never block itself or use any form of event handling. |
589 | |
667 | |
590 | =cut |
668 | =cut |
591 | |
669 | |
|
|
670 | sub post_fork { |
|
|
671 | reset_signals; |
|
|
672 | } |
|
|
673 | |
592 | sub fork_call(&@) { |
674 | sub fork_call(&@) { |
593 | my ($cb, @args) = @_; |
675 | my ($cb, @args) = @_; |
594 | |
676 | |
595 | # we seemingly have to make a local copy of the whole thing, |
677 | # we seemingly have to make a local copy of the whole thing, |
596 | # otherwise perl prematurely frees the stuff :/ |
678 | # otherwise perl prematurely frees the stuff :/ |
597 | # TODO: investigate and fix (likely this will be rather laborious) |
679 | # TODO: investigate and fix (likely this will be rather laborious) |
598 | |
680 | |
599 | my @res = Coro::Util::fork_eval { |
681 | my @res = Coro::Util::fork_eval { |
600 | reset_signals; |
682 | cf::post_fork; |
601 | &$cb |
683 | &$cb |
602 | }, @args; |
684 | } @args; |
603 | |
685 | |
604 | wantarray ? @res : $res[-1] |
686 | wantarray ? @res : $res[-1] |
605 | } |
687 | } |
606 | |
688 | |
607 | sub objinfo { |
689 | sub objinfo { |
… | |
… | |
729 | |
811 | |
730 | my @data; |
812 | my @data; |
731 | my $md5; |
813 | my $md5; |
732 | |
814 | |
733 | for (0 .. $#$src) { |
815 | for (0 .. $#$src) { |
734 | 0 <= aio_load $src->[$_], $data[$_] |
816 | $data[$_] = load_file $src->[$_]; |
735 | or Carp::croak "$src->[$_]: $!"; |
|
|
736 | } |
817 | } |
737 | |
818 | |
738 | # if processing is expensive, check |
819 | # if processing is expensive, check |
739 | # checksum first |
820 | # checksum first |
740 | if (1) { |
821 | if (1) { |
… | |
… | |
1641 | my $name = $pl->ob->name; |
1722 | my $name = $pl->ob->name; |
1642 | |
1723 | |
1643 | $pl->{deny_save} = 1; |
1724 | $pl->{deny_save} = 1; |
1644 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1725 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1645 | |
1726 | |
1646 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1727 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1647 | $pl->deactivate; |
1728 | $pl->deactivate; |
|
|
1729 | |
1648 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1730 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1649 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1731 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
|
|
1732 | ext::highscore::check ($pl->ob); |
|
|
1733 | |
1650 | $pl->ns->destroy if $pl->ns; |
1734 | $pl->ns->destroy if $pl->ns; |
1651 | |
1735 | |
1652 | my $path = playerdir $pl; |
1736 | my $path = playerdir $pl; |
1653 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1737 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1654 | aio_rename $path, $temp; |
1738 | aio_rename $path, $temp; |
… | |
… | |
1820 | sub generate_random_map { |
1904 | sub generate_random_map { |
1821 | my ($self, $rmp) = @_; |
1905 | my ($self, $rmp) = @_; |
1822 | |
1906 | |
1823 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1907 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1824 | |
1908 | |
1825 | # mit "rum" bekleckern, nicht |
|
|
1826 | $self->_create_random_map ( |
1909 | $self->_create_random_map ($rmp); |
1827 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
|
|
1828 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, |
|
|
1829 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
|
|
1830 | $rmp->{exit_on_final_map}, |
|
|
1831 | $rmp->{xsize}, $rmp->{ysize}, |
|
|
1832 | $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, |
|
|
1833 | $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, |
|
|
1834 | $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, |
|
|
1835 | $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, |
|
|
1836 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
|
|
1837 | (cf::region::find $rmp->{region}), $rmp->{custom} |
|
|
1838 | ) |
|
|
1839 | } |
1910 | } |
1840 | |
1911 | |
1841 | =item cf::map->register ($regex, $prio) |
1912 | =item cf::map->register ($regex, $prio) |
1842 | |
1913 | |
1843 | Register a handler for the map path matching the given regex at the |
1914 | Register a handler for the map path matching the given regex at the |
… | |
… | |
1894 | $base =~ s{[^/]+/?$}{}; |
1965 | $base =~ s{[^/]+/?$}{}; |
1895 | $path = "$base/$path"; |
1966 | $path = "$base/$path"; |
1896 | } |
1967 | } |
1897 | |
1968 | |
1898 | for ($path) { |
1969 | for ($path) { |
1899 | redo if s{//}{/}; |
|
|
1900 | redo if s{/\.?/}{/}; |
1970 | redo if s{/\.?/}{/}; |
1901 | redo if s{/[^/]+/\.\./}{/}; |
1971 | redo if s{/[^/]+/\.\./}{/}; |
1902 | } |
1972 | } |
1903 | |
1973 | |
1904 | $path |
1974 | $path |
… | |
… | |
2146 | |
2216 | |
2147 | $self->in_memory (cf::MAP_ACTIVE); |
2217 | $self->in_memory (cf::MAP_ACTIVE); |
2148 | } |
2218 | } |
2149 | |
2219 | |
2150 | $self->post_load; |
2220 | $self->post_load; |
|
|
2221 | |
|
|
2222 | 1 |
2151 | } |
2223 | } |
2152 | |
2224 | |
2153 | # customize the map for a given player, i.e. |
2225 | # customize the map for a given player, i.e. |
2154 | # return the _real_ map. used by e.g. per-player |
2226 | # return the _real_ map. used by e.g. per-player |
2155 | # maps to change the path to ~playername/mappath |
2227 | # maps to change the path to ~playername/mappath |
… | |
… | |
3370 | |
3442 | |
3371 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3443 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3372 | |
3444 | |
3373 | trace "loading facedata from $path\n"; |
3445 | trace "loading facedata from $path\n"; |
3374 | |
3446 | |
3375 | my $facedata; |
3447 | my $facedata = decode_storable load_file $path; |
3376 | 0 < aio_load $path, $facedata |
|
|
3377 | or die "$path: $!"; |
|
|
3378 | |
|
|
3379 | $facedata = Coro::Storable::thaw $facedata; |
|
|
3380 | |
3448 | |
3381 | $facedata->{version} == 2 |
3449 | $facedata->{version} == 2 |
3382 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3450 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3383 | |
3451 | |
3384 | # patch in the exptable |
3452 | # patch in the exptable |
… | |
… | |
3398 | |
3466 | |
3399 | cf::face::set_visibility $idx, $info->{visibility}; |
3467 | cf::face::set_visibility $idx, $info->{visibility}; |
3400 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3468 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3401 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3469 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3402 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3470 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
|
|
3471 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3403 | |
3472 | |
3404 | cf::cede_to_tick; |
3473 | cf::cede_to_tick; |
3405 | } |
3474 | } |
3406 | |
3475 | |
3407 | while (my ($face, $info) = each %$faces) { |
3476 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3502 | } |
3571 | } |
3503 | |
3572 | |
3504 | sub reload_sound { |
3573 | sub reload_sound { |
3505 | trace "loading sound config from $DATADIR/sound\n"; |
3574 | trace "loading sound config from $DATADIR/sound\n"; |
3506 | |
3575 | |
3507 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3508 | or die "$DATADIR/sound $!"; |
|
|
3509 | |
|
|
3510 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
3576 | my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); |
3511 | |
3577 | |
3512 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3578 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3513 | my $sound = $soundconf->{compat}[$_] |
3579 | my $sound = $soundconf->{compat}[$_] |
3514 | or next; |
3580 | or next; |
3515 | |
3581 | |
… | |
… | |
3525 | } |
3591 | } |
3526 | |
3592 | |
3527 | sub reload_resources { |
3593 | sub reload_resources { |
3528 | trace "reloading resource files...\n"; |
3594 | trace "reloading resource files...\n"; |
3529 | |
3595 | |
|
|
3596 | reload_exp_table; |
|
|
3597 | reload_materials; |
3530 | reload_facedata; |
3598 | reload_facedata; |
3531 | reload_sound; |
3599 | reload_sound; |
3532 | reload_archetypes; |
3600 | reload_archetypes; |
3533 | reload_regions; |
3601 | reload_regions; |
3534 | reload_treasures; |
3602 | reload_treasures; |
… | |
… | |
3537 | } |
3605 | } |
3538 | |
3606 | |
3539 | sub reload_config { |
3607 | sub reload_config { |
3540 | trace "reloading config file...\n"; |
3608 | trace "reloading config file...\n"; |
3541 | |
3609 | |
3542 | open my $fh, "<:utf8", "$CONFDIR/config" |
3610 | my $config = load_file "$CONFDIR/config"; |
3543 | or return; |
3611 | utf8::decode $config; |
3544 | |
3612 | *CFG = decode_yaml $config; |
3545 | local $/; |
|
|
3546 | *CFG = YAML::XS::Load scalar <$fh>; |
|
|
3547 | |
3613 | |
3548 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3614 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3549 | |
3615 | |
3550 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3616 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3551 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3617 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3555 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3621 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3556 | and die "WARNING: m(un)lockall failed: $!\n"; |
3622 | and die "WARNING: m(un)lockall failed: $!\n"; |
3557 | }; |
3623 | }; |
3558 | warn $@ if $@; |
3624 | warn $@ if $@; |
3559 | } |
3625 | } |
3560 | |
|
|
3561 | trace "finished reloading resource files\n"; |
|
|
3562 | } |
3626 | } |
3563 | |
3627 | |
3564 | sub pidfile() { |
3628 | sub pidfile() { |
3565 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3629 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3566 | or die "$PIDFILE: $!"; |
3630 | or die "$PIDFILE: $!"; |
… | |
… | |
3611 | evthread_start IO::AIO::poll_fileno; |
3675 | evthread_start IO::AIO::poll_fileno; |
3612 | |
3676 | |
3613 | cf::sync_job { |
3677 | cf::sync_job { |
3614 | cf::incloader::init (); |
3678 | cf::incloader::init (); |
3615 | |
3679 | |
3616 | cf::init_experience; |
|
|
3617 | cf::init_anim; |
3680 | cf::init_anim; |
3618 | cf::init_attackmess; |
3681 | cf::init_attackmess; |
3619 | cf::init_dynamic; |
3682 | cf::init_dynamic; |
3620 | |
3683 | |
3621 | cf::load_settings; |
3684 | cf::load_settings; |
3622 | cf::load_materials; |
|
|
3623 | |
3685 | |
3624 | reload_resources; |
3686 | reload_resources; |
3625 | reload_config; |
3687 | reload_config; |
3626 | db_init; |
3688 | db_init; |
3627 | |
3689 | |
… | |
… | |
3639 | |
3701 | |
3640 | # no (long-running) fork's whatsoever before this point(!) |
3702 | # no (long-running) fork's whatsoever before this point(!) |
3641 | use POSIX (); |
3703 | use POSIX (); |
3642 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3704 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3643 | |
3705 | |
3644 | (pop @POST_INIT)->(0) while @POST_INIT; |
3706 | cf::_post_init 0; |
3645 | }; |
3707 | }; |
3646 | |
3708 | |
3647 | cf::object::thawer::errors_are_fatal 0; |
3709 | cf::object::thawer::errors_are_fatal 0; |
3648 | info "parse errors in files are no longer fatal from this point on.\n"; |
3710 | info "parse errors in files are no longer fatal from this point on.\n"; |
3649 | |
3711 | |
… | |
… | |
3872 | |
3934 | |
3873 | my $t1 = AE::time; |
3935 | my $t1 = AE::time; |
3874 | |
3936 | |
3875 | while ($RELOAD) { |
3937 | while ($RELOAD) { |
3876 | cf::get_slot 0.1, -1, "reload_perl"; |
3938 | cf::get_slot 0.1, -1, "reload_perl"; |
3877 | info "reloading..."; |
3939 | info "perl_reload: reloading..."; |
3878 | |
3940 | |
3879 | trace "entering sync_job"; |
3941 | trace "perl_reload: entering sync_job"; |
3880 | |
3942 | |
3881 | cf::sync_job { |
3943 | cf::sync_job { |
3882 | #cf::emergency_save; |
3944 | #cf::emergency_save; |
3883 | |
3945 | |
3884 | trace "cancelling all extension coros"; |
3946 | trace "perl_reload: cancelling all extension coros"; |
3885 | $_->cancel for values %EXT_CORO; |
3947 | $_->cancel for values %EXT_CORO; |
3886 | %EXT_CORO = (); |
3948 | %EXT_CORO = (); |
3887 | |
3949 | |
3888 | trace "removing commands"; |
3950 | trace "perl_reload: removing commands"; |
3889 | %COMMAND = (); |
3951 | %COMMAND = (); |
3890 | |
3952 | |
3891 | trace "removing ext/exti commands"; |
3953 | trace "perl_reload: removing ext/exti commands"; |
3892 | %EXTCMD = (); |
3954 | %EXTCMD = (); |
3893 | %EXTICMD = (); |
3955 | %EXTICMD = (); |
3894 | |
3956 | |
3895 | trace "unloading/nuking all extensions"; |
3957 | trace "perl_reload: unloading/nuking all extensions"; |
3896 | for my $pkg (@EXTS) { |
3958 | for my $pkg (@EXTS) { |
3897 | trace "... unloading $pkg"; |
3959 | trace "... unloading $pkg"; |
3898 | |
3960 | |
3899 | if (my $cb = $pkg->can ("unload")) { |
3961 | if (my $cb = $pkg->can ("unload")) { |
3900 | eval { |
3962 | eval { |
… | |
… | |
3905 | |
3967 | |
3906 | trace "... clearing $pkg"; |
3968 | trace "... clearing $pkg"; |
3907 | clear_package $pkg; |
3969 | clear_package $pkg; |
3908 | } |
3970 | } |
3909 | |
3971 | |
3910 | trace "unloading all perl modules loaded from $LIBDIR"; |
3972 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3911 | while (my ($k, $v) = each %INC) { |
3973 | while (my ($k, $v) = each %INC) { |
3912 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3974 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3913 | |
3975 | |
3914 | trace "... unloading $k"; |
3976 | trace "... unloading $k"; |
3915 | delete $INC{$k}; |
3977 | delete $INC{$k}; |
… | |
… | |
3922 | } |
3984 | } |
3923 | |
3985 | |
3924 | clear_package $k; |
3986 | clear_package $k; |
3925 | } |
3987 | } |
3926 | |
3988 | |
3927 | trace "getting rid of safe::, as good as possible"; |
3989 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3928 | clear_package "safe::$_" |
3990 | clear_package "safe::$_" |
3929 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3991 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3930 | |
3992 | |
3931 | trace "unloading cf.pm \"a bit\""; |
3993 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3932 | delete $INC{"cf.pm"}; |
3994 | delete $INC{"cf.pm"}; |
3933 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3995 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3934 | |
3996 | |
3935 | # don't, removes xs symbols, too, |
3997 | # don't, removes xs symbols, too, |
3936 | # and global variables created in xs |
3998 | # and global variables created in xs |
3937 | #clear_package __PACKAGE__; |
3999 | #clear_package __PACKAGE__; |
3938 | |
4000 | |
3939 | info "unload completed, starting to reload now"; |
4001 | info "perl_reload: unload completed, starting to reload now"; |
3940 | |
4002 | |
3941 | trace "reloading cf.pm"; |
4003 | trace "perl_reload: reloading cf.pm"; |
3942 | require cf; |
4004 | require cf; |
3943 | cf::_connect_to_perl_1; |
4005 | cf::_connect_to_perl_1; |
3944 | |
4006 | |
3945 | trace "loading config and database again"; |
4007 | trace "perl_reload: loading config and database again"; |
3946 | cf::reload_config; |
4008 | cf::reload_config; |
3947 | |
4009 | |
3948 | trace "loading extensions"; |
4010 | trace "perl_reload: loading extensions"; |
3949 | cf::load_extensions; |
4011 | cf::load_extensions; |
3950 | |
4012 | |
3951 | if ($REATTACH_ON_RELOAD) { |
4013 | if ($REATTACH_ON_RELOAD) { |
3952 | trace "reattaching attachments to objects/players"; |
4014 | trace "perl_reload: reattaching attachments to objects/players"; |
3953 | _global_reattach; # objects, sockets |
4015 | _global_reattach; # objects, sockets |
3954 | trace "reattaching attachments to maps"; |
4016 | trace "perl_reload: reattaching attachments to maps"; |
3955 | reattach $_ for values %MAP; |
4017 | reattach $_ for values %MAP; |
3956 | trace "reattaching attachments to players"; |
4018 | trace "perl_reload: reattaching attachments to players"; |
3957 | reattach $_ for values %PLAYER; |
4019 | reattach $_ for values %PLAYER; |
3958 | } |
4020 | } |
3959 | |
4021 | |
3960 | trace "running post_init jobs"; |
4022 | cf::_post_init 1; |
3961 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3962 | |
4023 | |
3963 | trace "leaving sync_job"; |
4024 | trace "perl_reload: leaving sync_job"; |
3964 | |
4025 | |
3965 | 1 |
4026 | 1 |
3966 | } or do { |
4027 | } or do { |
3967 | error $@; |
4028 | error $@; |
3968 | cf::cleanup "error while reloading, exiting."; |
4029 | cf::cleanup "perl_reload: error, exiting."; |
3969 | }; |
4030 | }; |
3970 | |
4031 | |
3971 | info "reloaded"; |
|
|
3972 | --$RELOAD; |
4032 | --$RELOAD; |
3973 | } |
4033 | } |
3974 | |
4034 | |
3975 | $t1 = AE::time - $t1; |
4035 | $t1 = AE::time - $t1; |
3976 | info "reload completed in ${t1}s\n"; |
4036 | info "perl_reload: completed in ${t1}s\n"; |
3977 | }; |
4037 | }; |
3978 | |
4038 | |
3979 | our $RELOAD_WATCHER; # used only during reload |
4039 | our $RELOAD_WATCHER; # used only during reload |
3980 | |
4040 | |
3981 | sub reload_perl() { |
4041 | sub reload_perl() { |
… | |
… | |
4009 | my $bug_warning = 0; |
4069 | my $bug_warning = 0; |
4010 | |
4070 | |
4011 | our @WAIT_FOR_TICK; |
4071 | our @WAIT_FOR_TICK; |
4012 | our @WAIT_FOR_TICK_BEGIN; |
4072 | our @WAIT_FOR_TICK_BEGIN; |
4013 | |
4073 | |
4014 | sub wait_for_tick { |
4074 | sub wait_for_tick() { |
4015 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4075 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4016 | |
4076 | |
4017 | my $signal = new Coro::Signal; |
4077 | my $signal = new Coro::Signal; |
4018 | push @WAIT_FOR_TICK, $signal; |
4078 | push @WAIT_FOR_TICK, $signal; |
4019 | $signal->wait; |
4079 | $signal->wait; |
4020 | } |
4080 | } |
4021 | |
4081 | |
4022 | sub wait_for_tick_begin { |
4082 | sub wait_for_tick_begin() { |
4023 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4083 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4024 | |
4084 | |
4025 | my $signal = new Coro::Signal; |
4085 | my $signal = new Coro::Signal; |
4026 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4086 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4027 | $signal->wait; |
4087 | $signal->wait; |
… | |
… | |
4114 | IO::AIO::min_parallel 8; |
4174 | IO::AIO::min_parallel 8; |
4115 | IO::AIO::max_poll_time $TICK * 0.1; |
4175 | IO::AIO::max_poll_time $TICK * 0.1; |
4116 | undef $AnyEvent::AIO::WATCHER; |
4176 | undef $AnyEvent::AIO::WATCHER; |
4117 | } |
4177 | } |
4118 | |
4178 | |
4119 | my $_log_backtrace; |
4179 | our $_log_backtrace; |
|
|
4180 | our $_log_backtrace_last; |
4120 | |
4181 | |
4121 | sub _log_backtrace { |
4182 | sub _log_backtrace { |
4122 | my ($msg, @addr) = @_; |
4183 | my ($msg, @addr) = @_; |
4123 | |
4184 | |
4124 | $msg =~ s/\n//; |
4185 | $msg =~ s/\n$//; |
4125 | |
4186 | |
|
|
4187 | if ($_log_backtrace_last eq $msg) { |
|
|
4188 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4189 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4126 | # limit the # of concurrent backtraces |
4190 | # limit the # of concurrent backtraces |
4127 | if ($_log_backtrace < 2) { |
4191 | } elsif ($_log_backtrace < 2) { |
|
|
4192 | $_log_backtrace_last = $msg; |
4128 | ++$_log_backtrace; |
4193 | ++$_log_backtrace; |
4129 | my $perl_bt = Carp::longmess $msg; |
4194 | my $perl_bt = Carp::longmess $msg; |
4130 | async { |
4195 | async { |
4131 | $Coro::current->{desc} = "abt $msg"; |
4196 | $Coro::current->{desc} = "abt $msg"; |
4132 | |
4197 | |
… | |
… | |
4152 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4217 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4153 | --$_log_backtrace; |
4218 | --$_log_backtrace; |
4154 | }; |
4219 | }; |
4155 | } else { |
4220 | } else { |
4156 | LOG llevInfo, "[ABT] $msg\n"; |
4221 | LOG llevInfo, "[ABT] $msg\n"; |
4157 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4222 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4158 | } |
4223 | } |
4159 | } |
4224 | } |
4160 | |
4225 | |
4161 | # load additional modules |
4226 | # load additional modules |
4162 | require "cf/$_.pm" for @EXTRA_MODULES; |
4227 | require "cf/$_.pm" for @EXTRA_MODULES; |