1 | # |
1 | # |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | # |
3 | # |
4 | # Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | # Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | # |
5 | # |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
7 | # the terms of the Affero GNU General Public License as published by the |
7 | # the terms of the Affero GNU General Public License as published by the |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
9 | # option) any later version. |
9 | # option) any later version. |
… | |
… | |
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) { |
… | |
… | |
1474 | |
1555 | |
1475 | while (my ($k, $v) = each %todo) { |
1556 | while (my ($k, $v) = each %todo) { |
1476 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1557 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1477 | if exists $v->{meta}{mandatory}; |
1558 | if exists $v->{meta}{mandatory}; |
1478 | } |
1559 | } |
|
|
1560 | |
|
|
1561 | last; |
1479 | } |
1562 | } |
1480 | } |
1563 | } |
1481 | }; |
1564 | }; |
1482 | } |
1565 | } |
1483 | |
1566 | |
… | |
… | |
1641 | my $name = $pl->ob->name; |
1724 | my $name = $pl->ob->name; |
1642 | |
1725 | |
1643 | $pl->{deny_save} = 1; |
1726 | $pl->{deny_save} = 1; |
1644 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1727 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1645 | |
1728 | |
1646 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1729 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1647 | $pl->deactivate; |
1730 | $pl->deactivate; |
|
|
1731 | |
1648 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1732 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1649 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1733 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
|
|
1734 | ext::highscore::check ($pl->ob); |
|
|
1735 | |
1650 | $pl->ns->destroy if $pl->ns; |
1736 | $pl->ns->destroy if $pl->ns; |
1651 | |
1737 | |
1652 | my $path = playerdir $pl; |
1738 | my $path = playerdir $pl; |
1653 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1739 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1654 | aio_rename $path, $temp; |
1740 | aio_rename $path, $temp; |
… | |
… | |
1820 | sub generate_random_map { |
1906 | sub generate_random_map { |
1821 | my ($self, $rmp) = @_; |
1907 | my ($self, $rmp) = @_; |
1822 | |
1908 | |
1823 | 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 |
1824 | |
1910 | |
1825 | # mit "rum" bekleckern, nicht |
|
|
1826 | $self->_create_random_map ( |
1911 | $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 | } |
1912 | } |
1840 | |
1913 | |
1841 | =item cf::map->register ($regex, $prio) |
1914 | =item cf::map->register ($regex, $prio) |
1842 | |
1915 | |
1843 | 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 |
… | |
… | |
1894 | $base =~ s{[^/]+/?$}{}; |
1967 | $base =~ s{[^/]+/?$}{}; |
1895 | $path = "$base/$path"; |
1968 | $path = "$base/$path"; |
1896 | } |
1969 | } |
1897 | |
1970 | |
1898 | for ($path) { |
1971 | for ($path) { |
1899 | redo if s{//}{/}; |
|
|
1900 | redo if s{/\.?/}{/}; |
1972 | redo if s{/\.?/}{/}; |
1901 | redo if s{/[^/]+/\.\./}{/}; |
1973 | redo if s{/[^/]+/\.\./}{/}; |
1902 | } |
1974 | } |
1903 | |
1975 | |
1904 | $path |
1976 | $path |
… | |
… | |
1922 | |
1994 | |
1923 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1995 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1924 | () |
1996 | () |
1925 | } |
1997 | } |
1926 | |
1998 | |
|
|
1999 | # may re-bless or do other evil things |
1927 | sub init { |
2000 | sub init { |
1928 | my ($self) = @_; |
2001 | my ($self) = @_; |
1929 | |
2002 | |
1930 | $self |
2003 | $self |
1931 | } |
2004 | } |
… | |
… | |
1996 | $self->{load_path} = $path; |
2069 | $self->{load_path} = $path; |
1997 | |
2070 | |
1998 | 1 |
2071 | 1 |
1999 | } |
2072 | } |
2000 | |
2073 | |
|
|
2074 | # used to laod the header of an original map |
2001 | sub load_header_orig { |
2075 | sub load_header_orig { |
2002 | my ($self) = @_; |
2076 | my ($self) = @_; |
2003 | |
2077 | |
2004 | $self->load_header_from ($self->load_path) |
2078 | $self->load_header_from ($self->load_path) |
2005 | } |
2079 | } |
2006 | |
2080 | |
|
|
2081 | # used to laod the header of an instantiated map |
2007 | sub load_header_temp { |
2082 | sub load_header_temp { |
2008 | my ($self) = @_; |
2083 | my ($self) = @_; |
2009 | |
2084 | |
2010 | $self->load_header_from ($self->save_path) |
2085 | $self->load_header_from ($self->save_path) |
2011 | } |
2086 | } |
2012 | |
2087 | |
|
|
2088 | # called after loading the header from an instantiated map |
2013 | sub prepare_temp { |
2089 | sub prepare_temp { |
2014 | my ($self) = @_; |
2090 | my ($self) = @_; |
2015 | |
2091 | |
2016 | $self->last_access ((delete $self->{last_access}) |
2092 | $self->last_access ((delete $self->{last_access}) |
2017 | || $cf::RUNTIME); #d# |
2093 | || $cf::RUNTIME); #d# |
2018 | # safety |
2094 | # safety |
2019 | $self->{instantiate_time} = $cf::RUNTIME |
2095 | $self->{instantiate_time} = $cf::RUNTIME |
2020 | if $self->{instantiate_time} > $cf::RUNTIME; |
2096 | if $self->{instantiate_time} > $cf::RUNTIME; |
2021 | } |
2097 | } |
2022 | |
2098 | |
|
|
2099 | # called after loading the header from an original map |
2023 | sub prepare_orig { |
2100 | sub prepare_orig { |
2024 | my ($self) = @_; |
2101 | my ($self) = @_; |
2025 | |
2102 | |
2026 | $self->{load_original} = 1; |
2103 | $self->{load_original} = 1; |
2027 | $self->{instantiate_time} = $cf::RUNTIME; |
2104 | $self->{instantiate_time} = $cf::RUNTIME; |
… | |
… | |
2053 | sub find { |
2130 | sub find { |
2054 | my ($path, $origin) = @_; |
2131 | my ($path, $origin) = @_; |
2055 | |
2132 | |
2056 | cf::cede_to_tick; |
2133 | cf::cede_to_tick; |
2057 | |
2134 | |
2058 | $path = normalise $path, $origin && $origin->path; |
2135 | $path = normalise $path, $origin; |
2059 | |
2136 | |
2060 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2137 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2061 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2138 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2062 | |
2139 | |
2063 | $cf::MAP{$path} || do { |
2140 | $cf::MAP{$path} || do { |
… | |
… | |
2094 | |
2171 | |
2095 | { |
2172 | { |
2096 | my $guard = cf::lock_acquire "map_data:$path"; |
2173 | my $guard = cf::lock_acquire "map_data:$path"; |
2097 | |
2174 | |
2098 | return unless $self->valid; |
2175 | return unless $self->valid; |
2099 | return unless $self->in_memory == cf::MAP_SWAPPED; |
2176 | return unless $self->state == cf::MAP_SWAPPED; |
2100 | |
|
|
2101 | $self->in_memory (cf::MAP_LOADING); |
|
|
2102 | |
2177 | |
2103 | $self->alloc; |
2178 | $self->alloc; |
2104 | |
2179 | |
2105 | $self->pre_load; |
2180 | $self->pre_load; |
2106 | cf::cede_to_tick; |
2181 | cf::cede_to_tick; |
2107 | |
2182 | |
|
|
2183 | if (exists $self->{load_path}) { |
2108 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2184 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2109 | $f->skip_block; |
2185 | $f->skip_block; |
2110 | $self->_load_objects ($f) |
2186 | $self->_load_objects ($f) |
2111 | or return; |
2187 | or return; |
2112 | |
2188 | |
2113 | $self->post_load_original |
2189 | $self->post_load_original |
2114 | if delete $self->{load_original}; |
2190 | if delete $self->{load_original}; |
2115 | |
2191 | |
2116 | if (my $uniq = $self->uniq_path) { |
2192 | if (my $uniq = $self->uniq_path) { |
2117 | utf8::encode $uniq; |
2193 | utf8::encode $uniq; |
2118 | unless (aio_stat $uniq) { |
2194 | unless (aio_stat $uniq) { |
2119 | if (my $f = new_from_file cf::object::thawer $uniq) { |
2195 | if (my $f = new_from_file cf::object::thawer $uniq) { |
2120 | $self->clear_unique_items; |
2196 | $self->clear_unique_items; |
2121 | $self->_load_objects ($f); |
2197 | $self->_load_objects ($f); |
2122 | $f->resolve_delayed_derefs; |
2198 | $f->resolve_delayed_derefs; |
|
|
2199 | } |
2123 | } |
2200 | } |
2124 | } |
2201 | } |
2125 | } |
|
|
2126 | |
2202 | |
2127 | $f->resolve_delayed_derefs; |
2203 | $f->resolve_delayed_derefs; |
|
|
2204 | } else { |
|
|
2205 | $self->post_load_original |
|
|
2206 | if delete $self->{load_original}; |
|
|
2207 | } |
|
|
2208 | |
|
|
2209 | $self->state (cf::MAP_INACTIVE); |
2128 | |
2210 | |
2129 | cf::cede_to_tick; |
2211 | cf::cede_to_tick; |
2130 | # now do the right thing for maps |
2212 | # now do the right thing for maps |
2131 | $self->link_multipart_objects; |
2213 | $self->link_multipart_objects; |
2132 | $self->difficulty ($self->estimate_difficulty) |
2214 | $self->difficulty ($self->estimate_difficulty) |
… | |
… | |
2136 | unless ($self->{deny_activate}) { |
2218 | unless ($self->{deny_activate}) { |
2137 | $self->decay_objects; |
2219 | $self->decay_objects; |
2138 | $self->fix_auto_apply; |
2220 | $self->fix_auto_apply; |
2139 | $self->update_buttons; |
2221 | $self->update_buttons; |
2140 | cf::cede_to_tick; |
2222 | cf::cede_to_tick; |
2141 | $self->activate; |
2223 | #$self->activate; # no longer activate maps automatically |
2142 | } |
2224 | } |
2143 | |
2225 | |
2144 | $self->{last_save} = $cf::RUNTIME; |
2226 | $self->{last_save} = $cf::RUNTIME; |
2145 | $self->last_access ($cf::RUNTIME); |
2227 | $self->last_access ($cf::RUNTIME); |
2146 | |
|
|
2147 | $self->in_memory (cf::MAP_ACTIVE); |
|
|
2148 | } |
2228 | } |
2149 | |
2229 | |
2150 | $self->post_load; |
2230 | $self->post_load; |
|
|
2231 | |
|
|
2232 | 1 |
2151 | } |
2233 | } |
2152 | |
2234 | |
2153 | # customize the map for a given player, i.e. |
2235 | # customize the map for a given player, i.e. |
2154 | # return the _real_ map. used by e.g. per-player |
2236 | # return the _real_ map. used by e.g. per-player |
2155 | # maps to change the path to ~playername/mappath |
2237 | # maps to change the path to ~playername/mappath |
… | |
… | |
2193 | } |
2275 | } |
2194 | |
2276 | |
2195 | sub find_sync { |
2277 | sub find_sync { |
2196 | my ($path, $origin) = @_; |
2278 | my ($path, $origin) = @_; |
2197 | |
2279 | |
|
|
2280 | # it's a bug to call this from the main context |
2198 | return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" |
2281 | return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" |
2199 | if $Coro::current == $Coro::main; |
2282 | if $Coro::current == $Coro::main; |
2200 | |
2283 | |
2201 | find $path, $origin |
2284 | find $path, $origin |
2202 | } |
2285 | } |
2203 | |
2286 | |
2204 | sub do_load_sync { |
2287 | sub do_load_sync { |
2205 | my ($map) = @_; |
2288 | my ($map) = @_; |
2206 | |
2289 | |
|
|
2290 | # it's a bug to call this from the main context |
2207 | return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" |
2291 | return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" |
2208 | if $Coro::current == $Coro::main; |
2292 | if $Coro::current == $Coro::main; |
2209 | |
2293 | |
2210 | $map->load; |
2294 | $map->load; |
2211 | } |
2295 | } |
… | |
… | |
2214 | our $MAP_PREFETCHER = undef; |
2298 | our $MAP_PREFETCHER = undef; |
2215 | |
2299 | |
2216 | sub find_async { |
2300 | sub find_async { |
2217 | my ($path, $origin, $load) = @_; |
2301 | my ($path, $origin, $load) = @_; |
2218 | |
2302 | |
2219 | $path = normalise $path, $origin && $origin->{path}; |
2303 | $path = normalise $path, $origin; |
2220 | |
2304 | |
2221 | if (my $map = $cf::MAP{$path}) { |
2305 | if (my $map = $cf::MAP{$path}) { |
2222 | return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; |
2306 | return $map if !$load || $map->linkable; |
2223 | } |
2307 | } |
2224 | |
2308 | |
2225 | $MAP_PREFETCH{$path} |= $load; |
2309 | $MAP_PREFETCH{$path} |= $load; |
2226 | |
2310 | |
2227 | $MAP_PREFETCHER ||= cf::async { |
2311 | $MAP_PREFETCHER ||= cf::async { |
… | |
… | |
2286 | sub swap_out { |
2370 | sub swap_out { |
2287 | my ($self) = @_; |
2371 | my ($self) = @_; |
2288 | |
2372 | |
2289 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2373 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2290 | |
2374 | |
2291 | return if $self->in_memory != cf::MAP_ACTIVE; |
2375 | return if !$self->linkable; |
2292 | return if $self->{deny_save}; |
2376 | return if $self->{deny_save}; |
2293 | return if $self->players; |
2377 | return if $self->players; |
2294 | |
2378 | |
2295 | # first deactivate the map and "unlink" it from the core |
2379 | # first deactivate the map and "unlink" it from the core |
2296 | $self->deactivate; |
2380 | $self->deactivate; |
2297 | $_->clear_links_to ($self) for values %cf::MAP; |
2381 | $_->clear_links_to ($self) for values %cf::MAP; |
2298 | $self->in_memory (cf::MAP_SWAPPED); |
2382 | $self->state (cf::MAP_SWAPPED); |
2299 | |
2383 | |
2300 | # then atomically save |
2384 | # then atomically save |
2301 | $self->_save; |
2385 | $self->_save; |
2302 | |
2386 | |
2303 | # then free the map |
2387 | # then free the map |
… | |
… | |
2329 | |
2413 | |
2330 | return if $self->players; |
2414 | return if $self->players; |
2331 | |
2415 | |
2332 | cf::trace "resetting map ", $self->path, "\n"; |
2416 | cf::trace "resetting map ", $self->path, "\n"; |
2333 | |
2417 | |
2334 | $self->in_memory (cf::MAP_SWAPPED); |
2418 | $self->state (cf::MAP_SWAPPED); |
2335 | |
2419 | |
2336 | # need to save uniques path |
2420 | # need to save uniques path |
2337 | unless ($self->{deny_save}) { |
2421 | unless ($self->{deny_save}) { |
2338 | my $uniq = $self->uniq_path; utf8::encode $uniq; |
2422 | my $uniq = $self->uniq_path; utf8::encode $uniq; |
2339 | |
2423 | |
… | |
… | |
2735 | ($path, $x, $y) = (undef, undef, undef); |
2819 | ($path, $x, $y) = (undef, undef, undef); |
2736 | } |
2820 | } |
2737 | } |
2821 | } |
2738 | |
2822 | |
2739 | my $map = eval { |
2823 | my $map = eval { |
2740 | my $map = defined $path ? cf::map::find $path : undef; |
2824 | my $map = defined $path ? cf::map::find $path, $self->map : undef; |
2741 | |
2825 | |
2742 | if ($map) { |
2826 | if ($map) { |
2743 | $map = $map->customise_for ($self); |
2827 | $map = $map->customise_for ($self); |
2744 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2828 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2745 | } else { |
2829 | } else { |
… | |
… | |
2835 | $Coro::current->{desc} = "enter_exit"; |
2919 | $Coro::current->{desc} = "enter_exit"; |
2836 | |
2920 | |
2837 | unless (eval { |
2921 | unless (eval { |
2838 | $self->deactivate_recursive; # just to be sure |
2922 | $self->deactivate_recursive; # just to be sure |
2839 | |
2923 | |
2840 | # random map handling |
|
|
2841 | { |
|
|
2842 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
|
|
2843 | |
|
|
2844 | prepare_random_map $exit |
|
|
2845 | if $exit->slaying eq "/!"; |
|
|
2846 | } |
|
|
2847 | |
|
|
2848 | my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
2924 | my $map = cf::map::normalise $exit->slaying, $exit->map; |
2849 | my $x = $exit->stats->hp; |
2925 | my $x = $exit->stats->hp; |
2850 | my $y = $exit->stats->sp; |
2926 | my $y = $exit->stats->sp; |
|
|
2927 | |
|
|
2928 | # special map handling |
|
|
2929 | my $slaying = $exit->slaying; |
|
|
2930 | |
|
|
2931 | # special map handling |
|
|
2932 | if ($slaying eq "/!") { |
|
|
2933 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
|
|
2934 | |
|
|
2935 | prepare_random_map $exit |
|
|
2936 | if $exit->slaying eq "/!"; # need to re-check after getting the lock |
|
|
2937 | |
|
|
2938 | $map = $exit->slaying; |
|
|
2939 | |
|
|
2940 | } elsif ($slaying eq '!up') { |
|
|
2941 | $map = $exit->map->tile_path (cf::TILE_UP); |
|
|
2942 | $x = $exit->x; |
|
|
2943 | $y = $exit->y; |
|
|
2944 | |
|
|
2945 | } elsif ($slaying eq '!down') { |
|
|
2946 | $map = $exit->map->tile_path (cf::TILE_DOWN); |
|
|
2947 | $x = $exit->x; |
|
|
2948 | $y = $exit->y; |
|
|
2949 | } |
2851 | |
2950 | |
2852 | $self->goto ($map, $x, $y); |
2951 | $self->goto ($map, $x, $y); |
2853 | |
2952 | |
2854 | # if exit is damned, update players death & WoR home-position |
2953 | # if exit is damned, update players death & WoR home-position |
2855 | $self->contr->savebed ($map, $x, $y) |
2954 | $self->contr->savebed ($map, $x, $y) |
… | |
… | |
3370 | |
3469 | |
3371 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3470 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3372 | |
3471 | |
3373 | trace "loading facedata from $path\n"; |
3472 | trace "loading facedata from $path\n"; |
3374 | |
3473 | |
3375 | my $facedata; |
3474 | 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 | |
3475 | |
3381 | $facedata->{version} == 2 |
3476 | $facedata->{version} == 2 |
3382 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3477 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3383 | |
3478 | |
3384 | # patch in the exptable |
3479 | # patch in the exptable |
… | |
… | |
3398 | |
3493 | |
3399 | cf::face::set_visibility $idx, $info->{visibility}; |
3494 | cf::face::set_visibility $idx, $info->{visibility}; |
3400 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3495 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3401 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3496 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3402 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3497 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
|
|
3498 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3403 | |
3499 | |
3404 | cf::cede_to_tick; |
3500 | cf::cede_to_tick; |
3405 | } |
3501 | } |
3406 | |
3502 | |
3407 | while (my ($face, $info) = each %$faces) { |
3503 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3499 | sub reload_treasures { |
3595 | sub reload_treasures { |
3500 | load_resource_file "$DATADIR/treasures" |
3596 | load_resource_file "$DATADIR/treasures" |
3501 | or die "unable to load treasurelists\n"; |
3597 | or die "unable to load treasurelists\n"; |
3502 | } |
3598 | } |
3503 | |
3599 | |
3504 | sub reload_exp { |
|
|
3505 | cf::init_experience; |
|
|
3506 | } |
|
|
3507 | |
|
|
3508 | sub reload_sound { |
3600 | sub reload_sound { |
3509 | trace "loading sound config from $DATADIR/sound\n"; |
3601 | trace "loading sound config from $DATADIR/sound\n"; |
3510 | |
3602 | |
3511 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3512 | or die "$DATADIR/sound $!"; |
|
|
3513 | |
|
|
3514 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
3603 | my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); |
3515 | |
3604 | |
3516 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3605 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3517 | my $sound = $soundconf->{compat}[$_] |
3606 | my $sound = $soundconf->{compat}[$_] |
3518 | or next; |
3607 | or next; |
3519 | |
3608 | |
… | |
… | |
3529 | } |
3618 | } |
3530 | |
3619 | |
3531 | sub reload_resources { |
3620 | sub reload_resources { |
3532 | trace "reloading resource files...\n"; |
3621 | trace "reloading resource files...\n"; |
3533 | |
3622 | |
3534 | reload_exp; |
3623 | reload_exp_table; |
|
|
3624 | reload_materials; |
3535 | reload_facedata; |
3625 | reload_facedata; |
3536 | reload_sound; |
3626 | reload_sound; |
3537 | reload_archetypes; |
3627 | reload_archetypes; |
3538 | reload_regions; |
3628 | reload_regions; |
3539 | reload_treasures; |
3629 | reload_treasures; |
… | |
… | |
3542 | } |
3632 | } |
3543 | |
3633 | |
3544 | sub reload_config { |
3634 | sub reload_config { |
3545 | trace "reloading config file...\n"; |
3635 | trace "reloading config file...\n"; |
3546 | |
3636 | |
3547 | open my $fh, "<:utf8", "$CONFDIR/config" |
3637 | my $config = load_file "$CONFDIR/config"; |
3548 | or return; |
3638 | utf8::decode $config; |
3549 | |
3639 | *CFG = decode_yaml $config; |
3550 | local $/; |
|
|
3551 | *CFG = YAML::XS::Load scalar <$fh>; |
|
|
3552 | |
3640 | |
3553 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3641 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3554 | |
3642 | |
3555 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3643 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3556 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3644 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3560 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3648 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3561 | and die "WARNING: m(un)lockall failed: $!\n"; |
3649 | and die "WARNING: m(un)lockall failed: $!\n"; |
3562 | }; |
3650 | }; |
3563 | warn $@ if $@; |
3651 | warn $@ if $@; |
3564 | } |
3652 | } |
3565 | |
|
|
3566 | trace "finished reloading resource files\n"; |
|
|
3567 | } |
3653 | } |
3568 | |
3654 | |
3569 | sub pidfile() { |
3655 | sub pidfile() { |
3570 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3656 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3571 | or die "$PIDFILE: $!"; |
3657 | or die "$PIDFILE: $!"; |
… | |
… | |
3596 | |
3682 | |
3597 | sub main { |
3683 | sub main { |
3598 | cf::init_globals; # initialise logging |
3684 | cf::init_globals; # initialise logging |
3599 | |
3685 | |
3600 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3686 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3601 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3687 | LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3602 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3688 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3603 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3689 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3604 | |
3690 | |
3605 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3691 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3606 | |
3692 | |
… | |
… | |
3621 | cf::init_anim; |
3707 | cf::init_anim; |
3622 | cf::init_attackmess; |
3708 | cf::init_attackmess; |
3623 | cf::init_dynamic; |
3709 | cf::init_dynamic; |
3624 | |
3710 | |
3625 | cf::load_settings; |
3711 | cf::load_settings; |
3626 | cf::load_materials; |
|
|
3627 | |
3712 | |
3628 | reload_resources; |
3713 | reload_resources; |
3629 | reload_config; |
3714 | reload_config; |
3630 | db_init; |
3715 | db_init; |
3631 | |
3716 | |
… | |
… | |
3643 | |
3728 | |
3644 | # no (long-running) fork's whatsoever before this point(!) |
3729 | # no (long-running) fork's whatsoever before this point(!) |
3645 | use POSIX (); |
3730 | use POSIX (); |
3646 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3731 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3647 | |
3732 | |
3648 | (pop @POST_INIT)->(0) while @POST_INIT; |
3733 | cf::_post_init 0; |
3649 | }; |
3734 | }; |
3650 | |
3735 | |
3651 | cf::object::thawer::errors_are_fatal 0; |
3736 | cf::object::thawer::errors_are_fatal 0; |
3652 | info "parse errors in files are no longer fatal from this point on.\n"; |
3737 | info "parse errors in files are no longer fatal from this point on.\n"; |
3653 | |
3738 | |
… | |
… | |
3876 | |
3961 | |
3877 | my $t1 = AE::time; |
3962 | my $t1 = AE::time; |
3878 | |
3963 | |
3879 | while ($RELOAD) { |
3964 | while ($RELOAD) { |
3880 | cf::get_slot 0.1, -1, "reload_perl"; |
3965 | cf::get_slot 0.1, -1, "reload_perl"; |
3881 | info "reloading..."; |
3966 | info "perl_reload: reloading..."; |
3882 | |
3967 | |
3883 | trace "entering sync_job"; |
3968 | trace "perl_reload: entering sync_job"; |
3884 | |
3969 | |
3885 | cf::sync_job { |
3970 | cf::sync_job { |
3886 | #cf::emergency_save; |
3971 | #cf::emergency_save; |
3887 | |
3972 | |
3888 | trace "cancelling all extension coros"; |
3973 | trace "perl_reload: cancelling all extension coros"; |
3889 | $_->cancel for values %EXT_CORO; |
3974 | $_->cancel for values %EXT_CORO; |
3890 | %EXT_CORO = (); |
3975 | %EXT_CORO = (); |
3891 | |
3976 | |
3892 | trace "removing commands"; |
3977 | trace "perl_reload: removing commands"; |
3893 | %COMMAND = (); |
3978 | %COMMAND = (); |
3894 | |
3979 | |
3895 | trace "removing ext/exti commands"; |
3980 | trace "perl_reload: removing ext/exti commands"; |
3896 | %EXTCMD = (); |
3981 | %EXTCMD = (); |
3897 | %EXTICMD = (); |
3982 | %EXTICMD = (); |
3898 | |
3983 | |
3899 | trace "unloading/nuking all extensions"; |
3984 | trace "perl_reload: unloading/nuking all extensions"; |
3900 | for my $pkg (@EXTS) { |
3985 | for my $pkg (@EXTS) { |
3901 | trace "... unloading $pkg"; |
3986 | trace "... unloading $pkg"; |
3902 | |
3987 | |
3903 | if (my $cb = $pkg->can ("unload")) { |
3988 | if (my $cb = $pkg->can ("unload")) { |
3904 | eval { |
3989 | eval { |
… | |
… | |
3909 | |
3994 | |
3910 | trace "... clearing $pkg"; |
3995 | trace "... clearing $pkg"; |
3911 | clear_package $pkg; |
3996 | clear_package $pkg; |
3912 | } |
3997 | } |
3913 | |
3998 | |
3914 | trace "unloading all perl modules loaded from $LIBDIR"; |
3999 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3915 | while (my ($k, $v) = each %INC) { |
4000 | while (my ($k, $v) = each %INC) { |
3916 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
4001 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3917 | |
4002 | |
3918 | trace "... unloading $k"; |
4003 | trace "... unloading $k"; |
3919 | delete $INC{$k}; |
4004 | delete $INC{$k}; |
… | |
… | |
3926 | } |
4011 | } |
3927 | |
4012 | |
3928 | clear_package $k; |
4013 | clear_package $k; |
3929 | } |
4014 | } |
3930 | |
4015 | |
3931 | trace "getting rid of safe::, as good as possible"; |
4016 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3932 | clear_package "safe::$_" |
4017 | clear_package "safe::$_" |
3933 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
4018 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3934 | |
4019 | |
3935 | trace "unloading cf.pm \"a bit\""; |
4020 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3936 | delete $INC{"cf.pm"}; |
4021 | delete $INC{"cf.pm"}; |
3937 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
4022 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3938 | |
4023 | |
3939 | # don't, removes xs symbols, too, |
4024 | # don't, removes xs symbols, too, |
3940 | # and global variables created in xs |
4025 | # and global variables created in xs |
3941 | #clear_package __PACKAGE__; |
4026 | #clear_package __PACKAGE__; |
3942 | |
4027 | |
3943 | info "unload completed, starting to reload now"; |
4028 | info "perl_reload: unload completed, starting to reload now"; |
3944 | |
4029 | |
3945 | trace "reloading cf.pm"; |
4030 | trace "perl_reload: reloading cf.pm"; |
3946 | require cf; |
4031 | require cf; |
3947 | cf::_connect_to_perl_1; |
4032 | cf::_connect_to_perl_1; |
3948 | |
4033 | |
3949 | trace "loading config and database again"; |
4034 | trace "perl_reload: loading config and database again"; |
3950 | cf::reload_config; |
4035 | cf::reload_config; |
3951 | |
4036 | |
3952 | trace "loading extensions"; |
4037 | trace "perl_reload: loading extensions"; |
3953 | cf::load_extensions; |
4038 | cf::load_extensions; |
3954 | |
4039 | |
3955 | if ($REATTACH_ON_RELOAD) { |
4040 | if ($REATTACH_ON_RELOAD) { |
3956 | trace "reattaching attachments to objects/players"; |
4041 | trace "perl_reload: reattaching attachments to objects/players"; |
3957 | _global_reattach; # objects, sockets |
4042 | _global_reattach; # objects, sockets |
3958 | trace "reattaching attachments to maps"; |
4043 | trace "perl_reload: reattaching attachments to maps"; |
3959 | reattach $_ for values %MAP; |
4044 | reattach $_ for values %MAP; |
3960 | trace "reattaching attachments to players"; |
4045 | trace "perl_reload: reattaching attachments to players"; |
3961 | reattach $_ for values %PLAYER; |
4046 | reattach $_ for values %PLAYER; |
3962 | } |
4047 | } |
3963 | |
4048 | |
3964 | trace "running post_init jobs"; |
4049 | cf::_post_init 1; |
3965 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3966 | |
4050 | |
3967 | trace "leaving sync_job"; |
4051 | trace "perl_reload: leaving sync_job"; |
3968 | |
4052 | |
3969 | 1 |
4053 | 1 |
3970 | } or do { |
4054 | } or do { |
3971 | error $@; |
4055 | error $@; |
3972 | cf::cleanup "error while reloading, exiting."; |
4056 | cf::cleanup "perl_reload: error, exiting."; |
3973 | }; |
4057 | }; |
3974 | |
4058 | |
3975 | info "reloaded"; |
|
|
3976 | --$RELOAD; |
4059 | --$RELOAD; |
3977 | } |
4060 | } |
3978 | |
4061 | |
3979 | $t1 = AE::time - $t1; |
4062 | $t1 = AE::time - $t1; |
3980 | info "reload completed in ${t1}s\n"; |
4063 | info "perl_reload: completed in ${t1}s\n"; |
3981 | }; |
4064 | }; |
3982 | |
4065 | |
3983 | our $RELOAD_WATCHER; # used only during reload |
4066 | our $RELOAD_WATCHER; # used only during reload |
3984 | |
4067 | |
3985 | sub reload_perl() { |
4068 | sub reload_perl() { |
… | |
… | |
4013 | my $bug_warning = 0; |
4096 | my $bug_warning = 0; |
4014 | |
4097 | |
4015 | our @WAIT_FOR_TICK; |
4098 | our @WAIT_FOR_TICK; |
4016 | our @WAIT_FOR_TICK_BEGIN; |
4099 | our @WAIT_FOR_TICK_BEGIN; |
4017 | |
4100 | |
4018 | sub wait_for_tick { |
4101 | sub wait_for_tick() { |
4019 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4102 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4020 | |
4103 | |
4021 | my $signal = new Coro::Signal; |
4104 | my $signal = new Coro::Signal; |
4022 | push @WAIT_FOR_TICK, $signal; |
4105 | push @WAIT_FOR_TICK, $signal; |
4023 | $signal->wait; |
4106 | $signal->wait; |
4024 | } |
4107 | } |
4025 | |
4108 | |
4026 | sub wait_for_tick_begin { |
4109 | sub wait_for_tick_begin() { |
4027 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4110 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4028 | |
4111 | |
4029 | my $signal = new Coro::Signal; |
4112 | my $signal = new Coro::Signal; |
4030 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4113 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4031 | $signal->wait; |
4114 | $signal->wait; |
… | |
… | |
4118 | IO::AIO::min_parallel 8; |
4201 | IO::AIO::min_parallel 8; |
4119 | IO::AIO::max_poll_time $TICK * 0.1; |
4202 | IO::AIO::max_poll_time $TICK * 0.1; |
4120 | undef $AnyEvent::AIO::WATCHER; |
4203 | undef $AnyEvent::AIO::WATCHER; |
4121 | } |
4204 | } |
4122 | |
4205 | |
4123 | my $_log_backtrace; |
4206 | our $_log_backtrace; |
|
|
4207 | our $_log_backtrace_last; |
4124 | |
4208 | |
4125 | sub _log_backtrace { |
4209 | sub _log_backtrace { |
4126 | my ($msg, @addr) = @_; |
4210 | my ($msg, @addr) = @_; |
4127 | |
4211 | |
4128 | $msg =~ s/\n//; |
4212 | $msg =~ s/\n$//; |
4129 | |
4213 | |
|
|
4214 | if ($_log_backtrace_last eq $msg) { |
|
|
4215 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4216 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4130 | # limit the # of concurrent backtraces |
4217 | # limit the # of concurrent backtraces |
4131 | if ($_log_backtrace < 2) { |
4218 | } elsif ($_log_backtrace < 2) { |
|
|
4219 | $_log_backtrace_last = $msg; |
4132 | ++$_log_backtrace; |
4220 | ++$_log_backtrace; |
4133 | my $perl_bt = Carp::longmess $msg; |
4221 | my $perl_bt = Carp::longmess $msg; |
4134 | async { |
4222 | async { |
4135 | $Coro::current->{desc} = "abt $msg"; |
4223 | $Coro::current->{desc} = "abt $msg"; |
4136 | |
4224 | |
… | |
… | |
4156 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4244 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4157 | --$_log_backtrace; |
4245 | --$_log_backtrace; |
4158 | }; |
4246 | }; |
4159 | } else { |
4247 | } else { |
4160 | LOG llevInfo, "[ABT] $msg\n"; |
4248 | LOG llevInfo, "[ABT] $msg\n"; |
4161 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4249 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4162 | } |
4250 | } |
4163 | } |
4251 | } |
4164 | |
4252 | |
4165 | # load additional modules |
4253 | # load additional modules |
4166 | require "cf/$_.pm" for @EXTRA_MODULES; |
4254 | require "cf/$_.pm" for @EXTRA_MODULES; |