… | |
… | |
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"; |
… | |
… | |
312 | } |
314 | } |
313 | |
315 | |
314 | $EV::DIED = sub { |
316 | $EV::DIED = sub { |
315 | Carp::cluck "error in event callback: @_"; |
317 | Carp::cluck "error in event callback: @_"; |
316 | }; |
318 | }; |
|
|
319 | |
|
|
320 | ############################################################################# |
|
|
321 | |
|
|
322 | sub fork_call(&@); |
|
|
323 | sub get_slot($;$$); |
317 | |
324 | |
318 | ############################################################################# |
325 | ############################################################################# |
319 | |
326 | |
320 | =head2 UTILITY FUNCTIONS |
327 | =head2 UTILITY FUNCTIONS |
321 | |
328 | |
… | |
… | |
342 | $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; |
343 | $d |
350 | $d |
344 | } || "[unable to dump $_[0]: '$@']"; |
351 | } || "[unable to dump $_[0]: '$@']"; |
345 | } |
352 | } |
346 | |
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 | |
347 | =item $ref = cf::decode_json $json |
368 | =item $ref = cf::decode_json $json |
348 | |
369 | |
349 | Converts a JSON string into the corresponding perl data structure. |
370 | Converts a JSON string into the corresponding perl data structure. |
350 | |
371 | |
351 | =item $json = cf::encode_json $ref |
372 | =item $json = cf::encode_json $ref |
… | |
… | |
357 | 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 |
358 | |
379 | |
359 | sub encode_json($) { $json_coder->encode ($_[0]) } |
380 | sub encode_json($) { $json_coder->encode ($_[0]) } |
360 | sub decode_json($) { $json_coder->decode ($_[0]) } |
381 | sub decode_json($) { $json_coder->decode ($_[0]) } |
361 | |
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 | |
362 | =item $ref = cf::yaml_load $scalar |
391 | =item $ref = cf::decode_yaml $scalar |
363 | |
392 | |
364 | Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). |
393 | Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). |
365 | |
394 | |
366 | =cut |
395 | =cut |
367 | |
396 | |
368 | sub fork_call(&@); |
397 | sub decode_yaml($) { |
369 | |
|
|
370 | sub yaml_load($) { |
|
|
371 | fork_call { YAML::XS::Load $_[0] } @_ |
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] |
372 | } |
412 | } |
373 | |
413 | |
374 | =item cf::post_init { BLOCK } |
414 | =item cf::post_init { BLOCK } |
375 | |
415 | |
376 | 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, |
… | |
… | |
381 | |
421 | |
382 | =cut |
422 | =cut |
383 | |
423 | |
384 | sub post_init(&) { |
424 | sub post_init(&) { |
385 | 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 | } |
386 | } |
443 | } |
387 | |
444 | |
388 | =item cf::lock_wait $string |
445 | =item cf::lock_wait $string |
389 | |
446 | |
390 | Wait until the given lock is available. See cf::lock_acquire. |
447 | Wait until the given lock is available. See cf::lock_acquire. |
… | |
… | |
443 | EV::periodic $start, $interval, 0, $cb |
500 | EV::periodic $start, $interval, 0, $cb |
444 | } |
501 | } |
445 | |
502 | |
446 | =item cf::get_slot $time[, $priority[, $name]] |
503 | =item cf::get_slot $time[, $priority[, $name]] |
447 | |
504 | |
448 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
505 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
449 | 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 |
450 | 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. |
451 | |
512 | |
452 | 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 |
453 | used for statistical purposes and should identify the same time-class. |
514 | used for statistical purposes and should identify the same time-class. |
454 | |
515 | |
455 | Useful for short background jobs. |
516 | Useful for short background jobs. |
… | |
… | |
750 | |
811 | |
751 | my @data; |
812 | my @data; |
752 | my $md5; |
813 | my $md5; |
753 | |
814 | |
754 | for (0 .. $#$src) { |
815 | for (0 .. $#$src) { |
755 | 0 <= aio_load $src->[$_], $data[$_] |
816 | $data[$_] = load_file $src->[$_]; |
756 | or Carp::croak "$src->[$_]: $!"; |
|
|
757 | } |
817 | } |
758 | |
818 | |
759 | # if processing is expensive, check |
819 | # if processing is expensive, check |
760 | # checksum first |
820 | # checksum first |
761 | if (1) { |
821 | if (1) { |
… | |
… | |
1495 | |
1555 | |
1496 | while (my ($k, $v) = each %todo) { |
1556 | while (my ($k, $v) = each %todo) { |
1497 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1557 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1498 | if exists $v->{meta}{mandatory}; |
1558 | if exists $v->{meta}{mandatory}; |
1499 | } |
1559 | } |
|
|
1560 | |
|
|
1561 | last; |
1500 | } |
1562 | } |
1501 | } |
1563 | } |
1502 | }; |
1564 | }; |
1503 | } |
1565 | } |
1504 | |
1566 | |
… | |
… | |
1844 | sub generate_random_map { |
1906 | sub generate_random_map { |
1845 | my ($self, $rmp) = @_; |
1907 | my ($self, $rmp) = @_; |
1846 | |
1908 | |
1847 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1909 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1848 | |
1910 | |
1849 | # mit "rum" bekleckern, nicht |
|
|
1850 | $self->_create_random_map ( |
1911 | $self->_create_random_map ($rmp); |
1851 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
|
|
1852 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, |
|
|
1853 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
|
|
1854 | $rmp->{exit_on_final_map}, |
|
|
1855 | $rmp->{xsize}, $rmp->{ysize}, |
|
|
1856 | $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, |
|
|
1857 | $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, |
|
|
1858 | $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, |
|
|
1859 | $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, |
|
|
1860 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
|
|
1861 | (cf::region::find $rmp->{region}), $rmp->{custom} |
|
|
1862 | ) |
|
|
1863 | } |
1912 | } |
1864 | |
1913 | |
1865 | =item cf::map->register ($regex, $prio) |
1914 | =item cf::map->register ($regex, $prio) |
1866 | |
1915 | |
1867 | Register a handler for the map path matching the given regex at the |
1916 | Register a handler for the map path matching the given regex at the |
… | |
… | |
1918 | $base =~ s{[^/]+/?$}{}; |
1967 | $base =~ s{[^/]+/?$}{}; |
1919 | $path = "$base/$path"; |
1968 | $path = "$base/$path"; |
1920 | } |
1969 | } |
1921 | |
1970 | |
1922 | for ($path) { |
1971 | for ($path) { |
1923 | redo if s{//}{/}; |
|
|
1924 | redo if s{/\.?/}{/}; |
1972 | redo if s{/\.?/}{/}; |
1925 | redo if s{/[^/]+/\.\./}{/}; |
1973 | redo if s{/[^/]+/\.\./}{/}; |
1926 | } |
1974 | } |
1927 | |
1975 | |
1928 | $path |
1976 | $path |
… | |
… | |
1946 | |
1994 | |
1947 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1995 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1948 | () |
1996 | () |
1949 | } |
1997 | } |
1950 | |
1998 | |
|
|
1999 | # may re-bless or do other evil things |
1951 | sub init { |
2000 | sub init { |
1952 | my ($self) = @_; |
2001 | my ($self) = @_; |
1953 | |
2002 | |
1954 | $self |
2003 | $self |
1955 | } |
2004 | } |
… | |
… | |
2170 | |
2219 | |
2171 | $self->in_memory (cf::MAP_ACTIVE); |
2220 | $self->in_memory (cf::MAP_ACTIVE); |
2172 | } |
2221 | } |
2173 | |
2222 | |
2174 | $self->post_load; |
2223 | $self->post_load; |
|
|
2224 | |
|
|
2225 | 1 |
2175 | } |
2226 | } |
2176 | |
2227 | |
2177 | # customize the map for a given player, i.e. |
2228 | # customize the map for a given player, i.e. |
2178 | # return the _real_ map. used by e.g. per-player |
2229 | # return the _real_ map. used by e.g. per-player |
2179 | # maps to change the path to ~playername/mappath |
2230 | # maps to change the path to ~playername/mappath |
… | |
… | |
3394 | |
3445 | |
3395 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3446 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3396 | |
3447 | |
3397 | trace "loading facedata from $path\n"; |
3448 | trace "loading facedata from $path\n"; |
3398 | |
3449 | |
3399 | 0 < aio_load $path, my $facedata |
3450 | my $facedata = decode_storable load_file $path; |
3400 | or die "$path: $!"; |
|
|
3401 | |
|
|
3402 | $facedata = Coro::Storable::thaw $facedata; |
|
|
3403 | |
3451 | |
3404 | $facedata->{version} == 2 |
3452 | $facedata->{version} == 2 |
3405 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3453 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3406 | |
3454 | |
3407 | # patch in the exptable |
3455 | # patch in the exptable |
… | |
… | |
3421 | |
3469 | |
3422 | cf::face::set_visibility $idx, $info->{visibility}; |
3470 | cf::face::set_visibility $idx, $info->{visibility}; |
3423 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3471 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3424 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3472 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3425 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3473 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
|
|
3474 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3426 | |
3475 | |
3427 | cf::cede_to_tick; |
3476 | cf::cede_to_tick; |
3428 | } |
3477 | } |
3429 | |
3478 | |
3430 | while (my ($face, $info) = each %$faces) { |
3479 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3525 | } |
3574 | } |
3526 | |
3575 | |
3527 | sub reload_sound { |
3576 | sub reload_sound { |
3528 | trace "loading sound config from $DATADIR/sound\n"; |
3577 | trace "loading sound config from $DATADIR/sound\n"; |
3529 | |
3578 | |
3530 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3531 | or die "$DATADIR/sound $!"; |
|
|
3532 | |
|
|
3533 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
3579 | my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); |
3534 | |
3580 | |
3535 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3581 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3536 | my $sound = $soundconf->{compat}[$_] |
3582 | my $sound = $soundconf->{compat}[$_] |
3537 | or next; |
3583 | or next; |
3538 | |
3584 | |
… | |
… | |
3562 | } |
3608 | } |
3563 | |
3609 | |
3564 | sub reload_config { |
3610 | sub reload_config { |
3565 | trace "reloading config file...\n"; |
3611 | trace "reloading config file...\n"; |
3566 | |
3612 | |
3567 | 0 < aio_load "$CONFDIR/config", my $config |
3613 | my $config = load_file "$CONFDIR/config"; |
3568 | or die "$CONFDIR/config: $!"; |
|
|
3569 | |
|
|
3570 | utf8::decode $config; |
3614 | utf8::decode $config; |
3571 | *CFG = yaml_load $config; |
3615 | *CFG = decode_yaml $config; |
3572 | |
3616 | |
3573 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3617 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3574 | |
3618 | |
3575 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3619 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3576 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3620 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3614 | |
3658 | |
3615 | sub main { |
3659 | sub main { |
3616 | cf::init_globals; # initialise logging |
3660 | cf::init_globals; # initialise logging |
3617 | |
3661 | |
3618 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3662 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3619 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3663 | LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3620 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3664 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3621 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3665 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3622 | |
3666 | |
3623 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3667 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3624 | |
3668 | |
… | |
… | |
3660 | |
3704 | |
3661 | # no (long-running) fork's whatsoever before this point(!) |
3705 | # no (long-running) fork's whatsoever before this point(!) |
3662 | use POSIX (); |
3706 | use POSIX (); |
3663 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3707 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3664 | |
3708 | |
3665 | (pop @POST_INIT)->(0) while @POST_INIT; |
3709 | cf::_post_init 0; |
3666 | }; |
3710 | }; |
3667 | |
3711 | |
3668 | cf::object::thawer::errors_are_fatal 0; |
3712 | cf::object::thawer::errors_are_fatal 0; |
3669 | info "parse errors in files are no longer fatal from this point on.\n"; |
3713 | info "parse errors in files are no longer fatal from this point on.\n"; |
3670 | |
3714 | |
… | |
… | |
3893 | |
3937 | |
3894 | my $t1 = AE::time; |
3938 | my $t1 = AE::time; |
3895 | |
3939 | |
3896 | while ($RELOAD) { |
3940 | while ($RELOAD) { |
3897 | cf::get_slot 0.1, -1, "reload_perl"; |
3941 | cf::get_slot 0.1, -1, "reload_perl"; |
3898 | info "reloading..."; |
3942 | info "perl_reload: reloading..."; |
3899 | |
3943 | |
3900 | trace "entering sync_job"; |
3944 | trace "perl_reload: entering sync_job"; |
3901 | |
3945 | |
3902 | cf::sync_job { |
3946 | cf::sync_job { |
3903 | #cf::emergency_save; |
3947 | #cf::emergency_save; |
3904 | |
3948 | |
3905 | trace "cancelling all extension coros"; |
3949 | trace "perl_reload: cancelling all extension coros"; |
3906 | $_->cancel for values %EXT_CORO; |
3950 | $_->cancel for values %EXT_CORO; |
3907 | %EXT_CORO = (); |
3951 | %EXT_CORO = (); |
3908 | |
3952 | |
3909 | trace "removing commands"; |
3953 | trace "perl_reload: removing commands"; |
3910 | %COMMAND = (); |
3954 | %COMMAND = (); |
3911 | |
3955 | |
3912 | trace "removing ext/exti commands"; |
3956 | trace "perl_reload: removing ext/exti commands"; |
3913 | %EXTCMD = (); |
3957 | %EXTCMD = (); |
3914 | %EXTICMD = (); |
3958 | %EXTICMD = (); |
3915 | |
3959 | |
3916 | trace "unloading/nuking all extensions"; |
3960 | trace "perl_reload: unloading/nuking all extensions"; |
3917 | for my $pkg (@EXTS) { |
3961 | for my $pkg (@EXTS) { |
3918 | trace "... unloading $pkg"; |
3962 | trace "... unloading $pkg"; |
3919 | |
3963 | |
3920 | if (my $cb = $pkg->can ("unload")) { |
3964 | if (my $cb = $pkg->can ("unload")) { |
3921 | eval { |
3965 | eval { |
… | |
… | |
3926 | |
3970 | |
3927 | trace "... clearing $pkg"; |
3971 | trace "... clearing $pkg"; |
3928 | clear_package $pkg; |
3972 | clear_package $pkg; |
3929 | } |
3973 | } |
3930 | |
3974 | |
3931 | trace "unloading all perl modules loaded from $LIBDIR"; |
3975 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3932 | while (my ($k, $v) = each %INC) { |
3976 | while (my ($k, $v) = each %INC) { |
3933 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3977 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3934 | |
3978 | |
3935 | trace "... unloading $k"; |
3979 | trace "... unloading $k"; |
3936 | delete $INC{$k}; |
3980 | delete $INC{$k}; |
… | |
… | |
3943 | } |
3987 | } |
3944 | |
3988 | |
3945 | clear_package $k; |
3989 | clear_package $k; |
3946 | } |
3990 | } |
3947 | |
3991 | |
3948 | trace "getting rid of safe::, as good as possible"; |
3992 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3949 | clear_package "safe::$_" |
3993 | clear_package "safe::$_" |
3950 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3994 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3951 | |
3995 | |
3952 | trace "unloading cf.pm \"a bit\""; |
3996 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3953 | delete $INC{"cf.pm"}; |
3997 | delete $INC{"cf.pm"}; |
3954 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3998 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3955 | |
3999 | |
3956 | # don't, removes xs symbols, too, |
4000 | # don't, removes xs symbols, too, |
3957 | # and global variables created in xs |
4001 | # and global variables created in xs |
3958 | #clear_package __PACKAGE__; |
4002 | #clear_package __PACKAGE__; |
3959 | |
4003 | |
3960 | info "unload completed, starting to reload now"; |
4004 | info "perl_reload: unload completed, starting to reload now"; |
3961 | |
4005 | |
3962 | trace "reloading cf.pm"; |
4006 | trace "perl_reload: reloading cf.pm"; |
3963 | require cf; |
4007 | require cf; |
3964 | cf::_connect_to_perl_1; |
4008 | cf::_connect_to_perl_1; |
3965 | |
4009 | |
3966 | trace "loading config and database again"; |
4010 | trace "perl_reload: loading config and database again"; |
3967 | cf::reload_config; |
4011 | cf::reload_config; |
3968 | |
4012 | |
3969 | trace "loading extensions"; |
4013 | trace "perl_reload: loading extensions"; |
3970 | cf::load_extensions; |
4014 | cf::load_extensions; |
3971 | |
4015 | |
3972 | if ($REATTACH_ON_RELOAD) { |
4016 | if ($REATTACH_ON_RELOAD) { |
3973 | trace "reattaching attachments to objects/players"; |
4017 | trace "perl_reload: reattaching attachments to objects/players"; |
3974 | _global_reattach; # objects, sockets |
4018 | _global_reattach; # objects, sockets |
3975 | trace "reattaching attachments to maps"; |
4019 | trace "perl_reload: reattaching attachments to maps"; |
3976 | reattach $_ for values %MAP; |
4020 | reattach $_ for values %MAP; |
3977 | trace "reattaching attachments to players"; |
4021 | trace "perl_reload: reattaching attachments to players"; |
3978 | reattach $_ for values %PLAYER; |
4022 | reattach $_ for values %PLAYER; |
3979 | } |
4023 | } |
3980 | |
4024 | |
3981 | trace "running post_init jobs"; |
4025 | cf::_post_init 1; |
3982 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3983 | |
4026 | |
3984 | trace "leaving sync_job"; |
4027 | trace "perl_reload: leaving sync_job"; |
3985 | |
4028 | |
3986 | 1 |
4029 | 1 |
3987 | } or do { |
4030 | } or do { |
3988 | error $@; |
4031 | error $@; |
3989 | cf::cleanup "error while reloading, exiting."; |
4032 | cf::cleanup "perl_reload: error, exiting."; |
3990 | }; |
4033 | }; |
3991 | |
4034 | |
3992 | info "reloaded"; |
|
|
3993 | --$RELOAD; |
4035 | --$RELOAD; |
3994 | } |
4036 | } |
3995 | |
4037 | |
3996 | $t1 = AE::time - $t1; |
4038 | $t1 = AE::time - $t1; |
3997 | info "reload completed in ${t1}s\n"; |
4039 | info "perl_reload: completed in ${t1}s\n"; |
3998 | }; |
4040 | }; |
3999 | |
4041 | |
4000 | our $RELOAD_WATCHER; # used only during reload |
4042 | our $RELOAD_WATCHER; # used only during reload |
4001 | |
4043 | |
4002 | sub reload_perl() { |
4044 | sub reload_perl() { |
… | |
… | |
4135 | IO::AIO::min_parallel 8; |
4177 | IO::AIO::min_parallel 8; |
4136 | IO::AIO::max_poll_time $TICK * 0.1; |
4178 | IO::AIO::max_poll_time $TICK * 0.1; |
4137 | undef $AnyEvent::AIO::WATCHER; |
4179 | undef $AnyEvent::AIO::WATCHER; |
4138 | } |
4180 | } |
4139 | |
4181 | |
4140 | my $_log_backtrace; |
4182 | our $_log_backtrace; |
|
|
4183 | our $_log_backtrace_last; |
4141 | |
4184 | |
4142 | sub _log_backtrace { |
4185 | sub _log_backtrace { |
4143 | my ($msg, @addr) = @_; |
4186 | my ($msg, @addr) = @_; |
4144 | |
4187 | |
4145 | $msg =~ s/\n//; |
4188 | $msg =~ s/\n$//; |
4146 | |
4189 | |
|
|
4190 | if ($_log_backtrace_last eq $msg) { |
|
|
4191 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4192 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4147 | # limit the # of concurrent backtraces |
4193 | # limit the # of concurrent backtraces |
4148 | if ($_log_backtrace < 2) { |
4194 | } elsif ($_log_backtrace < 2) { |
|
|
4195 | $_log_backtrace_last = $msg; |
4149 | ++$_log_backtrace; |
4196 | ++$_log_backtrace; |
4150 | my $perl_bt = Carp::longmess $msg; |
4197 | my $perl_bt = Carp::longmess $msg; |
4151 | async { |
4198 | async { |
4152 | $Coro::current->{desc} = "abt $msg"; |
4199 | $Coro::current->{desc} = "abt $msg"; |
4153 | |
4200 | |
… | |
… | |
4173 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4220 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4174 | --$_log_backtrace; |
4221 | --$_log_backtrace; |
4175 | }; |
4222 | }; |
4176 | } else { |
4223 | } else { |
4177 | LOG llevInfo, "[ABT] $msg\n"; |
4224 | LOG llevInfo, "[ABT] $msg\n"; |
4178 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4225 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4179 | } |
4226 | } |
4180 | } |
4227 | } |
4181 | |
4228 | |
4182 | # load additional modules |
4229 | # load additional modules |
4183 | require "cf/$_.pm" for @EXTRA_MODULES; |
4230 | require "cf/$_.pm" for @EXTRA_MODULES; |